try to fix flaky test

Author: wenxi-zeng

android/src/test/java/com/segment/analytics/kotlin/android/AndroidContextCollectorTests.kt

@@ -109,7 +109,6 @@ class AndroidContextCollectorTests {
         val contextCollector = AndroidContextPlugin()
         contextCollector.setup(analytics)
         val deviceId = contextCollector.getDeviceId(false)
-        Analytics.segmentLog(deviceId, LogFilterKind.DEBUG)
         assertEquals(deviceId, "anonId")
     }
 

android/src/test/java/com/segment/analytics/kotlin/android/StorageTests.kt

@@ -22,6 +22,7 @@ import java.util.*
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.*
 import org.junit.jupiter.api.Assertions.*
+import java.util.concurrent.ConcurrentHashMap
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 class StorageTests {
@@ -317,7 +318,7 @@ class StorageTests {
         }
     }
 
-    fun getWorkingMap(sharedPreferences: SharedPreferences): HashMap<String, Any?> {
+    fun getWorkingMap(sharedPreferences: SharedPreferences): ConcurrentHashMap<String, Any?> {
         return (sharedPreferences as MemorySharedPreferences).preferenceMap
     }
 }

android/src/test/java/com/segment/analytics/kotlin/android/utils/MockPreferences.kt

@@ -3,12 +3,13 @@ package com.segment.analytics.kotlin.android.utils
 import android.content.SharedPreferences
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener
 import androidx.annotation.Nullable
+import java.util.concurrent.ConcurrentHashMap
 
 /**
  * Mock implementation of shared preference, which just saves data in memory using map.
  */
 class MemorySharedPreferences : SharedPreferences {
-    internal val preferenceMap: HashMap<String, Any?> = HashMap()
+    internal val preferenceMap: ConcurrentHashMap<String, Any?> = ConcurrentHashMap()
     private val preferenceEditor: MockSharedPreferenceEditor
     override fun getAll(): Map<String, *> {
         return preferenceMap
@@ -74,18 +75,28 @@ class MemorySharedPreferences : SharedPreferences {
 
     override fun registerOnSharedPreferenceChangeListener(onSharedPreferenceChangeListener: OnSharedPreferenceChangeListener) {}
     override fun unregisterOnSharedPreferenceChangeListener(onSharedPreferenceChangeListener: OnSharedPreferenceChangeListener) {}
-    class MockSharedPreferenceEditor(private val preferenceMap: HashMap<String, Any?>) :
+    class MockSharedPreferenceEditor(private val preferenceMap: ConcurrentHashMap<String, Any?>) :
         SharedPreferences.Editor {
         override fun putString(s: String, @Nullable s1: String?): SharedPreferences.Editor {
-            preferenceMap[s] = s1
+            if (s1 == null) {
+                remove(s)
+            }
+            else {
+                preferenceMap[s] = s1
+            }
             return this
         }
 
         override fun putStringSet(
             s: String,
             @Nullable set: Set<String>?
         ): SharedPreferences.Editor {
-            preferenceMap[s] = set
+            if (set == null) {
+                remove(s)
+            }
+            else {
+                preferenceMap[s] = set
+            }
             return this
         }