Index: base/test/android/javatests/src/org/chromium/base/test/util/DisableIfSkipCheck.java |
diff --git a/base/test/android/javatests/src/org/chromium/base/test/util/DisableIfSkipCheck.java b/base/test/android/javatests/src/org/chromium/base/test/util/DisableIfSkipCheck.java |
index 19db64ed3d6c3cbaf4150b6d2608fc618c138b76..cbcbd5ab0b0ffc45da81ea703de7d606c9f04bf9 100644 |
--- a/base/test/android/javatests/src/org/chromium/base/test/util/DisableIfSkipCheck.java |
+++ b/base/test/android/javatests/src/org/chromium/base/test/util/DisableIfSkipCheck.java |
@@ -6,11 +6,10 @@ package org.chromium.base.test.util; |
import android.os.Build; |
-import junit.framework.TestCase; |
+import org.junit.runners.model.FrameworkMethod; |
import org.chromium.base.Log; |
-import java.lang.reflect.Method; |
import java.util.Arrays; |
/** |
@@ -23,14 +22,12 @@ public class DisableIfSkipCheck extends SkipCheck { |
private static final String TAG = "cr_base_test"; |
@Override |
- public boolean shouldSkip(TestCase testCase) { |
- Method method = getTestMethod(testCase); |
+ public boolean shouldSkip(FrameworkMethod method) { |
if (method == null) return true; |
- |
for (DisableIf.Build v : getAnnotations(method, DisableIf.Build.class)) { |
if (abi(v) && hardware(v) && product(v) && sdk(v)) { |
if (!v.message().isEmpty()) { |
- Log.i(TAG, "%s is disabled: %s", testCase.toString(), v.message()); |
+ Log.i(TAG, "%s is disabled: %s", method.getName(), v.message()); |
} |
return true; |
} |
@@ -39,8 +36,8 @@ public class DisableIfSkipCheck extends SkipCheck { |
for (DisableIf.Device d : getAnnotations(method, DisableIf.Device.class)) { |
for (String deviceType : d.type()) { |
if (deviceTypeApplies(deviceType)) { |
- Log.i(TAG, "Test " + testCase.getClass().getName() + "#" |
- + testCase.getName() + " disabled because of " |
+ Log.i(TAG, "Test " + method.getDeclaringClass().getName() + "#" |
+ + method.getName() + " disabled because of " |
+ d); |
return true; |
} |