fix

Author: raju-opti

android-sdk/src/test/java/com/optimizely/ab/android/sdk/OptimizelyManagerBuilderTest.java

@@ -442,6 +442,8 @@ public void testBuildWithVuidDisabled() throws Exception {
         verify(mockBuilder).withUserCommonIdentifiers(identifiersCaptor.capture());
         Map<String, String> identifiers = identifiersCaptor.getValue();
         assertFalse(identifiers.containsKey("vuid"));
+
+        when(ODPManager.builder()).thenCallRealMethod();
     }
 
     @Test
@@ -464,5 +466,7 @@ public void testBuildWithVuidEnabled() throws Exception {
         verify(mockBuilder).withUserCommonIdentifiers(identifiersCaptor.capture());
         Map<String, String> identifiers = identifiersCaptor.getValue();
         assertEquals(identifiers.get("vuid"), "vuid_test");
+
+        when(ODPManager.builder()).thenCallRealMethod();
     }
 }

odp/src/androidTest/java/com/optimizely/ab/android/odp/VuidManagerTest.kt

@@ -18,6 +18,7 @@ import android.content.Context
 import android.content.SharedPreferences
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation
+import com.optimizely.ab.android.shared.OptlyStorage
 import org.junit.After
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
@@ -138,9 +139,11 @@ class VuidManagerTest {
         cleanSharedPrefs()
         saveInSharedPrefs("vuid", "vuid_test")
         VuidManager.removeSharedForTesting()
+
         vuidManager = VuidManager.getInstance()
         vuidManager.configure(false, context)
         assertNull(getFromSharedPrefs("vuid"))
+
         assertEquals(vuidManager.vuid, "")
     }
 
@@ -158,6 +161,7 @@ class VuidManagerTest {
     fun configureWithVuidEnabledWhenVuidDoesNotExist() {
         cleanSharedPrefs()
         VuidManager.removeSharedForTesting()
+        assertNull(getFromSharedPrefs("vuid"))
         vuidManager = VuidManager.getInstance()
         vuidManager.configure(true, context)
         assertTrue(vuidManager.vuid.startsWith("vuid_"))

shared/src/main/java/com/optimizely/ab/android/shared/OptlyStorage.java

@@ -93,6 +93,6 @@ private SharedPreferences getReadablePrefs() {
     }
 
     public void remove(String key) {
-        getWritablePrefs().remove(key);
+        getWritablePrefs().remove(key).apply();
     }
 }