Migrate useLegacy and JUnit assumeTrue/False to TruthJUnit assume
Signed-off-by: utzcoz <utzcoz@outlook.com>
diff --git a/nativeruntime/src/test/java/org/robolectric/nativeruntime/DefaultNativeRuntimeLoaderTest.java b/nativeruntime/src/test/java/org/robolectric/nativeruntime/DefaultNativeRuntimeLoaderTest.java
index 0391159..e5d395f 100644
--- a/nativeruntime/src/test/java/org/robolectric/nativeruntime/DefaultNativeRuntimeLoaderTest.java
+++ b/nativeruntime/src/test/java/org/robolectric/nativeruntime/DefaultNativeRuntimeLoaderTest.java
@@ -2,7 +2,7 @@
import static android.os.Build.VERSION_CODES.O;
import static com.google.common.truth.Truth.assertThat;
-import static org.junit.Assume.assumeTrue;
+import static com.google.common.truth.TruthJUnit.assume;
import android.database.CursorWindow;
import android.database.sqlite.SQLiteDatabase;
@@ -33,8 +33,8 @@
@Test
public void extracts_fontsAndIcuData() {
- assumeTrue(hasResource("fonts"));
- assumeTrue(hasResource("icu/icudt68l.dat"));
+ assume().that(hasResource("fonts")).isTrue();
+ assume().that(hasResource("icu/icudt68l.dat")).isTrue();
DefaultNativeRuntimeLoader defaultNativeRuntimeLoader = new DefaultNativeRuntimeLoader();
defaultNativeRuntimeLoader.ensureLoaded();
// Check that extraction of some key files worked.
diff --git a/robolectric/src/test/java/org/robolectric/android/DrawableResourceLoaderTest.java b/robolectric/src/test/java/org/robolectric/android/DrawableResourceLoaderTest.java
index 87ddb07..0428c44 100644
--- a/robolectric/src/test/java/org/robolectric/android/DrawableResourceLoaderTest.java
+++ b/robolectric/src/test/java/org/robolectric/android/DrawableResourceLoaderTest.java
@@ -3,9 +3,9 @@
import static android.os.Build.VERSION_CODES.KITKAT_WATCH;
import static android.os.Build.VERSION_CODES.LOLLIPOP;
import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.TruthJUnit.assume;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-import static org.junit.Assume.assumeTrue;
import static org.robolectric.shadows.ShadowAssetManager.useLegacy;
import android.animation.Animator;
@@ -31,7 +31,7 @@
@Before
public void setup() throws Exception {
- assumeTrue(useLegacy());
+ assume().that(useLegacy()).isTrue();
resources = ApplicationProvider.getApplicationContext().getResources();
}
diff --git a/robolectric/src/test/java/org/robolectric/android/ResourceLoaderTest.java b/robolectric/src/test/java/org/robolectric/android/ResourceLoaderTest.java
index b895d65..15ca52c 100644
--- a/robolectric/src/test/java/org/robolectric/android/ResourceLoaderTest.java
+++ b/robolectric/src/test/java/org/robolectric/android/ResourceLoaderTest.java
@@ -2,7 +2,7 @@
import static android.os.Build.VERSION_CODES.O;
import static com.google.common.truth.Truth.assertThat;
-import static org.junit.Assume.assumeTrue;
+import static com.google.common.truth.TruthJUnit.assume;
import static org.robolectric.shadows.ShadowAssetManager.useLegacy;
import android.content.res.Configuration;
@@ -32,7 +32,7 @@
@Before
public void setUp() {
- assumeTrue(useLegacy());
+ assume().that(useLegacy()).isTrue();
optsForO = RuntimeEnvironment.getApiLevel() >= O
? "nowidecg-lowdr-"
@@ -71,7 +71,11 @@
private void checkForPollutionHelper() {
assertThat(RuntimeEnvironment.getQualifiers())
- .isEqualTo("en-rUS-ldltr-sw320dp-w320dp-h470dp-normal-notlong-notround-" + optsForO + "port-notnight-mdpi-finger-keyssoft-nokeys-navhidden-nonav-v" + Build.VERSION.RESOURCES_SDK_INT);
+ .isEqualTo(
+ "en-rUS-ldltr-sw320dp-w320dp-h470dp-normal-notlong-notround-"
+ + optsForO
+ + "port-notnight-mdpi-finger-keyssoft-nokeys-navhidden-nonav-v"
+ + Build.VERSION.RESOURCES_SDK_INT);
View view =
LayoutInflater.from(ApplicationProvider.getApplicationContext())
@@ -97,7 +101,10 @@
assertThat(resId).isNotNull();
assertThat(resourceProvider.getResName(resId)).isEqualTo(internalResource);
- Class<?> internalRIdClass = Robolectric.class.getClassLoader().loadClass("com.android.internal.R$" + internalResource.type);
+ Class<?> internalRIdClass =
+ Robolectric.class
+ .getClassLoader()
+ .loadClass("com.android.internal.R$" + internalResource.type);
int internalResourceId;
internalResourceId = (Integer) internalRIdClass.getDeclaredField(internalResource.name).get(null);
assertThat(resId).isEqualTo(internalResourceId);
diff --git a/robolectric/src/test/java/org/robolectric/android/ResourceTableFactoryIntegrationTest.java b/robolectric/src/test/java/org/robolectric/android/ResourceTableFactoryIntegrationTest.java
index 0ae4675..d4395c5 100644
--- a/robolectric/src/test/java/org/robolectric/android/ResourceTableFactoryIntegrationTest.java
+++ b/robolectric/src/test/java/org/robolectric/android/ResourceTableFactoryIntegrationTest.java
@@ -1,7 +1,7 @@
package org.robolectric.android;
import static com.google.common.truth.Truth.assertThat;
-import static org.junit.Assume.assumeTrue;
+import static com.google.common.truth.TruthJUnit.assume;
import static org.robolectric.shadows.ShadowAssetManager.useLegacy;
import android.os.Build;
@@ -17,7 +17,7 @@
public class ResourceTableFactoryIntegrationTest {
@Test
public void shouldIncludeStyleableAttributesThatDoNotHaveACorrespondingEntryInAttrClass() throws Exception {
- assumeTrue(useLegacy());
+ assume().that(useLegacy()).isTrue();
// This covers a corner case in Framework resources where an attribute is mentioned in a styleable array, e.g: R.styleable.Toolbar_buttonGravity but there is no corresponding R.attr.buttonGravity
assertThat(RuntimeEnvironment.getSystemResourceTable()
.getResourceId(new ResName("android", "attr", "buttonGravity"))).isGreaterThan(0);
diff --git a/robolectric/src/test/java/org/robolectric/android/XmlResourceParserImplTest.java b/robolectric/src/test/java/org/robolectric/android/XmlResourceParserImplTest.java
index b57f606..0c8d977 100644
--- a/robolectric/src/test/java/org/robolectric/android/XmlResourceParserImplTest.java
+++ b/robolectric/src/test/java/org/robolectric/android/XmlResourceParserImplTest.java
@@ -2,11 +2,11 @@
import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assertWithMessage;
+import static com.google.common.truth.TruthJUnit.assume;
import static java.nio.charset.StandardCharsets.UTF_8;
import static java.util.Arrays.asList;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeTrue;
import android.app.Application;
import android.content.res.XmlResourceParser;
@@ -276,7 +276,7 @@
@Test
public void testIsWhitespace() throws Exception {
- assumeTrue(RuntimeEnvironment.useLegacyResources());
+ assume().that(RuntimeEnvironment.useLegacyResources()).isTrue();
XmlResourceParserImpl parserImpl = (XmlResourceParserImpl) parser;
assertThat(parserImpl.isWhitespace("bar")).isFalse();
diff --git a/robolectric/src/test/java/org/robolectric/android/internal/AndroidTestEnvironmentTest.java b/robolectric/src/test/java/org/robolectric/android/internal/AndroidTestEnvironmentTest.java
index 8b5551a..3756994 100644
--- a/robolectric/src/test/java/org/robolectric/android/internal/AndroidTestEnvironmentTest.java
+++ b/robolectric/src/test/java/org/robolectric/android/internal/AndroidTestEnvironmentTest.java
@@ -2,8 +2,8 @@
import static android.os.Build.VERSION_CODES.O;
import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.TruthJUnit.assume;
import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeTrue;
import static org.robolectric.annotation.ConscryptMode.Mode.OFF;
import static org.robolectric.annotation.ConscryptMode.Mode.ON;
import static org.robolectric.annotation.LooperMode.Mode.LEGACY;
@@ -241,7 +241,7 @@
@Test
public void testResourceNotFound() {
// not relevant for binary resources mode
- assumeTrue(bootstrapWrapper.isLegacyResources());
+ assume().that(bootstrapWrapper.isLegacyResources()).isTrue();
try {
bootstrapWrapper.changeAppManifest(new ThrowingManifest(bootstrapWrapper.getAppManifest()));
diff --git a/robolectric/src/test/java/org/robolectric/res/StyleResourceLoaderTest.java b/robolectric/src/test/java/org/robolectric/res/StyleResourceLoaderTest.java
index 8b493ba..dc20266 100644
--- a/robolectric/src/test/java/org/robolectric/res/StyleResourceLoaderTest.java
+++ b/robolectric/src/test/java/org/robolectric/res/StyleResourceLoaderTest.java
@@ -2,7 +2,7 @@
import static android.os.Build.VERSION_CODES.JELLY_BEAN;
import static com.google.common.truth.Truth.assertThat;
-import static org.junit.Assume.assumeTrue;
+import static com.google.common.truth.TruthJUnit.assume;
import static org.robolectric.util.TestUtil.sdkResources;
import org.junit.Before;
@@ -18,14 +18,16 @@
@Before
public void setUp() throws Exception {
- assumeTrue(RuntimeEnvironment.useLegacyResources());
+ assume().that(RuntimeEnvironment.useLegacyResources()).isTrue();
ResourcePath resourcePath = sdkResources(JELLY_BEAN);
resourceTable = new ResourceTableFactory().newResourceTable("android", resourcePath);
}
@Test
public void testStyleDataIsLoadedCorrectly() throws Exception {
- TypedResource typedResource = resourceTable.getValue(new ResName("android", "style", "Theme_Holo"), new ResTable_config());
+ TypedResource typedResource =
+ resourceTable.getValue(
+ new ResName("android", "style", "Theme_Holo"), new ResTable_config());
StyleData styleData = (StyleData) typedResource.getData();
assertThat(styleData.getName()).isEqualTo("Theme_Holo");
assertThat(styleData.getParent()).isEqualTo("Theme");
diff --git a/robolectric/src/test/java/org/robolectric/shadows/ShadowAssetManagerTest.java b/robolectric/src/test/java/org/robolectric/shadows/ShadowAssetManagerTest.java
index 9ecb63d..5de84d8 100644
--- a/robolectric/src/test/java/org/robolectric/shadows/ShadowAssetManagerTest.java
+++ b/robolectric/src/test/java/org/robolectric/shadows/ShadowAssetManagerTest.java
@@ -1,8 +1,8 @@
package org.robolectric.shadows;
import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.TruthJUnit.assume;
import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import static org.robolectric.shadows.ShadowAssetManager.legacyShadowOf;
@@ -46,7 +46,7 @@
@Test
public void openFd_shouldProvideFileDescriptorForDeflatedAsset() throws Exception {
- assumeTrue(!useLegacy());
+ assume().that(useLegacy()).isFalse();
expectedException.expect(FileNotFoundException.class);
expectedException.expectMessage(
"This file can not be opened as a file descriptor; it is probably compressed");
@@ -79,7 +79,7 @@
@Test
public void openNonAssetShouldThrowExceptionWhenFileDoesNotExist() throws IOException {
- assumeTrue(useLegacy());
+ assume().that(useLegacy()).isTrue();
expectedException.expect(IOException.class);
expectedException.expectMessage(
@@ -90,7 +90,7 @@
@Test
public void unknownResourceIdsShouldReportPackagesSearched() throws IOException {
- assumeTrue(useLegacy());
+ assume().that(useLegacy()).isTrue();
expectedException.expect(Resources.NotFoundException.class);
expectedException.expectMessage("Resource ID #0xffffffff");
@@ -102,7 +102,7 @@
@Test
public void forSystemResources_unknownResourceIdsShouldReportPackagesSearched()
throws IOException {
- if (!useLegacy()) return;
+ assume().that(useLegacy()).isTrue();
expectedException.expect(Resources.NotFoundException.class);
expectedException.expectMessage("Resource ID #0xffffffff");
@@ -113,8 +113,7 @@
@Test
@Config(qualifiers = "mdpi")
public void openNonAssetShouldOpenCorrectAssetBasedOnQualifierMdpi() throws IOException {
- if (!useLegacy()) return;
-
+ assume().that(useLegacy()).isTrue();
InputStream inputStream = assetManager.openNonAsset(0, "res/drawable/robolectric.png", 0);
assertThat(countBytes(inputStream)).isEqualTo(8141);
}
@@ -122,8 +121,7 @@
@Test
@Config(qualifiers = "hdpi")
public void openNonAssetShouldOpenCorrectAssetBasedOnQualifierHdpi() throws IOException {
- if (!useLegacy()) return;
-
+ assume().that(useLegacy()).isTrue();
InputStream inputStream = assetManager.openNonAsset(0, "res/drawable/robolectric.png", 0);
assertThat(countBytes(inputStream)).isEqualTo(23447);
}
@@ -178,8 +176,7 @@
@Test
public void attrsToTypedArray_shouldAllowMockedAttributeSets() {
- if (!useLegacy()) return;
-
+ assume().that(useLegacy()).isTrue();
AttributeSet mockAttributeSet = mock(AttributeSet.class);
when(mockAttributeSet.getAttributeCount()).thenReturn(1);
when(mockAttributeSet.getAttributeNameResource(0)).thenReturn(android.R.attr.windowBackground);
@@ -191,7 +188,7 @@
@Test
public void whenStyleAttrResolutionFails_attrsToTypedArray_returnsNiceErrorMessage() {
- if (!useLegacy()) return;
+ assume().that(useLegacy()).isTrue();
expectedException.expect(RuntimeException.class);
expectedException.expectMessage(
"no value for org.robolectric:attr/styleNotSpecifiedInAnyTheme in theme with applied"
diff --git a/robolectric/src/test/java/org/robolectric/shadows/ShadowResourcesTest.java b/robolectric/src/test/java/org/robolectric/shadows/ShadowResourcesTest.java
index da34401..a4732b9 100644
--- a/robolectric/src/test/java/org/robolectric/shadows/ShadowResourcesTest.java
+++ b/robolectric/src/test/java/org/robolectric/shadows/ShadowResourcesTest.java
@@ -2,8 +2,7 @@
import static android.os.Build.VERSION_CODES.N_MR1;
import static com.google.common.truth.Truth.assertThat;
-import static org.junit.Assume.assumeFalse;
-import static org.junit.Assume.assumeTrue;
+import static com.google.common.truth.TruthJUnit.assume;
import static org.robolectric.Shadows.shadowOf;
import static org.robolectric.shadows.ShadowAssetManager.useLegacy;
@@ -85,7 +84,7 @@
@Test
public void openRawResourceFd_shouldReturnsNullForLegacyResource() throws Exception {
- assumeTrue(useLegacy());
+ assume().that(useLegacy()).isTrue();
try (AssetFileDescriptor afd = resources.openRawResourceFd(R.raw.raw_resource)) {
assertThat(afd).isNull();
}
@@ -93,7 +92,7 @@
@Test
public void openRawResourceFd_shouldReturnsValidFdForUnCompressFile() throws Exception {
- assumeFalse(useLegacy());
+ assume().that(useLegacy()).isFalse();
try (AssetFileDescriptor afd = resources.openRawResourceFd(R.raw.raw_resource)) {
assertThat(afd).isNotNull();
}
diff --git a/robolectric/src/test/java/org/robolectric/shadows/ShadowSQLiteConnectionTest.java b/robolectric/src/test/java/org/robolectric/shadows/ShadowSQLiteConnectionTest.java
index 323511f..878777c 100644
--- a/robolectric/src/test/java/org/robolectric/shadows/ShadowSQLiteConnectionTest.java
+++ b/robolectric/src/test/java/org/robolectric/shadows/ShadowSQLiteConnectionTest.java
@@ -3,8 +3,8 @@
import static android.os.Build.VERSION_CODES.LOLLIPOP;
import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assertWithMessage;
+import static com.google.common.truth.TruthJUnit.assume;
import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeTrue;
import static org.robolectric.annotation.SQLiteMode.Mode.LEGACY;
import static org.robolectric.shadows.ShadowLegacySQLiteConnection.convertSQLWithLocalizedUnicodeCollator;
@@ -64,7 +64,7 @@
@Test
public void testSqlConversion() {
- assumeTrue(SQLiteLibraryLoader.isOsSupported());
+ assume().that(SQLiteLibraryLoader.isOsSupported()).isTrue();
assertThat(convertSQLWithLocalizedUnicodeCollator("select * from `routine`"))
.isEqualTo("select * from `routine`");
@@ -88,7 +88,7 @@
@Test
public void testSQLWithLocalizedOrUnicodeCollatorShouldBeSortedAsNoCase() {
- assumeTrue(SQLiteLibraryLoader.isOsSupported());
+ assume().that(SQLiteLibraryLoader.isOsSupported()).isTrue();
database.execSQL("insert into routine(name) values ('الصحافة اليدوية')");
database.execSQL("insert into routine(name) values ('Hand press 1')");
database.execSQL("insert into routine(name) values ('hand press 2')");
@@ -116,28 +116,28 @@
@Test
public void nativeOpen_addsConnectionToPool() {
- assumeTrue(SQLiteLibraryLoader.isOsSupported());
+ assume().that(SQLiteLibraryLoader.isOsSupported()).isTrue();
assertThat(conn).isNotNull();
assertWithMessage("open").that(conn.isOpen()).isTrue();
}
@Test
public void nativeClose_closesConnection() {
- assumeTrue(SQLiteLibraryLoader.isOsSupported());
+ assume().that(SQLiteLibraryLoader.isOsSupported()).isTrue();
ShadowLegacySQLiteConnection.nativeClose(ptr);
assertWithMessage("open").that(conn.isOpen()).isFalse();
}
@Test
public void reset_closesConnection() {
- assumeTrue(SQLiteLibraryLoader.isOsSupported());
+ assume().that(SQLiteLibraryLoader.isOsSupported()).isTrue();
ShadowLegacySQLiteConnection.reset();
assertWithMessage("open").that(conn.isOpen()).isFalse();
}
@Test
public void reset_clearsConnectionCache() {
- assumeTrue(SQLiteLibraryLoader.isOsSupported());
+ assume().that(SQLiteLibraryLoader.isOsSupported()).isTrue();
final Map<Long, SQLiteConnection> connectionsMap =
ReflectionHelpers.getField(connections, "connectionsMap");
@@ -149,7 +149,7 @@
@Test
public void reset_clearsStatementCache() {
- assumeTrue(SQLiteLibraryLoader.isOsSupported());
+ assume().that(SQLiteLibraryLoader.isOsSupported()).isTrue();
final Map<Long, SQLiteStatement> statementsMap =
ReflectionHelpers.getField(connections, "statementsMap");
@@ -161,7 +161,7 @@
@Test
public void error_resultsInSpecificExceptionWithCause() {
- assumeTrue(SQLiteLibraryLoader.isOsSupported());
+ assume().that(SQLiteLibraryLoader.isOsSupported()).isTrue();
try {
database.execSQL("insert into routine(name) values ('Hand press 1')");
ContentValues values = new ContentValues(1);
@@ -178,7 +178,7 @@
@Test
public void interruption_doesNotConcurrentlyModifyDatabase() {
- assumeTrue(SQLiteLibraryLoader.isOsSupported());
+ assume().that(SQLiteLibraryLoader.isOsSupported()).isTrue();
Thread.currentThread().interrupt();
try {
database.execSQL("insert into routine(name) values ('الصحافة اليدوية')");
@@ -190,7 +190,7 @@
@Test
public void test_setUseInMemoryDatabase() {
- assumeTrue(SQLiteLibraryLoader.isOsSupported());
+ assume().that(SQLiteLibraryLoader.isOsSupported()).isTrue();
assertThat(conn.isMemoryDatabase()).isFalse();
ShadowSQLiteConnection.setUseInMemoryDatabase(true);
SQLiteDatabase inMemoryDb = createDatabase("in_memory.db");
@@ -201,7 +201,7 @@
@Test
public void cancel_shouldCancelAllStatements() {
- assumeTrue(SQLiteLibraryLoader.isOsSupported());
+ assume().that(SQLiteLibraryLoader.isOsSupported()).isTrue();
SQLiteStatement statement1 =
database.compileStatement("insert into routine(name) values ('Hand press 1')");
SQLiteStatement statement2 =
diff --git a/robolectric/src/test/java/org/robolectric/util/SQLiteLibraryLoaderTest.java b/robolectric/src/test/java/org/robolectric/util/SQLiteLibraryLoaderTest.java
index 3b06a4e..612fd3b 100644
--- a/robolectric/src/test/java/org/robolectric/util/SQLiteLibraryLoaderTest.java
+++ b/robolectric/src/test/java/org/robolectric/util/SQLiteLibraryLoaderTest.java
@@ -1,8 +1,8 @@
package org.robolectric.util;
import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.TruthJUnit.assume;
import static org.junit.Assert.assertThrows;
-import static org.junit.Assume.assumeTrue;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.junit.After;
@@ -56,7 +56,7 @@
@Test
public void shouldExtractNativeLibrary() {
- assumeTrue(SQLiteLibraryLoader.isOsSupported());
+ assume().that(SQLiteLibraryLoader.isOsSupported()).isTrue();
assertThat(loader.isLoaded()).isFalse();
loader.doLoad();
assertThat(loader.isLoaded()).isTrue();
