Skip to content

Commit 780fca2

Browse files
muzahidul-optimuzahidul-opti
authored
[FSSDK-10505] chore: update mockito and java version (#502)
- java version update to 17 - Update gradle to 7.5
1 parent 900ffc7 commit 780fca2

File tree

36 files changed

+275
-237
lines changed

36 files changed

+275
-237
lines changed

‎.github/workflows/android.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,10 @@ jobs:
8888
steps:
8989
- name: checkout
9090
uses: actions/checkout@v2
91-
- name: set up JDK 11
91+
- name: set up JDK 17
9292
uses: actions/setup-java@v1
9393
with:
94-
java-version: 11
94+
java-version: '17'
9595
- name: Enable KVM
9696
run: |
9797
echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ jobs:
2323
runs-on: ubuntu-latest
2424
steps:
2525
- uses: actions/checkout@v2
26-
- name: set up JDK 11
26+
- name: set up JDK 17
2727
uses: actions/setup-java@v2
2828
with:
29-
java-version: '11'
29+
java-version: '17'
3030
distribution: 'temurin'
3131
cache: gradle
3232
- name: Grant execute permission for gradlew

‎android-sdk/build.gradle‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,15 @@ android {
3434
}
3535
testOptions {
3636
unitTests.returnDefaultValues = true
37+
unitTests.all {
38+
jvmArgs = [
39+
"--add-opens","java.base/java.lang.reflect=ALL-UNNAMED",
40+
"--add-opens","java.base/java.util.concurrent=ALL-UNNAMED",
41+
"--add-opens","java.base/java.util.concurrent.locks=ALL-UNNAMED",
42+
"--add-opens","java.base/java.util=ALL-UNNAMED",
43+
"--add-opens","java.base/java.lang=ALL-UNNAMED"
44+
]
45+
}
3746
}
3847
buildTypes {
3948
release {
@@ -45,8 +54,8 @@ android {
4554
}
4655

4756
compileOptions {
48-
sourceCompatibility JavaVersion.VERSION_11
49-
targetCompatibility JavaVersion.VERSION_11
57+
sourceCompatibility JavaVersion.VERSION_17
58+
targetCompatibility JavaVersion.VERSION_17
5059
}
5160
}
5261

@@ -64,7 +73,8 @@ dependencies {
6473
implementation "androidx.annotation:annotation:$annotations_ver"
6574

6675
testImplementation "junit:junit:$junit_ver"
67-
testImplementation "org.mockito:mockito-core:$mockito_ver"
76+
testImplementation "org.mockito:mockito-core:$mockito_ver_sdk_module"
77+
6878
testImplementation "org.powermock:powermock-module-junit4:$powermock_ver"
6979
testImplementation "org.powermock:powermock-api-mockito2:$powermock_ver"
7080
testImplementation "com.noveogroup.android:android-logger:$android_logger_ver"
@@ -78,9 +88,7 @@ dependencies {
7888
androidTestImplementation "androidx.test:core-ktx:$androidx_test_core"
7989

8090
androidTestImplementation "org.mockito:mockito-core:$mockito_ver"
81-
androidTestImplementation "com.crittercism.dexmaker:dexmaker:$dexmaker_ver"
82-
androidTestImplementation "com.crittercism.dexmaker:dexmaker-dx:$dexmaker_ver"
83-
androidTestImplementation "com.crittercism.dexmaker:dexmaker-mockito:$dexmaker_ver"
91+
androidTestImplementation "org.mockito:mockito-android:$mockito_ver"
8492
androidTestImplementation "com.noveogroup.android:android-logger:$android_logger_ver"
8593
androidTestImplementation "com.google.code.gson:gson:$gson_ver"
8694
androidTestImplementation "com.fasterxml.jackson.core:jackson-databind:$jacksonversion"

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@
4242
import static junit.framework.Assert.assertNull;
4343
import static junit.framework.Assert.assertTrue;
4444
import static junit.framework.Assert.fail;
45-
import static org.mockito.Matchers.any;
46-
import static org.mockito.Matchers.anyString;
47-
import static org.mockito.Matchers.eq;
45+
import static org.mockito.ArgumentMatchers.any;
46+
import static org.mockito.ArgumentMatchers.anyString;
47+
import static org.mockito.ArgumentMatchers.eq;
4848
import static org.mockito.Mockito.mock;
4949
import static org.mockito.Mockito.spy;
5050
import static org.mockito.Mockito.times;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@
5151
import static junit.framework.Assert.assertNull;
5252
import static junit.framework.Assert.assertTrue;
5353
import static junit.framework.Assert.fail;
54-
import static org.mockito.Matchers.any;
55-
import static org.mockito.Matchers.anyString;
56-
import static org.mockito.Matchers.eq;
54+
import static org.mockito.ArgumentMatchers.any;
55+
import static org.mockito.ArgumentMatchers.anyString;
56+
import static org.mockito.ArgumentMatchers.eq;
5757
import static org.mockito.Mockito.mock;
5858
import static org.mockito.Mockito.spy;
5959
import static org.mockito.Mockito.times;

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

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,12 @@
7777
import static org.junit.Assert.assertNotEquals;
7878
import static org.junit.Assert.assertThat;
7979
import static org.junit.Assume.assumeTrue;
80-
import static org.mockito.Matchers.anyObject;
81-
import static org.mockito.Matchers.eq;
80+
import static org.mockito.ArgumentMatchers.any;
81+
import static org.mockito.ArgumentMatchers.eq;
8282
import static org.mockito.Mockito.mock;
8383
import static org.mockito.Mockito.spy;
8484
import static org.mockito.Mockito.verify;
85-
import static org.mockito.Mockito.verifyZeroInteractions;
85+
import static org.mockito.Mockito.verifyNoInteractions;
8686
import static org.mockito.Mockito.when;
8787

8888
@RunWith(Parameterized.class)
@@ -131,7 +131,7 @@ public OptimizelyClientTest(int datafileVersion,String datafile){
131131
optimizely = Optimizely.builder(datafile, eventHandler).build();
132132

133133
// set to return DecisionResponse with null variation by default (instead of null DecisionResponse)
134-
when(bucketer.bucket(anyObject(), anyObject(), anyObject())).thenReturn(DecisionResponse.nullNoReasons());
134+
when(bucketer.bucket(any(), any(), any())).thenReturn(DecisionResponse.nullNoReasons());
135135

136136
if(datafileVersion==3) {
137137
Variation variation = optimizely.getProjectConfig().getExperiments().get(0).getVariations().get(0);
@@ -431,7 +431,7 @@ public void testGoodForcedTrack() {
431431

432432
optimizelyClient.track("test_event", GENERIC_USER_ID);
433433

434-
verifyZeroInteractions(logger);
434+
verifyNoInteractions(logger);
435435

436436
ArgumentCaptor<LogEvent> logEventArgumentCaptor = ArgumentCaptor.forClass(LogEvent.class);
437437
try {
@@ -462,7 +462,7 @@ public void testGoodTrack() {
462462
OptimizelyClient optimizelyClient = new OptimizelyClient(optimizely,
463463
logger);
464464
optimizelyClient.track("test_event", GENERIC_USER_ID);
465-
verifyZeroInteractions(logger);
465+
verifyNoInteractions(logger);
466466
}
467467

468468
@Test
@@ -484,7 +484,7 @@ public void onTrack(@Nonnull String eventKey, @Nonnull String userId, @Nonnull M
484484
assertTrue(notificationId <= 0);
485485
assertFalse(optimizelyClient.getNotificationCenter().removeNotificationListener(notificationId));
486486
assertEquals(false, numberOfCalls[0]);
487-
verifyZeroInteractions(logger);
487+
verifyNoInteractions(logger);
488488

489489
}
490490

@@ -512,7 +512,7 @@ public void onTrack(@Nonnull String eventKey, @Nonnull String userId, @Nonnull M
512512
else {
513513
assertEquals(true, numberOfCalls[0]);
514514
}
515-
verifyZeroInteractions(logger);
515+
verifyNoInteractions(logger);
516516

517517
}
518518

@@ -524,7 +524,7 @@ public void testGoodTrackBucketing() {
524524
Experiment experiment = optimizelyClient.getProjectConfig().getExperimentsForEventKey("test_event").get(0);
525525
attributes.put(BUCKETING_ATTRIBUTE, bucketingId);
526526
optimizelyClient.track("test_event", "userId", attributes);
527-
verifyZeroInteractions(logger);
527+
verifyNoInteractions(logger);
528528
}
529529

530530
@Test
@@ -569,7 +569,7 @@ public void testGoodForcedTrackAttribute() {
569569

570570
optimizelyClient.track("test_event", GENERIC_USER_ID, attributes);
571571

572-
verifyZeroInteractions(logger);
572+
verifyNoInteractions(logger);
573573

574574
ArgumentCaptor<LogEvent> logEventArgumentCaptor = ArgumentCaptor.forClass(LogEvent.class);
575575

@@ -611,7 +611,7 @@ public void testGoodTrackAttribute() {
611611

612612
optimizelyClient.track("test_event", GENERIC_USER_ID, attributes);
613613

614-
verifyZeroInteractions(logger);
614+
verifyNoInteractions(logger);
615615

616616
Variation v = optimizelyClient.getForcedVariation(FEATURE_ANDROID_EXPERIMENT_KEY, GENERIC_USER_ID);
617617
assertEquals(v.getKey(), "var_2");
@@ -671,7 +671,7 @@ public void testGoodForcedTrackEventVal() {
671671
Collections.<String, String>emptyMap(),
672672
Collections.singletonMap(ReservedEventKey.REVENUE.toString(), 1L));
673673

674-
verifyZeroInteractions(logger);
674+
verifyNoInteractions(logger);
675675

676676
ArgumentCaptor<LogEvent> logEventArgumentCaptor = ArgumentCaptor.forClass(LogEvent.class);
677677

@@ -705,7 +705,7 @@ public void testGoodTrackEventVal() {
705705
GENERIC_USER_ID,
706706
Collections.<String, String>emptyMap(),
707707
Collections.singletonMap(ReservedEventKey.REVENUE.toString(), 1L));
708-
verifyZeroInteractions(logger);
708+
verifyNoInteractions(logger);
709709
}
710710

711711
@Test
@@ -750,7 +750,7 @@ public void testGoodTrackAttributeEventVal() {
750750
final HashMap<String, String> attributes = new HashMap<>();
751751
optimizelyClient.track("test_event", GENERIC_USER_ID, attributes,
752752
Collections.singletonMap(ReservedEventKey.REVENUE.toString(), 1L));
753-
verifyZeroInteractions(logger);
753+
verifyNoInteractions(logger);
754754
}
755755

756756
@Test
@@ -770,7 +770,7 @@ public void testGoodForcedTrackAttributeEventVal() {
770770
attributes,
771771
Collections.singletonMap(ReservedEventKey.REVENUE.toString(), 1L));
772772

773-
verifyZeroInteractions(logger);
773+
verifyNoInteractions(logger);
774774

775775
ArgumentCaptor<LogEvent> logEventArgumentCaptor = ArgumentCaptor.forClass(LogEvent.class);
776776

@@ -839,7 +839,7 @@ public void testTrackWithEventTags() {
839839
final HashMap<String, Object> eventTags = new HashMap<>();
840840
eventTags.put("foo", 843);
841841
optimizelyClient.track("test_event", GENERIC_USER_ID, attributes, eventTags);
842-
verifyZeroInteractions(logger);
842+
verifyNoInteractions(logger);
843843
}
844844

845845
@Test
@@ -875,7 +875,7 @@ public void testForcedTrackWithEventTags() {
875875
// id of var_2
876876
assertTrue(logEvent.getBody().contains("\"enrich_decisions\":true"));
877877

878-
verifyZeroInteractions(logger);
878+
verifyNoInteractions(logger);
879879

880880
Variation v = optimizelyClient.getForcedVariation(FEATURE_ANDROID_EXPERIMENT_KEY, GENERIC_USER_ID);
881881
assertEquals(v.getKey(), "var_2");
@@ -979,7 +979,7 @@ public void testGoodGetVariationAttribute() {
979979
logger);
980980
final HashMap<String, String> attributes = new HashMap<>();
981981
optimizelyClient.getVariation(FEATURE_ANDROID_EXPERIMENT_KEY, GENERIC_USER_ID, attributes);
982-
verifyZeroInteractions(logger);
982+
verifyNoInteractions(logger);
983983
}
984984

985985
@Test
@@ -996,7 +996,7 @@ public void testGoodForcedGetVariationAttribute() {
996996

997997
v = optimizelyClient.getVariation(FEATURE_ANDROID_EXPERIMENT_KEY, GENERIC_USER_ID, attributes);
998998

999-
verifyZeroInteractions(logger);
999+
verifyNoInteractions(logger);
10001000

10011001
assertEquals(v.getKey(), "var_2");
10021002

@@ -1180,7 +1180,7 @@ public void testGoodIsFeatureEnabledWithAttribute() {
11801180
Collections.singletonMap("house", "Gryffindor")
11811181
));
11821182

1183-
verifyZeroInteractions(logger);
1183+
verifyNoInteractions(logger);
11841184

11851185
assertFalse(optimizelyClient.isFeatureEnabled(
11861186
"InvalidFeatureKey",
@@ -1301,7 +1301,7 @@ public void testIsFeatureEnabledWithFeatureEnabledTrue(){
13011301
Collections.singletonMap("house", "Gryffindor")
13021302
));
13031303

1304-
verifyZeroInteractions(logger);
1304+
verifyNoInteractions(logger);
13051305

13061306
}
13071307

@@ -1398,7 +1398,7 @@ public void testGoodGetFeatureVariableBooleanWithAttr() {
13981398
GENERIC_USER_ID,
13991399
Collections.singletonMap("key", "value")
14001400
));
1401-
verifyZeroInteractions(logger);
1401+
verifyNoInteractions(logger);
14021402

14031403
}
14041404

@@ -1505,7 +1505,7 @@ public void testGoodGetFeatureVariableDoubleWithAttr() {
15051505
GENERIC_USER_ID,
15061506
Collections.singletonMap("house", "Gryffindor")
15071507
));
1508-
verifyZeroInteractions(logger);
1508+
verifyNoInteractions(logger);
15091509
}
15101510

15111511
//FeatureVariableDouble Scenario#3 if feature not found
@@ -1616,7 +1616,7 @@ public void testGoodGetFeatureVariableIntegerWithAttr() {
16161616
GENERIC_USER_ID,
16171617
Collections.singletonMap("house", "Gryffindor")
16181618
));
1619-
verifyZeroInteractions(logger);
1619+
verifyNoInteractions(logger);
16201620
}
16211621

16221622
//FeatureVariableInteger Scenario#3 if feature not found
@@ -1723,7 +1723,7 @@ public void testGoodGetFeatureVariableStringWithAttr() {
17231723
GENERIC_USER_ID,
17241724
Collections.singletonMap("house", "Gryffindor")
17251725
));
1726-
verifyZeroInteractions(logger);
1726+
verifyNoInteractions(logger);
17271727
}
17281728

17291729
//FeatureVariableString Scenario#3 if feature not found
@@ -1837,7 +1837,7 @@ public void testGetFeatureVariableJsonWithAttr() {
18371837
);
18381838

18391839
assertTrue(compareJsonStrings(json.toString(), defaultValueOfStringVar));
1840-
verifyZeroInteractions(logger);
1840+
verifyNoInteractions(logger);
18411841
}
18421842

18431843
//FeatureVariableJSON Scenario#3 if feature not found
@@ -1949,7 +1949,7 @@ public void testGetAllFeatureVariablesWithAttr() {
19491949
);
19501950

19511951
assertTrue(compareJsonStrings(json.toString(), defaultValueOfStringVar));
1952-
verifyZeroInteractions(logger);
1952+
verifyNoInteractions(logger);
19531953
}
19541954

19551955
//GetAllFeatureVariables Scenario#3 if feature not found

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
import org.junit.runner.RunWith;
2727
import org.slf4j.Logger;
2828

29-
import static org.mockito.Matchers.any;
30-
import static org.mockito.Matchers.eq;
29+
import static org.mockito.ArgumentMatchers.any;
30+
import static org.mockito.ArgumentMatchers.eq;
3131
import static org.mockito.Mockito.mock;
3232
import static org.mockito.Mockito.verify;
3333
import static org.mockito.Mockito.when;

0 commit comments

Comments
 (0)