Skip to content

Commit 0a4b875

Browse files
muzahidul-optimuzahidul-opti
committed
WIP: unit test fixed
1 parent 21f1405 commit 0a4b875

File tree

2 files changed

+26
-21
lines changed

2 files changed

+26
-21
lines changed

‎android-sdk/src/androidTest/java/com/optimizely/ab/android/sdk/OptimizelyClientTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2222,7 +2222,7 @@ public void testVuidRegister() {
22222222
Optimizely mockOptimizely = mock(Optimizely.class);
22232223
when(mockOptimizely.isValid()).thenReturn(true);
22242224

2225-
OptimizelyClient optimizelyClient = new OptimizelyClient(mockOptimizely, logger, "any-vuid");
2225+
OptimizelyClient optimizelyClient = new OptimizelyClient(mockOptimizely, logger, "vuid_123");
22262226

22272227
verify(mockOptimizely).sendODPEvent(
22282228
null,

‎android-sdk/src/androidTest/java/com/optimizely/ab/android/sdk/OptimizelyManagerTest.java‎

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
import com.optimizely.ab.config.parser.ConfigParseException;
4141
import com.optimizely.ab.event.EventHandler;
4242
import com.optimizely.ab.event.EventProcessor;
43+
import com.optimizely.ab.android.odp.VuidManager;
4344

4445
import org.junit.Before;
4546
import org.junit.Test;
@@ -166,8 +167,10 @@ public void initializeSyncWithEnvironment() {
166167
DatafileHandler datafileHandler = mock(DefaultDatafileHandler.class);
167168
EventHandler eventHandler = mock(DefaultEventHandler.class);
168169
EventProcessor eventProcessor = mock(EventProcessor.class);
170+
Context context = InstrumentationRegistry.getInstrumentation().getTargetContext();
171+
VuidManager vuidManager = new VuidManager(context, true);
169172
OptimizelyManager optimizelyManager = new OptimizelyManager(testProjectId, testSdkKey, null, logger, 3600L, datafileHandler, null, 3600L,
170-
eventHandler, eventProcessor, null, null, null, null, null, null, null);
173+
eventHandler, eventProcessor, null, null, null, null, vuidManager, null, null);
171174
/*
172175
* Scenario#1: when datafile is not Empty
173176
* Scenario#2: when datafile is Empty
@@ -225,8 +228,10 @@ public void initializeAsyncWithEnvironment() {
225228
DatafileHandler datafileHandler = mock(DefaultDatafileHandler.class);
226229
EventHandler eventHandler = mock(DefaultEventHandler.class);
227230
EventProcessor eventProcessor = mock(EventProcessor.class);
231+
Context context = InstrumentationRegistry.getInstrumentation().getTargetContext();
232+
VuidManager vuidManager = new VuidManager(context, true);
228233
final OptimizelyManager optimizelyManager = new OptimizelyManager(testProjectId, testSdkKey, null, logger, 3600L, datafileHandler, null, 3600L,
229-
eventHandler, eventProcessor, null, null, null, null, null, null, null);
234+
eventHandler, eventProcessor, null, null, null, null, vuidManager, null, null);
230235

231236
/*
232237
* Scenario#1: when datafile is not Empty
@@ -496,9 +501,9 @@ public void initializeSyncWithUpdateOnNewDatafileDisabled() {
496501
DefaultDatafileHandler datafileHandler = spy(new DefaultDatafileHandler());
497502
Logger logger = mock(Logger.class);
498503
Context context = InstrumentationRegistry.getInstrumentation().getTargetContext();
499-
504+
VuidManager vuidManager = new VuidManager(context, true);
500505
OptimizelyManager manager = new OptimizelyManager(testProjectId, testSdkKey, null, logger, pollingInterval, datafileHandler, null, 0,
501-
null, null, null, null, null, null, null, null, null);
506+
null, null, null, null, null, null, vuidManager, null, null);
502507

503508
doAnswer(
504509
new Answer<Object>() {
@@ -529,9 +534,9 @@ public void initializeSyncWithUpdateOnNewDatafileEnabled() {
529534
DefaultDatafileHandler datafileHandler = spy(new DefaultDatafileHandler());
530535
Logger logger = mock(Logger.class);
531536
Context context = InstrumentationRegistry.getInstrumentation().getTargetContext();
532-
537+
VuidManager vuidManager = new VuidManager(context, true);
533538
OptimizelyManager manager = new OptimizelyManager(testProjectId, testSdkKey, null, logger, pollingInterval, datafileHandler, null, 0,
534-
null, null, null, null, null, null, null, null, null);
539+
null, null, null, null, null, null, vuidManager, null, null);
535540

536541
doAnswer(
537542
new Answer<Object>() {
@@ -562,9 +567,9 @@ public void initializeSyncWithDownloadToCacheDisabled() {
562567
DefaultDatafileHandler datafileHandler = spy(new DefaultDatafileHandler());
563568
Logger logger = mock(Logger.class);
564569
Context context = InstrumentationRegistry.getInstrumentation().getTargetContext();
565-
570+
VuidManager vuidManager = new VuidManager(context, true);
566571
OptimizelyManager manager = new OptimizelyManager(testProjectId, testSdkKey, null, logger, pollingInterval, datafileHandler, null, 0,
567-
null, null, null, null, null, null, null, null, null);
572+
null, null, null, null, null, null, vuidManager, null, null);
568573

569574
doAnswer(
570575
new Answer<Object>() {
@@ -595,9 +600,9 @@ public void initializeSyncWithUpdateOnNewDatafileDisabledWithPeriodicPollingEnab
595600
DefaultDatafileHandler datafileHandler = spy(new DefaultDatafileHandler());
596601
Logger logger = mock(Logger.class);
597602
Context context = InstrumentationRegistry.getInstrumentation().getTargetContext();
598-
603+
VuidManager vuidManager = new VuidManager(context, true);
599604
OptimizelyManager manager = new OptimizelyManager(testProjectId, testSdkKey, null, logger, pollingInterval, datafileHandler, null, 0,
600-
null, null, null, null, null, null, null, null, null);
605+
null, null, null, null, null, null, vuidManager, null, null);
601606

602607
doAnswer(
603608
(Answer<Object>) invocation -> {
@@ -627,9 +632,9 @@ public void initializeSyncWithUpdateOnNewDatafileEnabledWithPeriodicPollingEnabl
627632
DefaultDatafileHandler datafileHandler = spy(new DefaultDatafileHandler());
628633
Logger logger = mock(Logger.class);
629634
Context context = InstrumentationRegistry.getInstrumentation().getTargetContext();
630-
635+
VuidManager vuidManager = new VuidManager(context, true);
631636
OptimizelyManager manager = new OptimizelyManager(testProjectId, testSdkKey, null, logger, pollingInterval, datafileHandler, null, 0,
632-
null, null, null, null, null, null, null, null, null);
637+
null, null, null, null, null, null, vuidManager, null, null);
633638

634639
doAnswer(
635640
new Answer<Object>() {
@@ -660,9 +665,9 @@ public void initializeSyncWithUpdateOnNewDatafileDisabledWithPeriodicPollingDisa
660665
DefaultDatafileHandler datafileHandler = spy(new DefaultDatafileHandler());
661666
Logger logger = mock(Logger.class);
662667
Context context = InstrumentationRegistry.getInstrumentation().getTargetContext();
663-
668+
VuidManager vuidManager = new VuidManager(context, true);
664669
OptimizelyManager manager = new OptimizelyManager(testProjectId, testSdkKey, null, logger, pollingInterval, datafileHandler, null, 0,
665-
null, null, null, null, null, null, null, null, null);
670+
null, null, null, null, null, null, vuidManager, null, null);
666671

667672
doAnswer(
668673
new Answer<Object>() {
@@ -694,9 +699,9 @@ public void initializeSyncWithUpdateOnNewDatafileEnabledWithPeriodicPollingDisab
694699
DefaultDatafileHandler datafileHandler = spy(new DefaultDatafileHandler());
695700
Logger logger = mock(Logger.class);
696701
Context context = InstrumentationRegistry.getInstrumentation().getTargetContext();
697-
702+
VuidManager vuidManager = new VuidManager(context, true);
698703
OptimizelyManager manager = new OptimizelyManager(testProjectId, testSdkKey, null, logger, pollingInterval, datafileHandler, null, 0,
699-
null, null, null, null, null, null, null, null, null);
704+
null, null, null, null, null, null, vuidManager, null, null);
700705

701706
doAnswer(
702707
new Answer<Object>() {
@@ -727,9 +732,9 @@ public void initializeSyncWithResourceDatafileNoCache() {
727732
DefaultDatafileHandler datafileHandler = spy(new DefaultDatafileHandler());
728733
Logger logger = mock(Logger.class);
729734
Context context = InstrumentationRegistry.getInstrumentation().getTargetContext();
730-
735+
VuidManager vuidManager = new VuidManager(context, true);
731736
OptimizelyManager manager = spy(new OptimizelyManager(testProjectId, testSdkKey, null, logger, pollingInterval, datafileHandler, null, 0,
732-
null, null, null, null, null, null, null, null, null));
737+
null, null, null, null, null, null, vuidManager, null, null));
733738

734739
datafileHandler.removeSavedDatafile(context, manager.getDatafileConfig());
735740
OptimizelyClient client = manager.initialize(context, R.raw.datafile, downloadToCache, updateConfigOnNewDatafile);
@@ -744,9 +749,9 @@ public void initializeSyncWithResourceDatafileNoCacheWithDefaultParams() {
744749
DefaultDatafileHandler datafileHandler = spy(new DefaultDatafileHandler());
745750
Logger logger = mock(Logger.class);
746751
Context context = InstrumentationRegistry.getInstrumentation().getTargetContext();
747-
752+
VuidManager vuidManager = new VuidManager(context, true);
748753
OptimizelyManager manager = spy(new OptimizelyManager(testProjectId, testSdkKey, null, logger, pollingInterval, datafileHandler, null, 0,
749-
null, null, null, null, null, null, null, null, null));
754+
null, null, null, null, null, null, vuidManager, null, null));
750755

751756
datafileHandler.removeSavedDatafile(context, manager.getDatafileConfig());
752757
OptimizelyClient client = manager.initialize(context, R.raw.datafile);

0 commit comments

Comments
 (0)