Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(713)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: base/test/android/junit/src/org/chromium/base/test/util/DisableIfTest.java

Issue 2195143002: [Android] Update all Robolectric tests to Robolectric 3.0 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add OfflinePageTestRunner.java to CL Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« base/BUILD.gn ('K') | « base/test/android/junit/src/org/chromium/base/test/shadows/ShadowMultiDex.java ('k') | base/test/android/junit/src/org/chromium/base/test/util/MinAndroidSdkLevelSkipCheckTest.java » ('j') | build/android/pylib/junit/test_runner.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/test/android/junit/src/org/chromium/base/test/util/DisableIfTest.java
diff --git a/base/test/android/junit/src/org/chromium/base/test/util/DisableIfTest.java b/base/test/android/junit/src/org/chromium/base/test/util/DisableIfTest.java
index 748fdc76f0915255a5cbdd751b6e4006367ca9a4..fea0c2fa7e34b68adf25f467f119cfe902953a02 100644
--- a/base/test/android/junit/src/org/chromium/base/test/util/DisableIfTest.java
+++ b/base/test/android/junit/src/org/chromium/base/test/util/DisableIfTest.java
@@ -12,18 +12,18 @@ import org.chromium.testing.local.LocalRobolectricTestRunner;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.robolectric.Robolectric;
import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
/** Unit tests for the DisableIf annotation and its SkipCheck implementation. */
@RunWith(LocalRobolectricTestRunner.class)
-@Config(manifest = Config.NONE, reportSdk = 19)
mikecase (-- gone --) 2016/07/31 04:21:09 reportSdk was removed. Using sdk=19 Robolectric co
jbudorick 2016/08/01 13:52:04 sgtm. Looks like you've preserved the intent of th
+@Config(manifest = Config.NONE, sdk = 21)
public class DisableIfTest {
@Test
public void testSdkIsLessThanAndIsLessThan() {
TestCase sdkIsLessThan = new TestCase("sdkIsLessThan") {
- @DisableIf.Build(sdk_is_less_than = 21)
+ @DisableIf.Build(sdk_is_less_than = 22)
public void sdkIsLessThan() {}
};
Assert.assertTrue(new DisableIfSkipCheck().shouldSkip(sdkIsLessThan));
@@ -32,7 +32,7 @@ public class DisableIfTest {
@Test
public void testSdkIsLessThanButIsEqual() {
TestCase sdkIsEqual = new TestCase("sdkIsEqual") {
- @DisableIf.Build(sdk_is_less_than = 19)
+ @DisableIf.Build(sdk_is_less_than = 21)
public void sdkIsEqual() {}
};
Assert.assertFalse(new DisableIfSkipCheck().shouldSkip(sdkIsEqual));
@@ -41,7 +41,7 @@ public class DisableIfTest {
@Test
public void testSdkIsLessThanButIsGreaterThan() {
TestCase sdkIsGreaterThan = new TestCase("sdkIsGreaterThan") {
- @DisableIf.Build(sdk_is_less_than = 16)
+ @DisableIf.Build(sdk_is_less_than = 20)
public void sdkIsGreaterThan() {}
};
Assert.assertFalse(new DisableIfSkipCheck().shouldSkip(sdkIsGreaterThan));
@@ -50,7 +50,7 @@ public class DisableIfTest {
@Test
public void testSdkIsGreaterThanButIsLessThan() {
TestCase sdkIsLessThan = new TestCase("sdkIsLessThan") {
- @DisableIf.Build(sdk_is_greater_than = 21)
+ @DisableIf.Build(sdk_is_greater_than = 22)
public void sdkIsLessThan() {}
};
Assert.assertFalse(new DisableIfSkipCheck().shouldSkip(sdkIsLessThan));
@@ -59,7 +59,7 @@ public class DisableIfTest {
@Test
public void testSdkIsGreaterThanButIsEqual() {
TestCase sdkIsEqual = new TestCase("sdkIsEqual") {
- @DisableIf.Build(sdk_is_greater_than = 19)
+ @DisableIf.Build(sdk_is_greater_than = 21)
public void sdkIsEqual() {}
};
Assert.assertFalse(new DisableIfSkipCheck().shouldSkip(sdkIsEqual));
@@ -68,7 +68,7 @@ public class DisableIfTest {
@Test
public void testSdkIsGreaterThanAndIsGreaterThan() {
TestCase sdkIsGreaterThan = new TestCase("sdkIsGreaterThan") {
- @DisableIf.Build(sdk_is_greater_than = 16)
+ @DisableIf.Build(sdk_is_greater_than = 20)
public void sdkIsGreaterThan() {}
};
Assert.assertTrue(new DisableIfSkipCheck().shouldSkip(sdkIsGreaterThan));
@@ -80,15 +80,13 @@ public class DisableIfTest {
@DisableIf.Build(supported_abis_includes = "foo")
public void supportedAbisCpuAbiMatch() {}
};
- String originalAbi = Build.CPU_ABI;
- String originalAbi2 = Build.CPU_ABI2;
+ String[] originalAbis = Build.SUPPORTED_ABIS;
try {
- Robolectric.Reflection.setFinalStaticField(Build.class, "CPU_ABI", "foo");
- Robolectric.Reflection.setFinalStaticField(Build.class, "CPU_ABI2", "bar");
+ ReflectionHelpers.setStaticField(Build.class, "SUPPORTED_ABIS",
+ new String[] {"foo", "bar"});
Assert.assertTrue(new DisableIfSkipCheck().shouldSkip(supportedAbisCpuAbiMatch));
} finally {
- Robolectric.Reflection.setFinalStaticField(Build.class, "CPU_ABI", originalAbi);
- Robolectric.Reflection.setFinalStaticField(Build.class, "CPU_ABI2", originalAbi2);
+ ReflectionHelpers.setStaticField(Build.class, "SUPPORTED_ABIS", originalAbis);
}
}
@@ -98,15 +96,13 @@ public class DisableIfTest {
@DisableIf.Build(supported_abis_includes = "bar")
public void supportedAbisCpuAbi2Match() {}
};
- String originalAbi = Build.CPU_ABI;
- String originalAbi2 = Build.CPU_ABI2;
+ String[] originalAbis = Build.SUPPORTED_ABIS;
try {
- Robolectric.Reflection.setFinalStaticField(Build.class, "CPU_ABI", "foo");
- Robolectric.Reflection.setFinalStaticField(Build.class, "CPU_ABI2", "bar");
+ ReflectionHelpers.setStaticField(Build.class, "SUPPORTED_ABIS",
+ new String[] {"foo", "bar"});
Assert.assertTrue(new DisableIfSkipCheck().shouldSkip(supportedAbisCpuAbi2Match));
} finally {
- Robolectric.Reflection.setFinalStaticField(Build.class, "CPU_ABI", originalAbi);
- Robolectric.Reflection.setFinalStaticField(Build.class, "CPU_ABI2", originalAbi2);
+ ReflectionHelpers.setStaticField(Build.class, "SUPPORTED_ABIS", originalAbis);
}
}
@@ -116,15 +112,13 @@ public class DisableIfTest {
@DisableIf.Build(supported_abis_includes = "baz")
public void supportedAbisNoMatch() {}
};
- String originalAbi = Build.CPU_ABI;
- String originalAbi2 = Build.CPU_ABI2;
+ String[] originalAbis = Build.SUPPORTED_ABIS;
try {
- Robolectric.Reflection.setFinalStaticField(Build.class, "CPU_ABI", "foo");
- Robolectric.Reflection.setFinalStaticField(Build.class, "CPU_ABI2", "bar");
+ ReflectionHelpers.setStaticField(Build.class, "SUPPORTED_ABIS",
+ new String[] {"foo", "bar"});
Assert.assertFalse(new DisableIfSkipCheck().shouldSkip(supportedAbisNoMatch));
} finally {
- Robolectric.Reflection.setFinalStaticField(Build.class, "CPU_ABI", originalAbi);
- Robolectric.Reflection.setFinalStaticField(Build.class, "CPU_ABI2", originalAbi2);
+ ReflectionHelpers.setStaticField(Build.class, "SUPPORTED_ABIS", originalAbis);
}
}
@@ -136,10 +130,10 @@ public class DisableIfTest {
};
String originalHardware = Build.HARDWARE;
try {
- Robolectric.Reflection.setFinalStaticField(Build.class, "HARDWARE", "hammerhead");
+ ReflectionHelpers.setStaticField(Build.class, "HARDWARE", "hammerhead");
Assert.assertTrue(new DisableIfSkipCheck().shouldSkip(hardwareIsMatches));
} finally {
- Robolectric.Reflection.setFinalStaticField(Build.class, "HARDWARE", originalHardware);
+ ReflectionHelpers.setStaticField(Build.class, "HARDWARE", originalHardware);
}
}
@@ -151,10 +145,10 @@ public class DisableIfTest {
};
String originalHardware = Build.HARDWARE;
try {
- Robolectric.Reflection.setFinalStaticField(Build.class, "HARDWARE", "mako");
+ ReflectionHelpers.setStaticField(Build.class, "HARDWARE", "mako");
Assert.assertFalse(new DisableIfSkipCheck().shouldSkip(hardwareIsDoesntMatch));
} finally {
- Robolectric.Reflection.setFinalStaticField(Build.class, "HARDWARE", originalHardware);
+ ReflectionHelpers.setStaticField(Build.class, "HARDWARE", originalHardware);
}
}
@@ -178,22 +172,22 @@ public class DisableIfTest {
TestCase sampleTestMethod = new DisableIfTestCase("sampleTestMethod");
String originalHardware = Build.HARDWARE;
try {
- Robolectric.Reflection.setFinalStaticField(Build.class, "HARDWARE", "hammerhead");
+ ReflectionHelpers.setStaticField(Build.class, "HARDWARE", "hammerhead");
Assert.assertTrue(new DisableIfSkipCheck().shouldSkip(sampleTestMethod));
} finally {
- Robolectric.Reflection.setFinalStaticField(Build.class, "HARDWARE", originalHardware);
+ ReflectionHelpers.setStaticField(Build.class, "HARDWARE", originalHardware);
}
}
@Test
public void testDisableSuperClass() {
TestCase sampleTestMethod = new DisableIfTestCase("sampleTestMethod");
- String originalAbi = Build.CPU_ABI;
+ String[] originalAbis = Build.SUPPORTED_ABIS;
try {
- Robolectric.Reflection.setFinalStaticField(Build.class, "CPU_ABI", "foo");
+ ReflectionHelpers.setStaticField(Build.class, "SUPPORTED_ABIS", new String[] {"foo"});
Assert.assertTrue(new DisableIfSkipCheck().shouldSkip(sampleTestMethod));
} finally {
- Robolectric.Reflection.setFinalStaticField(Build.class, "CPU_ABI", originalAbi);
+ ReflectionHelpers.setStaticField(Build.class, "SUPPORTED_ABIS", originalAbis);
}
}
}
« base/BUILD.gn ('K') | « base/test/android/junit/src/org/chromium/base/test/shadows/ShadowMultiDex.java ('k') | base/test/android/junit/src/org/chromium/base/test/util/MinAndroidSdkLevelSkipCheckTest.java » ('j') | build/android/pylib/junit/test_runner.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698