Chromium Code Reviews| Index: base/test/android/javatests/src/org/chromium/base/test/util/MinAndroidSdkLevelSkipCheck.java |
| diff --git a/base/test/android/javatests/src/org/chromium/base/test/util/MinAndroidSdkLevelSkipCheck.java b/base/test/android/javatests/src/org/chromium/base/test/util/MinAndroidSdkLevelSkipCheck.java |
| index c95ae224364ba3065c1f47552efba0573d713ad6..53e4fbce76d7c788e1ea38d271300703c7f1fbbe 100644 |
| --- a/base/test/android/javatests/src/org/chromium/base/test/util/MinAndroidSdkLevelSkipCheck.java |
| +++ b/base/test/android/javatests/src/org/chromium/base/test/util/MinAndroidSdkLevelSkipCheck.java |
| @@ -6,11 +6,8 @@ package org.chromium.base.test.util; |
| import android.os.Build; |
| -import junit.framework.TestCase; |
| - |
| import org.chromium.base.Log; |
| - |
| -import java.lang.reflect.Method; |
| +import org.junit.runners.model.FrameworkMethod; |
| /** |
| * Checks the device's SDK level against any specified minimum requirement. |
| @@ -27,21 +24,18 @@ public class MinAndroidSdkLevelSkipCheck extends SkipCheck { |
| * @return true if the device's SDK level is below the specified minimum. |
| */ |
| @Override |
| - public boolean shouldSkip(TestCase testCase) { |
| - Class testClass = testCase.getClass(); |
| - Method testMethod = getTestMethod(testCase); |
| - |
| + public boolean shouldSkip(FrameworkMethod frameworkMethod) { |
| int minSdkLevel = 0; |
| - for (MinAndroidSdkLevel m : getAnnotations(testMethod, MinAndroidSdkLevel.class)) { |
| + for (MinAndroidSdkLevel m : getAnnotations(frameworkMethod, MinAndroidSdkLevel.class)) { |
| minSdkLevel = Math.max(minSdkLevel, m.value()); |
| } |
| - |
| if (Build.VERSION.SDK_INT < minSdkLevel) { |
| - Log.i(TAG, "Test " + testClass.getName() + "#" + testCase.getName() |
| - + " is not enabled at SDK level " + Build.VERSION.SDK_INT |
| - + "."); |
| + Log.i(TAG, "Test" + frameworkMethod.getDeclaringClass().getName() + "#" |
|
jbudorick
2016/09/15 22:52:29
nit: why'd you remove the space after "Test"?
the real yoland
2016/09/20 21:26:43
Changed
Done
|
| + + frameworkMethod.getName() + " is not enabled at SDK level " |
| + + Build.VERSION.SDK_INT + "."); |
| return true; |
| } |
| return false; |
| } |
| + |
| } |