room ktx extension

Author: Krzysztof Borowy

android/build.gradle

@@ -108,12 +108,13 @@ dependencies {
         def room_version = "2.2.6"
         def coroutines_version = "1.4.2"
         def junit_version = "4.12"
-        def robolectric_version = "4.2.1"
+        def robolectric_version = "4.5.1"
         def truth_version = "1.1.2"
         def androidxtest_version = "1.1.0"
         def coroutinesTest_version = "1.4.2"
 
         implementation "androidx.room:room-runtime:$room_version"
+        implementation "androidx.room:room-ktx:$room_version"
         implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
         kapt "androidx.room:room-compiler:$room_version"
 

android/src/main/java/com/reactnativecommunity/asyncstorage/next/StorageSupplier.kt

@@ -12,7 +12,6 @@ import androidx.room.Query
 import androidx.room.Room
 import androidx.room.RoomDatabase
 import androidx.room.Transaction
-import androidx.room.Update
 import androidx.room.migration.Migration
 import androidx.sqlite.db.SupportSQLiteDatabase
 import org.json.JSONObject
@@ -35,18 +34,18 @@ internal interface StorageDao {
 
     @Transaction
     @Query("SELECT * FROM $TABLE_NAME WHERE `$COLUMN_KEY` IN (:keys)")
-    fun getValues(keys: List<String>): List<Entry>
+    suspend fun getValues(keys: List<String>): List<Entry>
 
     @Transaction
     @Insert(onConflict = OnConflictStrategy.REPLACE)
-    fun setValues(entries: List<Entry>)
+    suspend fun setValues(entries: List<Entry>)
 
     @Transaction
     @Query("DELETE FROM $TABLE_NAME WHERE `$COLUMN_KEY` in (:keys)")
-    fun removeValues(keys: List<String>)
+    suspend fun removeValues(keys: List<String>)
 
     @Transaction
-    fun mergeValues(entries: List<Entry>) {
+    suspend fun mergeValues(entries: List<Entry>) {
         val currentDbEntries = getValues(entries.map { it.key })
         val newEntries = mutableListOf<Entry>()
 
@@ -67,11 +66,11 @@ internal interface StorageDao {
 
     @Transaction
     @Query("SELECT `$COLUMN_KEY` FROM $TABLE_NAME")
-    fun getKeys(): List<String>
+    suspend fun getKeys(): List<String>
 
     @Transaction
     @Query("DELETE FROM $TABLE_NAME")
-    fun clear()
+    suspend fun clear()
 }
 
 
@@ -148,6 +147,7 @@ class StorageSupplier internal constructor(db: StorageDb) : AsyncStorageAccess {
             return StorageSupplier(StorageDb.getDatabase(ctx))
         }
     }
+
     private val access = db.storage()
 
     override suspend fun getValues(keys: List<String>) = access.getValues(keys)

android/src/test/java/com/reactnativecommunity/asyncstorage/next/StorageTest.kt

@@ -5,7 +5,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import com.google.common.truth.Truth.assertThat
 import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.test.runBlockingTest
+import kotlinx.coroutines.runBlocking
 import org.json.JSONObject
 import org.junit.After
 import org.junit.Before
@@ -24,7 +24,6 @@ class AsyncStorageAccessTest {
         database = Room.inMemoryDatabaseBuilder(
             InstrumentationRegistry.getInstrumentation().context, StorageDb::class.java
         ).allowMainThreadQueries().build()
-
         asyncStorage = StorageSupplier(database)
     }
 
@@ -34,7 +33,7 @@ class AsyncStorageAccessTest {
     }
 
     @Test
-    fun performsBasicGetSetRemoveOperations() = runBlockingTest {
+    fun performsBasicGetSetRemoveOperations() = runBlocking {
         val entriesCount = 10
         val entries = createRandomEntries(entriesCount)
         val keys = entries.map { it.key }
@@ -49,7 +48,7 @@ class AsyncStorageAccessTest {
     }
 
     @Test
-    fun readsAllKeysAndClearsDb() = runBlockingTest {
+    fun readsAllKeysAndClearsDb() = runBlocking {
         val entries = createRandomEntries(8)
         val keys = entries.map { it.key }
         asyncStorage.setValues(entries)
@@ -60,7 +59,7 @@ class AsyncStorageAccessTest {
     }
 
     @Test
-    fun mergesDeeplyTwoValues() = runBlockingTest {
+    fun mergesDeeplyTwoValues() = runBlocking {
         val initialEntry = Entry("key", VALUE_INITIAL)
         val overrideEntry = Entry("key", VALUE_OVERRIDES)
         asyncStorage.setValues(listOf(initialEntry))
@@ -70,7 +69,7 @@ class AsyncStorageAccessTest {
     }
 
     @Test
-    fun updatesExistingValues() = runBlockingTest {
+    fun updatesExistingValues() = runBlocking {
         val key = "test_key"
         val value = "test_value"
         val entries = listOf(Entry(key, value))