Skip to content

Commit 5c97adc

Browse files
muzahidul-optimuzahidul-opti
committed
WIP: Test target build issue resolved
1 parent 1883915 commit 5c97adc

File tree

6 files changed

+30
-27
lines changed

6 files changed

+30
-27
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public void setup() throws Exception {
100100

101101
optimizelyManager = OptimizelyManager.builder()
102102
.withSDKKey(testSdkKey)
103-
.withVuid(testVuid)
103+
.withVuidEnabled()
104104
.withODPEventManager(odpEventManager)
105105
.withODPSegmentManager(odpSegmentManager)
106106
.build(context);

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import com.optimizely.ab.odp.ODPApiManager;
3535
import com.optimizely.ab.odp.ODPEventManager;
3636
import com.optimizely.ab.odp.ODPManager;
37+
import com.optimizely.ab.android.odp.VuidManager;
3738
import com.optimizely.ab.odp.ODPSegmentManager;
3839

3940
import org.junit.Before;
@@ -68,6 +69,7 @@ public class ODPIntegrationUpdateConfigTest {
6869

6970
private OptimizelyManager optimizelyManager;
7071
private ODPManager odpManager;
72+
private VuidManager vuidManager;
7173
private DefaultDatafileHandler datafileHandler;
7274
private NotificationCenter notificationCenter;
7375
private Context context = InstrumentationRegistry.getInstrumentation().getTargetContext();
@@ -101,6 +103,7 @@ public void setup() throws Exception {
101103

102104
datafileHandler = new DefaultDatafileHandler();
103105
notificationCenter = new NotificationCenter();
106+
vuidManager = new VuidManager(context, true);
104107

105108
optimizelyManager = new OptimizelyManager(
106109
null,
@@ -117,7 +120,7 @@ public void setup() throws Exception {
117120
notificationCenter,
118121
null,
119122
odpManager,
120-
"test-vuid",
123+
vuidManager,
121124
null,
122125
null);
123126
}

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public void testBuildWithValidPollingInterval() {
115115
OptimizelyManager manager = OptimizelyManager.builder()
116116
.withSDKKey(testSdkKey)
117117
.withDatafileDownloadInterval(interval, timeUnit)
118-
.withVuid("any-to-avoid-generate")
118+
.withVuidEnabled()
119119
.build(mockContext);
120120

121121
assertEquals(interval * 60L, manager.getDatafileDownloadInterval().longValue());
@@ -128,7 +128,7 @@ public void testBuildWithEventHandler() {
128128
.withSDKKey(testSdkKey)
129129
.withDatafileDownloadInterval(901L, TimeUnit.SECONDS)
130130
.withEventHandler(eventHandler)
131-
.withVuid("any-to-avoid-generate")
131+
.withVuidEnabled()
132132
.build(mockContext);
133133

134134
assertEquals(901L, manager.getDatafileDownloadInterval().longValue());
@@ -142,7 +142,7 @@ public void testBuildWithErrorHandler() {
142142
.withSDKKey(testSdkKey)
143143
.withDatafileDownloadInterval(61L, TimeUnit.SECONDS)
144144
.withErrorHandler(errorHandler)
145-
.withVuid("any-to-avoid-generate")
145+
.withVuidEnabled()
146146
.build(mockContext);
147147

148148
manager.initialize(mockContext, minDatafile);
@@ -157,7 +157,7 @@ public void testBuildWithDatafileHandler() {
157157
.withSDKKey(testSdkKey)
158158
.withDatafileDownloadInterval(61L, TimeUnit.SECONDS)
159159
.withDatafileHandler(dfHandler)
160-
.withVuid("any-to-avoid-generate")
160+
.withVuidEnabled()
161161
.build(mockContext);
162162

163163
manager.initialize(mockContext, minDatafile);
@@ -172,7 +172,7 @@ public void testBuildWithUserProfileService() {
172172
.withSDKKey(testSdkKey)
173173
.withDatafileDownloadInterval(61L, TimeUnit.SECONDS)
174174
.withUserProfileService(ups)
175-
.withVuid("any-to-avoid-generate")
175+
.withVuidEnabled()
176176
.build(mockContext);
177177

178178
manager.initialize(mockContext, minDatafile);
@@ -189,7 +189,7 @@ public void testBuildWithDatafileDownloadInterval_workerScheduled() throws Excep
189189
.withSDKKey(testSdkKey)
190190
.withDatafileHandler(mockDatafileHandler)
191191
.withDatafileDownloadInterval(goodNumber, TimeUnit.MINUTES)
192-
.withVuid("any-to-avoid-generate")
192+
.withVuidEnabled()
193193
.build(mockContext);
194194
OptimizelyManager spyManager = spy(manager);
195195
when(spyManager.isAndroidVersionSupported()).thenReturn(true);
@@ -205,7 +205,7 @@ public void testBuildWithDatafileDownloadInterval_workerCancelledWhenIntervalIsN
205205
.withSDKKey(testSdkKey)
206206
.withDatafileHandler(mockDatafileHandler)
207207
.withDatafileDownloadInterval(-1, TimeUnit.MINUTES)
208-
.withVuid("any-to-avoid-generate")
208+
.withVuidEnabled()
209209
.build(mockContext);
210210
OptimizelyManager spyManager = spy(manager);
211211
when(spyManager.isAndroidVersionSupported()).thenReturn(true);
@@ -220,7 +220,7 @@ public void testBuildWithCustomSdkNameAndVersion() throws Exception {
220220
OptimizelyManager manager = OptimizelyManager.builder()
221221
.withSDKKey(testSdkKey)
222222
.withClientInfo("test-sdk", "test-version")
223-
.withVuid("any-to-avoid-generate")
223+
.withVuidEnabled()
224224
.build(mockContext);
225225
assertEquals(manager.getSdkName(mockContext), "test-sdk");
226226
assertEquals(manager.getSdkVersion(), "test-version");
@@ -232,7 +232,7 @@ public void testBuildWithDefaultODP_defaultEnabled() throws Exception {
232232

233233
OptimizelyManager manager = OptimizelyManager.builder()
234234
.withSDKKey(testSdkKey)
235-
.withVuid("test-vuid")
235+
.withVuidEnabled()
236236
.build(mockContext);
237237

238238
verifyNew(OptimizelyManager.class).withArguments(
@@ -262,7 +262,7 @@ public void testBuildWithDefaultODP_disabled() throws Exception {
262262
OptimizelyManager manager = OptimizelyManager.builder()
263263
.withSDKKey(testSdkKey)
264264
.withODPDisabled()
265-
.withVuid("test-vuid")
265+
.withVuidEnabled()
266266
.build(mockContext);
267267

268268
verifyNew(OptimizelyManager.class).withArguments(
@@ -293,7 +293,7 @@ public void testBuildWithODP_defaultCacheSizeAndTimeout() throws Exception {
293293

294294
OptimizelyManager manager = OptimizelyManager.builder()
295295
.withSDKKey(testSdkKey)
296-
.withVuid("any-to-avoid-generate")
296+
.withVuidEnabled()
297297
.build(mockContext);
298298

299299
verifyNew(ODPManager.class).withArguments(
@@ -320,7 +320,7 @@ public void testBuildWithODP_customSegmentCacheSize() throws Exception {
320320
OptimizelyManager manager = OptimizelyManager.builder()
321321
.withSDKKey(testSdkKey)
322322
.withODPSegmentCacheSize(1234)
323-
.withVuid("any-to-avoid-generate")
323+
.withVuidEnabled()
324324
.build(mockContext);
325325

326326
verifyNew(ODPSegmentManager.class).withArguments(
@@ -337,7 +337,7 @@ public void testBuildWithODP_customSegmentCacheTimeout() throws Exception {
337337
OptimizelyManager manager = OptimizelyManager.builder()
338338
.withSDKKey(testSdkKey)
339339
.withODPSegmentCacheTimeout(20, TimeUnit.MINUTES)
340-
.withVuid("any-to-avoid-generate")
340+
.withVuidEnabled()
341341
.build(mockContext);
342342

343343
verifyNew(ODPSegmentManager.class).withArguments(
@@ -351,7 +351,7 @@ public void testBuildWithODP_customSegmentCacheTimeout() throws Exception {
351351
public void testBuildWithODP_defaultSegmentFetchTimeout() throws Exception {
352352
OptimizelyManager manager = OptimizelyManager.builder()
353353
.withSDKKey(testSdkKey)
354-
.withVuid("any-to-avoid-generate")
354+
.withVuidEnabled()
355355
.build(mockContext);
356356

357357
assertEquals(ODPSegmentClient.Companion.getCONNECTION_TIMEOUT(), 10*1000);
@@ -364,7 +364,7 @@ public void testBuildWithODP_customSegmentFetchTimeout() throws Exception {
364364
.withSDKKey(testSdkKey)
365365
.withTimeoutForODPSegmentFetch(20)
366366
.withTimeoutForODPEventDispatch(30)
367-
.withVuid("any-to-avoid-generate")
367+
.withVuidEnabled()
368368
.build(mockContext);
369369

370370
assertEquals(ODPSegmentClient.Companion.getCONNECTION_TIMEOUT(), 20*1000);
@@ -380,7 +380,7 @@ public void testBuildWithODP_defaultCommonDataAndIdentifiers() throws Exception
380380

381381
OptimizelyManager manager = OptimizelyManager.builder()
382382
.withSDKKey(testSdkKey)
383-
.withVuid("test-vuid")
383+
.withVuidEnabled()
384384
.build(mockContext);
385385

386386
ArgumentCaptor<Map<String, Object>> captorData = ArgumentCaptor.forClass(Map.class);

‎android-sdk/src/test/java/com/optimizely/ab/android/sdk/OptimizelyManagerIntervalTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public void setup() throws Exception {
8484
public void testBuildWithDatafileDownloadInterval() throws Exception {
8585
long goodNumber = 27;
8686
OptimizelyManager manager = OptimizelyManager.builder("1")
87-
.withVuid("any-to-avoid-generate")
87+
.withVuidEnabled()
8888
.withLogger(logger)
8989
.withDatafileDownloadInterval(goodNumber, TimeUnit.MINUTES)
9090
.build(mockContext);
@@ -113,7 +113,7 @@ public void testBuildWithDatafileDownloadInterval() throws Exception {
113113
public void testBuildWithDatafileDownloadIntervalDeprecated() throws Exception {
114114
long goodNumber = 1234L;
115115
OptimizelyManager manager = OptimizelyManager.builder("1")
116-
.withVuid("any-to-avoid-generate")
116+
.withVuidEnabled()
117117
.withLogger(logger)
118118
.withDatafileDownloadInterval(goodNumber) // deprecated
119119
.build(mockContext);
@@ -142,7 +142,7 @@ public void testBuildWithDatafileDownloadIntervalDeprecated() throws Exception {
142142
public void testBuildWithEventDispatchInterval() throws Exception {
143143
long goodNumber = 100L;
144144
OptimizelyManager manager = OptimizelyManager.builder("1")
145-
.withVuid("any-to-avoid-generate")
145+
.withVuidEnabled()
146146
.withLogger(logger)
147147
.withEventDispatchInterval(goodNumber, TimeUnit.SECONDS)
148148
.build(mockContext);
@@ -186,7 +186,7 @@ public void testBuildWithEventDispatchRetryInterval() throws Exception {
186186
long defaultEventFlushInterval = 30L; // seconds
187187

188188
OptimizelyManager manager = OptimizelyManager.builder("1")
189-
.withVuid("any-to-avoid-generate")
189+
.withVuidEnabled()
190190
.withLogger(logger)
191191
.withEventDispatchRetryInterval(goodNumber, timeUnit)
192192
.build(mockContext);
@@ -227,7 +227,7 @@ public void testBuildWithEventDispatchRetryInterval() throws Exception {
227227
public void testBuildWithEventDispatchIntervalDeprecated() throws Exception {
228228
long goodNumber = 1234L;
229229
OptimizelyManager manager = OptimizelyManager.builder("1")
230-
.withVuid("any-to-avoid-generate")
230+
.withVuidEnabled()
231231
.withLogger(logger)
232232
.withEventDispatchInterval(goodNumber) // deprecated
233233
.build(mockContext);

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
#Thu Jan 28 11:38:35 PST 2021
1+
#Fri Oct 18 20:28:21 BDT 2024
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4-
zipStoreBase=GRADLE_USER_HOME
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
55
org.gradle.jvmargs=-Xmx1g
6+
zipStoreBase=GRADLE_USER_HOME
67
zipStorePath=wrapper/dists
7-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip

‎odp/src/main/java/com/optimizely/ab/android/odp/VuidManager.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class VuidManager constructor(context: Context, isEnabled: Boolean = false) {
4747
return visitorId.startsWith("vuid_", ignoreCase = true)
4848
}
4949
}
50-
50+
5151
@VisibleForTesting
5252
fun makeVuid(): String {
5353
val maxLength = 32 // required by ODP server

0 commit comments

Comments
 (0)