cleanup

Author: Krzysztof Borowy

.circleci/config.yml

@@ -208,22 +208,10 @@ jobs:
           name: Run e2e tests
           command: yarn test:e2e:ios
 
-
   "Build: Android release apk":
     <<: *android_defaults
     steps:
       - *addWorkspace
-#      - restore-cache: *cache_restore_yarn
-#      - run:
-#          name: Installing Yarn dependencies
-#          command: yarn --pure-lockfile --non-interactive --cache-folder ~/.cache/yarn
-#      - save-cache: *cache_save_yarn
-#      - restore-cache: *cache_restore_gradle
-#      - run:
-#          name: Downloading Gradle dependencies
-#          working_directory: example/android
-#          command: ./gradlew --max-workers 2 fetchDependencies
-#      - save-cache: *cache_save_gradle
       - run:
           name: Bundle JS
           command: yarn bundle:android --dev false
@@ -293,7 +281,7 @@ jobs:
                 -no-snapshot \
                 -no-boot-anim \
                 -no-window \
-                -logcat '*:W' | grep -i "ReactNative"
+                -logcat '*:E ReactNative:W ReactNativeJS:*'
       - run:
           name: Wait for emulator to boot
           command: ./scripts/android_e2e.sh 'wait_for_emulator'

android/build.gradle

@@ -61,6 +61,8 @@ if (newDbSize != null && newDbSize.isLong()) {
 
 // Instead of reusing AsyncTask thread pool, AsyncStorage can use its own executor
 def useDedicatedExecutor = getFlagOrDefault('AsyncStorage_dedicatedExecutor', false)
+
+// Use next storage implementation
 def useNextStorage = getFlagOrDefault("AsyncStorage_useNextStorage", false)
 
 apply plugin: 'com.android.library'

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

@@ -28,11 +28,6 @@ class StorageModule(reactContext: ReactContext) : ReactContextBaseJavaModule(),
         }
     }
 
-    /**
-     * Todo:
-     *  - DB tests
-     */
-
     @ReactMethod
     fun multiGet(keys: ReadableArray, cb: Callback) {
         launch(createExceptionHandler(cb)) {

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

@@ -90,13 +90,10 @@ internal interface StorageDao {
 private object MIGRATION_TO_NEXT : Migration(1, 2) {
     override fun migrate(database: SupportSQLiteDatabase) {
         val oldTableName = "catalystLocalStorage" // from ReactDatabaseSupplier
-
         database.execSQL("CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`${COLUMN_KEY}` TEXT NOT NULL, `${COLUMN_VALUE}` TEXT, PRIMARY KEY(`${COLUMN_KEY}`));")
-
         // even if the old AsyncStorage has checks for not nullable keys
         // make sure we don't copy any, to not fail migration
         database.execSQL("DELETE FROM $oldTableName WHERE `${COLUMN_KEY}` IS NULL")
-
         database.execSQL(
             """
             INSERT INTO $TABLE_NAME (`${COLUMN_KEY}`, `${COLUMN_VALUE}`)
@@ -119,18 +116,15 @@ internal abstract class StorageDb : RoomDatabase() {
             if (inst != null) {
                 return inst
             }
-
             synchronized(this) {
                 val oldDbFile = context.getDatabasePath("RKStorage")
                 val db = Room.databaseBuilder(
                     context, StorageDb::class.java, DATABASE_NAME
                 )
-
                 if (oldDbFile.exists()) {
                     // migrate data from old database, if it exists
                     db.createFromFile(oldDbFile).addMigrations(MIGRATION_TO_NEXT)
                 }
-
                 inst = db.build()
                 instance = inst
                 return instance!!
@@ -154,7 +148,6 @@ 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/ArgumentHelpersTest.kt

@@ -11,12 +11,11 @@ class ArgumentHelpersTest {
 
     @Test
     fun transformsArgumentsToEntryList() {
-        val keyValue1 = arrayListOf("key1", "value1")
-        val keyValue2 = arrayListOf("key2", "value2")
-        val keyValue3 = arrayListOf("key3", "value3")
-
-        val args = createNativeCallArguments(keyValue1, keyValue2, keyValue3)
-
+        val args = createNativeCallArguments(
+            arrayListOf("key1", "value1"),
+            arrayListOf("key2", "value2"),
+            arrayListOf("key3", "value3")
+        )
         assertThat(args.toEntryList()).isEqualTo(
             listOf(
                 Entry("key1", "value1"),
@@ -29,17 +28,14 @@ class ArgumentHelpersTest {
     @Test
     fun transfersArgumentsToKeyList() {
         val keyList = listOf("key1", "key2", "key3")
-
         val args = createNativeCallArguments("key1", "key2", "key3")
-
         assertThat(args.toKeyList()).isEqualTo(keyList)
     }
 
     @Test
     fun throwsIfArgumentsNotValidFormat() {
         val invalid = arrayListOf("invalid")
         val args = createNativeCallArguments(invalid)
-
         val error = assertThrows(AsyncStorageError::class.java) {
             args.toEntryList()
         }
@@ -52,16 +48,13 @@ class ArgumentHelpersTest {
     @Test
     fun throwsIfArgumentKeyIsNullOrNotString() {
         val argsInvalidNull = createNativeCallArguments(arrayListOf(null, "invalid"))
-
         val errorArgsInvalidNull = assertThrows(AsyncStorageError::class.java) {
             argsInvalidNull.toEntryList()
         }
         assertThat(errorArgsInvalidNull is AsyncStorageError).isTrue()
         assertThat(errorArgsInvalidNull).hasMessageThat().isEqualTo("Key cannot be null.")
 
-
         val notStringArgs = createNativeCallArguments(arrayListOf(123, "invalid"))
-
         val errorNotString = assertThrows(AsyncStorageError::class.java) {
             notStringArgs.toEntryList()
         }
@@ -73,11 +66,9 @@ class ArgumentHelpersTest {
     @Test
     fun throwsIfArgumentValueNotString() {
         val invalidArgs = createNativeCallArguments(arrayListOf("my_key", 666))
-
         val error = assertThrows(AsyncStorageError::class.java) {
             invalidArgs.toEntryList()
         }
-
         assertThat(error is AsyncStorageError).isTrue()
         assertThat(error).hasMessageThat()
             .isEqualTo("Value for key \"my_key\" is not a string. Only strings are supported as a value.")

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

@@ -16,7 +16,6 @@ import kotlin.random.Random
 @ExperimentalCoroutinesApi
 @RunWith(AndroidJUnit4::class)
 class AsyncStorageAccessTest {
-
     private lateinit var asyncStorage: AsyncStorageAccess
     private lateinit var database: StorageDb
 
@@ -39,14 +38,11 @@ class AsyncStorageAccessTest {
         val entriesCount = 10
         val entries = createRandomEntries(entriesCount)
         val keys = entries.map { it.key }
-
         assertThat(asyncStorage.getValues(keys)).hasSize(0)
         asyncStorage.setValues(entries)
         assertThat(asyncStorage.getValues(keys)).hasSize(entriesCount)
-
         val indicesToRemove = (1..4).map { Random.nextInt(0, entriesCount) }.distinct()
         val toRemove = entries.filterIndexed { index, _ -> indicesToRemove.contains(index) }
-
         asyncStorage.removeValues(toRemove.map { it.key })
         val currentEntries = asyncStorage.getValues(keys)
         assertThat(currentEntries).hasSize(entriesCount - toRemove.size)
@@ -67,12 +63,9 @@ class AsyncStorageAccessTest {
     fun mergesDeeplyTwoValues() = runBlockingTest {
         val initialEntry = Entry("key", VALUE_INITIAL)
         val overrideEntry = Entry("key", VALUE_OVERRIDES)
-
         asyncStorage.setValues(listOf(initialEntry))
         asyncStorage.mergeValues(listOf(overrideEntry))
-
         val current = asyncStorage.getValues(listOf("key"))[0]
-
         assertThat(current.value).isEqualTo(VALUE_MERGED)
     }
 
@@ -81,13 +74,10 @@ class AsyncStorageAccessTest {
         val key = "test_key"
         val value = "test_value"
         val entries = listOf(Entry(key, value))
-
         assertThat(asyncStorage.getValues(listOf(key))).hasSize(0)
         asyncStorage.setValues(entries)
         assertThat(asyncStorage.getValues(listOf(key))).isEqualTo(entries)
-
         val modifiedEntries = listOf(Entry(key, "updatedValue"))
-
         asyncStorage.setValues(modifiedEntries)
         assertThat(asyncStorage.getValues(listOf(key))).isEqualTo(modifiedEntries)
     }

example/examples/Basic.js

@@ -112,8 +112,6 @@ function NextExample() {
         };
       }
     }
-
-
     await AsyncStorage.mergeItem('MERGER', JSON.stringify(toMerge));
   }