Remove guava truth dependency from tests.
Test: Ran modified tests
Bug: 161133686
Change-Id: I16365a47ef042f186b36cc91a12068b791041b5a
diff --git a/datastore/datastore-preferences/build.gradle b/datastore/datastore-preferences/build.gradle
index e3d539e..fe865ae 100644
--- a/datastore/datastore-preferences/build.gradle
+++ b/datastore/datastore-preferences/build.gradle
@@ -34,13 +34,11 @@
testImplementation(JUNIT)
testImplementation(KOTLIN_COROUTINES_TEST)
- testImplementation(TRUTH)
- testImplementation(project(":internal-testutils-truth"))
+ testImplementation(KOTLIN_TEST)
androidTestImplementation(JUNIT)
androidTestImplementation(KOTLIN_COROUTINES_TEST)
- androidTestImplementation(TRUTH)
- androidTestImplementation(project(":internal-testutils-truth"))
+ androidTestImplementation(KOTLIN_TEST)
androidTestImplementation(ANDROIDX_TEST_RUNNER)
androidTestImplementation(ANDROIDX_TEST_CORE)
}
diff --git a/datastore/datastore-preferences/src/androidTest/java/androidx/datastore/preferences/SharedPreferencesToPreferencesTest.kt b/datastore/datastore-preferences/src/androidTest/java/androidx/datastore/preferences/SharedPreferencesToPreferencesTest.kt
index 2225719..10f9c23 100644
--- a/datastore/datastore-preferences/src/androidTest/java/androidx/datastore/preferences/SharedPreferencesToPreferencesTest.kt
+++ b/datastore/datastore-preferences/src/androidTest/java/androidx/datastore/preferences/SharedPreferencesToPreferencesTest.kt
@@ -22,7 +22,6 @@
import androidx.datastore.DataStore
import androidx.test.core.app.ApplicationProvider
import androidx.test.filters.MediumTest
-import com.google.common.truth.Truth.assertThat
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.test.TestCoroutineScope
import kotlinx.coroutines.test.runBlockingTest
@@ -31,6 +30,9 @@
import org.junit.Test
import org.junit.rules.TemporaryFolder
import java.io.File
+import kotlin.test.assertEquals
+import kotlin.test.assertFalse
+import kotlin.test.assertTrue
@kotlinx.coroutines.ExperimentalCoroutinesApi
@kotlinx.coroutines.ObsoleteCoroutinesApi
@@ -53,7 +55,7 @@
sharedPrefs = context.getSharedPreferences(sharedPrefsName, Context.MODE_PRIVATE)
datastoreFile = temporaryFolder.newFile("test_file.preferences_pb")
- assertThat(sharedPrefs.edit().clear().commit()).isTrue()
+ assertTrue { sharedPrefs.edit().clear().commit() }
}
@Test
@@ -61,7 +63,7 @@
val stringKey = "string_key"
val stringValue = "string value"
- assertThat(sharedPrefs.edit().putString(stringKey, stringValue).commit()).isTrue()
+ assertTrue { sharedPrefs.edit().putString(stringKey, stringValue).commit() }
val migration = SharedPreferencesMigration(
context = context,
@@ -72,8 +74,8 @@
val prefs = preferencesStore.data.first()
- assertThat(prefs.getString(stringKey, "default_string")).isEqualTo(stringValue)
- assertThat(prefs.getAll().size).isEqualTo(1)
+ assertEquals(stringValue, prefs.getString(stringKey, "default_string"))
+ assertEquals(prefs.getAll().size, 1)
}
@Test
@@ -81,7 +83,7 @@
val stringKey = "string_key"
val stringValue = "string value"
- assertThat(sharedPrefs.edit().putString(stringKey, stringValue).commit()).isTrue()
+ assertTrue { sharedPrefs.edit().putString(stringKey, stringValue).commit() }
val migration = SharedPreferencesMigration(
context = context,
@@ -93,7 +95,7 @@
// Get data so migration is run.
preferencesStore.data.first()
- assertThat(sharedPrefs.contains(stringKey)).isFalse()
+ assertFalse(sharedPrefs.contains(stringKey))
}
@Test
@@ -101,7 +103,7 @@
val stringKey = "string_key"
val stringValue = "string_value"
- assertThat(sharedPrefs.edit().putString(stringKey, stringValue).commit()).isTrue()
+ assertTrue { sharedPrefs.edit().putString(stringKey, stringValue).commit() }
val migration = SharedPreferencesMigration(
context = context,
@@ -110,8 +112,8 @@
val preferencesStore = getDataStoreWithMigrations(listOf(migration))
val prefs = preferencesStore.data.first()
- assertThat(prefs.getString(stringKey, "default_string")).isEqualTo(stringValue)
- assertThat(prefs.getAll().size).isEqualTo(1)
+ assertEquals(stringValue, prefs.getString(stringKey, "default_string"))
+ assertEquals(prefs.getAll().size, 1)
}
@Test
@@ -119,7 +121,7 @@
val integerKey = "integer_key"
val integerValue = 123
- assertThat(sharedPrefs.edit().putInt(integerKey, integerValue).commit()).isTrue()
+ assertTrue { sharedPrefs.edit().putInt(integerKey, integerValue).commit() }
val migration = SharedPreferencesMigration(
context = context,
@@ -128,8 +130,8 @@
val preferencesStore = getDataStoreWithMigrations(listOf(migration))
val prefs = preferencesStore.data.first()
- assertThat(prefs.getInt(integerKey, -1)).isEqualTo(integerValue)
- assertThat(prefs.getAll().size).isEqualTo(1)
+ assertEquals(integerValue, prefs.getInt(integerKey, -1))
+ assertEquals(1, prefs.getAll().size)
}
@Test
@@ -137,7 +139,7 @@
val floatKey = "float_key"
val floatValue = 123.0f
- assertThat(sharedPrefs.edit().putFloat(floatKey, floatValue).commit()).isTrue()
+ assertTrue { sharedPrefs.edit().putFloat(floatKey, floatValue).commit() }
val migration = SharedPreferencesMigration(
context = context,
@@ -146,8 +148,8 @@
val preferencesStore = getDataStoreWithMigrations(listOf(migration))
val prefs = preferencesStore.data.first()
- assertThat(prefs.getFloat(floatKey, -1.0f)).isEqualTo(floatValue)
- assertThat(prefs.getAll().size).isEqualTo(1)
+ assertEquals(floatValue, prefs.getFloat(floatKey, -1.0f))
+ assertEquals(1, prefs.getAll().size)
}
@Test
@@ -155,7 +157,7 @@
val booleanKey = "boolean_key"
val booleanValue = true
- assertThat(sharedPrefs.edit().putBoolean(booleanKey, booleanValue).commit()).isTrue()
+ assertTrue { sharedPrefs.edit().putBoolean(booleanKey, booleanValue).commit() }
val migration = SharedPreferencesMigration(
context = context,
@@ -164,8 +166,8 @@
val preferencesStore = getDataStoreWithMigrations(listOf(migration))
val prefs = preferencesStore.data.first()
- assertThat(prefs.getBoolean(booleanKey, false)).isEqualTo(booleanValue)
- assertThat(prefs.getAll().size).isEqualTo(1)
+ assertEquals(booleanValue, prefs.getBoolean(booleanKey, false))
+ assertEquals(1, prefs.getAll().size)
}
@Test
@@ -173,7 +175,7 @@
val longKey = "long_key"
val longValue = 1L shr 50
- assertThat(sharedPrefs.edit().putLong(longKey, longValue).commit()).isTrue()
+ assertTrue { sharedPrefs.edit().putLong(longKey, longValue).commit() }
val migration = SharedPreferencesMigration(
context = context,
@@ -182,8 +184,8 @@
val preferencesStore = getDataStoreWithMigrations(listOf(migration))
val prefs = preferencesStore.data.first()
- assertThat(prefs.getLong(longKey, -1)).isEqualTo(longValue)
- assertThat(prefs.getAll().size).isEqualTo(1)
+ assertEquals(longValue, prefs.getLong(longKey, -1))
+ assertEquals(1, prefs.getAll().size)
}
@Test
@@ -191,7 +193,7 @@
val stringSetKey = "stringSet_key"
val stringSetValue = setOf("a", "b", "c")
- assertThat(sharedPrefs.edit().putStringSet(stringSetKey, stringSetValue).commit()).isTrue()
+ assertTrue { sharedPrefs.edit().putStringSet(stringSetKey, stringSetValue).commit() }
val migration = SharedPreferencesMigration(
context = context,
@@ -200,8 +202,8 @@
val preferencesStore = getDataStoreWithMigrations(listOf(migration))
val prefs = preferencesStore.data.first()
- assertThat(prefs.getStringSet(stringSetKey, setOf())).isEqualTo(stringSetValue)
- assertThat(prefs.getAll().size).isEqualTo(1)
+ assertEquals(stringSetValue, prefs.getStringSet(stringSetKey, setOf()))
+ assertEquals(1, prefs.getAll().size)
}
@Test
@@ -209,9 +211,9 @@
val stringSetKey = "stringSet_key"
val stringSetValue = setOf("a", "b", "c")
- assertThat(sharedPrefs.edit().putStringSet(stringSetKey, stringSetValue).commit()).isTrue()
+ assertTrue { sharedPrefs.edit().putStringSet(stringSetKey, stringSetValue).commit() }
val sharedPrefsSet = sharedPrefs.getStringSet(stringSetKey, mutableSetOf())!!
- assertThat(sharedPrefsSet).isEqualTo(stringSetValue)
+ assertEquals(stringSetValue, sharedPrefsSet)
val migration = SharedPreferencesMigration(
context = context,
@@ -225,15 +227,15 @@
// Modify the sharedPrefs string set:
sharedPrefsSet.add("d")
- assertThat(prefs.getStringSet(stringSetKey, setOf())).isEqualTo(stringSetValue)
- assertThat(prefs.getAll().size).isEqualTo(1)
+ assertEquals(stringSetValue, prefs.getStringSet(stringSetKey, setOf<String>()))
+ assertEquals(1, prefs.getAll().size)
}
@Test
fun sharedPreferencesFileDeletedIfPrefsEmpty() = runBlockingTest {
val integerKey = "integer_key"
- assertThat(sharedPrefs.edit().putInt(integerKey, 123).commit()).isTrue()
+ assertTrue { sharedPrefs.edit().putInt(integerKey, 123).commit() }
val migration = SharedPreferencesMigration(
context = context,
@@ -245,14 +247,14 @@
val preferenceStore = getDataStoreWithMigrations(listOf(migration))
preferenceStore.data.first()
- assertThat(getSharedPrefsFile(context, sharedPrefsName).exists()).isFalse()
+ assertFalse(getSharedPrefsFile(context, sharedPrefsName).exists())
}
@Test
fun sharedPreferencesFileNotDeletedIfDisabled() = runBlockingTest {
val integerKey = "integer_key"
- assertThat(sharedPrefs.edit().putInt(integerKey, 123).commit()).isTrue()
+ assertTrue { sharedPrefs.edit().putInt(integerKey, 123).commit() }
val migration = SharedPreferencesMigration(
context = context,
@@ -264,7 +266,9 @@
val preferenceStore = getDataStoreWithMigrations(listOf(migration))
preferenceStore.data.first()
- assertThat(getSharedPrefsFile(context, sharedPrefsName).exists()).isTrue()
+ assertTrue {
+ getSharedPrefsFile(context, sharedPrefsName).exists()
+ }
}
@Test
@@ -272,8 +276,9 @@
val integerKey1 = "integer_key1"
val integerKey2 = "integer_key2"
- assertThat(sharedPrefs.edit().putInt(integerKey1, 123).putInt(integerKey2, 123).commit())
- .isTrue()
+ assertTrue {
+ sharedPrefs.edit().putInt(integerKey1, 123).putInt(integerKey2, 123).commit()
+ }
val migration = SharedPreferencesMigration(
context = context,
@@ -285,7 +290,7 @@
val preferenceStore = getDataStoreWithMigrations(listOf(migration))
preferenceStore.data.first()
- assertThat(getSharedPrefsFile(context, sharedPrefsName).exists()).isTrue()
+ assertTrue { getSharedPrefsFile(context, sharedPrefsName).exists() }
}
@Test
@@ -295,9 +300,9 @@
// Write to shared preferences then create the backup file
val sharedPrefsFile = getSharedPrefsFile(context, sharedPrefsName)
val sharedPrefsBackupFile = getSharedPrefsBackup(sharedPrefsFile)
- assertThat(sharedPrefs.edit().putInt(integerKey, 123).commit()).isTrue()
- assertThat(sharedPrefsFile.exists()).isTrue()
- assertThat(sharedPrefsFile.renameTo(sharedPrefsBackupFile)).isTrue()
+ assertTrue { sharedPrefs.edit().putInt(integerKey, 123).commit() }
+ assertTrue { sharedPrefsFile.exists() }
+ assertTrue { sharedPrefsFile.renameTo(sharedPrefsBackupFile) }
val migration = SharedPreferencesMigration(
context = context,
@@ -309,7 +314,7 @@
val preferenceStore = getDataStoreWithMigrations(listOf(migration))
preferenceStore.data.first()
- assertThat(sharedPrefsBackupFile.exists()).isFalse()
+ assertFalse(sharedPrefsBackupFile.exists())
}
@Test
@@ -322,13 +327,13 @@
val intValue = 12345
val notMigratedString = "dont migrate this string"
- assertThat(
+ assertTrue {
sharedPrefs.edit()
.putString(stringKey, stringValue)
.putInt(integerKey, intValue)
.putString(keyNotMigrated, notMigratedString)
.commit()
- ).isTrue()
+ }
val migration = SharedPreferencesMigration(
context = context,
@@ -340,13 +345,11 @@
val prefs = preferencesStore.data.first()
- assertThat(prefs.getString(stringKey, "default_string"))
- .isEqualTo(stringValue)
- assertThat(prefs.getInt(integerKey, -1))
- .isEqualTo(intValue)
+ assertEquals(stringValue, prefs.getString(stringKey, "default_string"))
+ assertEquals(intValue, prefs.getInt(integerKey, -1))
- assertThat(prefs.getAll().size).isEqualTo(2)
- assertThat(sharedPrefs.getString(keyNotMigrated, "")).isEqualTo(notMigratedString)
+ assertEquals(2, prefs.getAll().size)
+ assertEquals(notMigratedString, sharedPrefs.getString(keyNotMigrated, ""))
}
@Test
@@ -362,8 +365,8 @@
val preferencesStore = getDataStoreWithMigrations(listOf(migration))
val prefs = preferencesStore.data.first()
- assertThat(prefs.contains(missingKey)).isFalse()
- assertThat(prefs.getAll()).doesNotContainKey(missingKey)
+ assertFalse(prefs.contains(missingKey))
+ assertFalse(prefs.getAll().containsKey(missingKey))
}
@Test
@@ -373,7 +376,7 @@
val integerValue = 123
- assertThat(sharedPrefs.edit().putInt(integerKey, integerValue).commit()).isTrue()
+ assertTrue { sharedPrefs.edit().putInt(integerKey, integerValue).commit() }
val migration = SharedPreferencesMigration(
context = context,
@@ -383,8 +386,8 @@
val preferencesStore = getDataStoreWithMigrations(listOf(migration))
val prefs = preferencesStore.data.first()
- assertThat(prefs.getInt(integerKey, -1)).isEqualTo(integerValue)
- assertThat(prefs.getAll().size).isEqualTo(1)
+ assertEquals(integerValue, prefs.getInt(integerKey, -1))
+ assertEquals(1, prefs.getAll().size)
}
private fun getDataStoreWithMigrations(
diff --git a/datastore/datastore-preferences/src/test/java/androidx/datastore/preferences/PreferenceDataStoreFactoryTest.kt b/datastore/datastore-preferences/src/test/java/androidx/datastore/preferences/PreferenceDataStoreFactoryTest.kt
index 7a7e43f..e200d12 100644
--- a/datastore/datastore-preferences/src/test/java/androidx/datastore/preferences/PreferenceDataStoreFactoryTest.kt
+++ b/datastore/datastore-preferences/src/test/java/androidx/datastore/preferences/PreferenceDataStoreFactoryTest.kt
@@ -18,7 +18,6 @@
import androidx.datastore.DataMigration
import androidx.datastore.handlers.ReplaceFileCorruptionHandler
-import com.google.common.truth.Truth.assertThat
import kotlinx.coroutines.FlowPreview
import kotlinx.coroutines.ObsoleteCoroutinesApi
import kotlinx.coroutines.flow.first
@@ -29,6 +28,7 @@
import org.junit.Test
import org.junit.rules.TemporaryFolder
import java.io.File
+import kotlin.test.assertEquals
@ObsoleteCoroutinesApi
@kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -58,10 +58,10 @@
.setString("key", "value")
.build()
- assertThat(store.updateData {
+ assertEquals(store.updateData {
it.toBuilder().setString("key", "value").build()
- }).isEqualTo(expectedPreferences)
- assertThat(store.data.first()).isEqualTo(expectedPreferences)
+ }, expectedPreferences)
+ assertEquals(expectedPreferences, store.data.first())
}
@Test
@@ -79,7 +79,7 @@
},
scope = dataStoreScope
)
- assertThat(store.data.first()).isEqualTo(valueToReplace)
+ assertEquals(valueToReplace, store.data.first())
}
@Test
@@ -118,6 +118,6 @@
scope = dataStoreScope
)
- assertThat(store.data.first()).isEqualTo(expectedPreferences)
+ assertEquals(expectedPreferences, store.data.first())
}
}
\ No newline at end of file
diff --git a/datastore/datastore-preferences/src/test/java/androidx/datastore/preferences/PreferencesSerializerTest.kt b/datastore/datastore-preferences/src/test/java/androidx/datastore/preferences/PreferencesSerializerTest.kt
index c5bda61..836f67b 100644
--- a/datastore/datastore-preferences/src/test/java/androidx/datastore/preferences/PreferencesSerializerTest.kt
+++ b/datastore/datastore-preferences/src/test/java/androidx/datastore/preferences/PreferencesSerializerTest.kt
@@ -17,13 +17,13 @@
package androidx.datastore.preferences
import androidx.datastore.CorruptionException
-import androidx.testutils.assertThrows
-import com.google.common.truth.Truth.assertThat
import org.junit.Before
import org.junit.Rule
import org.junit.Test
import org.junit.rules.TemporaryFolder
import java.io.File
+import kotlin.test.assertEquals
+import kotlin.test.assertFailsWith
@kotlinx.coroutines.ExperimentalCoroutinesApi
@kotlinx.coroutines.ObsoleteCoroutinesApi
@@ -57,7 +57,7 @@
preferencesSerializer.readFrom(it)
}
- assertThat(readPrefs).isEqualTo(prefs)
+ assertEquals(prefs, readPrefs)
}
@Test
@@ -76,7 +76,7 @@
preferencesSerializer.readFrom(it)
}
- assertThat(readPrefs).isEqualTo(prefs)
+ assertEquals(prefs, readPrefs)
}
@Test
@@ -95,7 +95,7 @@
preferencesSerializer.readFrom(it)
}
- assertThat(readPrefs).isEqualTo(prefs)
+ assertEquals(prefs, readPrefs)
}
@Test
@@ -114,7 +114,7 @@
preferencesSerializer.readFrom(it)
}
- assertThat(readPrefs).isEqualTo(prefs)
+ assertEquals(prefs, readPrefs)
}
@Test
@@ -133,7 +133,7 @@
preferencesSerializer.readFrom(it)
}
- assertThat(readPrefs).isEqualTo(prefs)
+ assertEquals(prefs, readPrefs)
}
@Test
@@ -141,7 +141,7 @@
// Not a valid proto - protos cannot start with a 0 byte.
testFile.writeBytes(byteArrayOf(0, 1, 2, 3, 4))
- assertThrows<CorruptionException> {
+ assertFailsWith<CorruptionException> {
testFile.inputStream().use {
preferencesSerializer.readFrom(it)
}
diff --git a/datastore/datastore-preferences/src/test/java/androidx/datastore/preferences/PreferencesTest.kt b/datastore/datastore-preferences/src/test/java/androidx/datastore/preferences/PreferencesTest.kt
index fa4bb98..542a2ee 100644
--- a/datastore/datastore-preferences/src/test/java/androidx/datastore/preferences/PreferencesTest.kt
+++ b/datastore/datastore-preferences/src/test/java/androidx/datastore/preferences/PreferencesTest.kt
@@ -16,11 +16,14 @@
package androidx.datastore.preferences
-import androidx.testutils.assertThrows
-import com.google.common.truth.Truth.assertThat
import org.junit.Test
import org.junit.runner.RunWith
import org.junit.runners.JUnit4
+import kotlin.test.assertEquals
+import kotlin.test.assertFailsWith
+import kotlin.test.assertFalse
+import kotlin.test.assertNotEquals
+import kotlin.test.assertTrue
@RunWith(JUnit4::class)
class PreferencesTest {
@@ -35,14 +38,13 @@
.setBoolean(booleanKey, true)
.build()
- assertThat(prefs.contains(booleanKey)).isTrue()
- assertThat(prefs.getBoolean(booleanKey, false)).isTrue()
+ assertTrue { prefs.contains(booleanKey) }
+ assertTrue { prefs.getBoolean(booleanKey, false) }
}
@Test
fun testBooleanDefault() {
- assertThat(Preferences.empty().getBoolean("nonexistent key", false))
- .isFalse()
+ assertFalse(Preferences.empty().getBoolean("nonexistent key", false))
}
@Test
@@ -55,14 +57,13 @@
.setFloat(floatKey, 1.1f)
.build()
- assertThat(prefs.contains(floatKey)).isTrue()
- assertThat(prefs.getFloat(floatKey, 0.0f)).isEqualTo(1.1f)
+ assertTrue { prefs.contains(floatKey) }
+ assertEquals(1.1f, prefs.getFloat(floatKey, 0.0f))
}
@Test
fun testFloatDefault() {
- assertThat(Preferences.empty().getFloat("nonexistent key", 0.1f))
- .isEqualTo(0.1f)
+ assertEquals(0.1f, Preferences.empty().getFloat("nonexistent key", 0.1f))
}
@Test
@@ -75,14 +76,13 @@
.setInt(intKey, 1)
.build()
- assertThat(prefs.contains(intKey)).isTrue()
- assertThat(prefs.getInt(intKey, -1)).isEqualTo(1)
+ assertTrue { prefs.contains(intKey) }
+ assertEquals(1, prefs.getInt(intKey, -1))
}
@Test
fun testIntDefault() {
- assertThat(Preferences.empty().getInt("nonexistent key", 123))
- .isEqualTo(123)
+ assertEquals(123, Preferences.empty().getInt("nonexistent key", 123))
}
@Test
@@ -97,14 +97,13 @@
.setLong(longKey, bigLong)
.build()
- assertThat(prefs.contains(longKey)).isTrue()
- assertThat(prefs.getLong(longKey, -1)).isEqualTo(bigLong)
+ assertTrue { prefs.contains(longKey) }
+ assertEquals(bigLong, prefs.getLong(longKey, -1))
}
@Test
fun testLongDefault() {
- assertThat(Preferences.empty().getLong("nonexistent key", 123))
- .isEqualTo(123)
+ assertEquals(123, Preferences.empty().getLong("nonexistent key", 123))
}
@Test
@@ -117,15 +116,13 @@
.setString(stringKey, "string123")
.build()
- assertThat(prefs.contains(stringKey)).isTrue()
- assertThat(prefs.getString(stringKey, "default string"))
- .isEqualTo("string123")
+ assertTrue { prefs.contains(stringKey) }
+ assertEquals("string123", prefs.getString(stringKey, "default string"))
}
@Test
fun testStringDefault() {
- assertThat(Preferences.empty().getString("nonexistent key", "default val"))
- .isEqualTo("default val")
+ assertEquals("default val", Preferences.empty().getString("nonexistent key", "default val"))
}
@Test
@@ -138,23 +135,24 @@
.setStringSet(stringSetKey, setOf("string1", "string2", "string3"))
.build()
- assertThat(prefs.contains(stringSetKey)).isTrue()
- assertThat(prefs.getStringSet(stringSetKey, setOf())).isEqualTo(
+ assertTrue { prefs.contains(stringSetKey) }
+ assertEquals(
+
setOf(
"string1",
"string2",
"string3"
- )
+ ), prefs.getStringSet(stringSetKey, setOf())
)
}
@Test
fun testStringSetDefault() {
- assertThat(
- Preferences.empty().getStringSet(
+ assertEquals(
+ setOf("default set"), Preferences.empty().getStringSet(
"nonexistent key", setOf("default set")
)
- ).isEqualTo(setOf("default set"))
+ )
}
@Test
@@ -172,12 +170,13 @@
mutableReturnedSet.clear()
mutableReturnedSet.add("Original set does not contain this string")
- assertThat(prefs.getStringSet(stringSetKey, setOf())).isEqualTo(
+ assertEquals(
setOf(
"string1",
"string2",
"string3"
- )
+ ),
+ prefs.getStringSet(stringSetKey, setOf())
)
}
@@ -191,10 +190,10 @@
.setString(stringKey, "string123")
.build()
- assertThat(prefs.contains(stringKey)).isTrue()
+ assertTrue { prefs.contains(stringKey) }
// Trying to get a long where there is a string value throws a ClassCastException.
- assertThrows<ClassCastException> { prefs.getLong(stringKey, 123) }
+ assertFailsWith<ClassCastException> { prefs.getLong(stringKey, 123) }
}
@Test
@@ -210,10 +209,10 @@
.build()
val allPreferences = prefs.getAll()
- assertThat(allPreferences.size).isEqualTo(2)
+ assertEquals(2, allPreferences.size)
- assertThat(allPreferences[intKey]).isEqualTo(123)
- assertThat(allPreferences[stringSetKey]).isEqualTo(setOf("1", "2", "3"))
+ assertEquals(123, allPreferences[intKey])
+ assertEquals(setOf("1", "2", "3"), (allPreferences[stringSetKey]))
}
@Test
@@ -233,8 +232,8 @@
mutableAllPreferences[intKey] = 99999
(mutableAllPreferences[stringSetKey] as MutableSet<String>).clear()
- assertThat(prefs.getInt(intKey, -1)).isEqualTo(123)
- assertThat(prefs.getStringSet(stringSetKey, setOf())).isEqualTo(setOf("1", "2", "3"))
+ assertEquals(123, prefs.getInt(intKey, -1))
+ assertEquals(setOf("1", "2", "3"), prefs.getStringSet(stringSetKey, setOf()))
}
@Test
@@ -249,7 +248,7 @@
val emptyPrefs = prefsWithInt.toBuilder().clear().build()
- assertThat(emptyPrefs).isEqualTo(Preferences.empty())
+ assertEquals(Preferences.empty(), emptyPrefs)
}
@Test
@@ -264,14 +263,14 @@
val emptyPrefs = prefsWithInt.toBuilder().remove(intKey).build()
- assertThat(emptyPrefs).isEqualTo(Preferences.empty())
+ assertEquals(Preferences.empty(), emptyPrefs)
}
@Test
fun testBuilderPublicConstructor() {
val emptyPrefs = Preferences.Builder().build()
- assertThat(emptyPrefs).isEqualTo(Preferences.empty())
+ assertEquals(Preferences.empty(), emptyPrefs)
}
@Test
@@ -281,7 +280,7 @@
val prefs1 = Preferences.empty().toBuilder().setInt(intKey1, 123).build()
val prefs2 = Preferences.empty().toBuilder().setInt(intKey1, 123).build()
- assertThat(prefs1).isEqualTo(prefs2)
+ assertEquals(prefs1, prefs2)
}
@Test
@@ -301,7 +300,7 @@
.setInt(intKey2, 123)
.build()
- assertThat(prefs1).isNotEqualTo(prefs2)
+ assertNotEquals(prefs1, prefs2)
}
@Test
@@ -320,7 +319,7 @@
.setInt(intKey, 999)
.build()
- assertThat(prefs1).isNotEqualTo(prefs2)
+ assertNotEquals(prefs1, prefs2)
}
@Test
@@ -339,6 +338,6 @@
.setStringSet(stringSetKey, setOf("different string1", "string2"))
.build()
- assertThat(prefs1).isNotEqualTo(prefs2)
+ assertNotEquals(prefs1, prefs2)
}
}
\ No newline at end of file
