[FSSDK-10505] chore: update mockito and java version

.github/workflows/android.yml

@@ -88,10 +88,10 @@ jobs:
     steps:
       - name: checkout
         uses: actions/checkout@v2
-      - name: set up JDK 11
+      - name: set up JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 11   
+          java-version: '17'
       - name: Enable KVM
         run: |
           echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules

.github/workflows/build.yml

@@ -23,10 +23,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - name: set up JDK 11
+    - name: set up JDK 17
       uses: actions/setup-java@v2
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'temurin'
         cache: gradle
     - name: Grant execute permission for gradlew

android-sdk/build.gradle

@@ -34,6 +34,15 @@ android {
     }
     testOptions {
         unitTests.returnDefaultValues = true
+        unitTests.all {
+            jvmArgs = [
+                       "--add-opens","java.base/java.lang.reflect=ALL-UNNAMED",
+                       "--add-opens","java.base/java.util.concurrent=ALL-UNNAMED",
+                       "--add-opens","java.base/java.util.concurrent.locks=ALL-UNNAMED",
+                       "--add-opens","java.base/java.util=ALL-UNNAMED",
+                       "--add-opens","java.base/java.lang=ALL-UNNAMED"
+            ]
+        }
     }
     buildTypes {
         release {
@@ -45,8 +54,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 }
 
@@ -64,7 +73,8 @@ dependencies {
     implementation "androidx.annotation:annotation:$annotations_ver"
 
     testImplementation "junit:junit:$junit_ver"
-    testImplementation "org.mockito:mockito-core:$mockito_ver"
+    testImplementation "org.mockito:mockito-core:$mockito_ver_sdk_module"
+
     testImplementation "org.powermock:powermock-module-junit4:$powermock_ver"
     testImplementation "org.powermock:powermock-api-mockito2:$powermock_ver"
     testImplementation "com.noveogroup.android:android-logger:$android_logger_ver"
@@ -78,9 +88,7 @@ dependencies {
     androidTestImplementation "androidx.test:core-ktx:$androidx_test_core"
 
     androidTestImplementation "org.mockito:mockito-core:$mockito_ver"
-    androidTestImplementation "com.crittercism.dexmaker:dexmaker:$dexmaker_ver"
-    androidTestImplementation "com.crittercism.dexmaker:dexmaker-dx:$dexmaker_ver"
-    androidTestImplementation "com.crittercism.dexmaker:dexmaker-mockito:$dexmaker_ver"
+    androidTestImplementation "org.mockito:mockito-android:$mockito_ver"
     androidTestImplementation "com.noveogroup.android:android-logger:$android_logger_ver"
     androidTestImplementation "com.google.code.gson:gson:$gson_ver"
     androidTestImplementation "com.fasterxml.jackson.core:jackson-databind:$jacksonversion"

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

@@ -42,9 +42,9 @@
 import static junit.framework.Assert.assertNull;
 import static junit.framework.Assert.assertTrue;
 import static junit.framework.Assert.fail;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;

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

@@ -51,9 +51,9 @@
 import static junit.framework.Assert.assertNull;
 import static junit.framework.Assert.assertTrue;
 import static junit.framework.Assert.fail;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;

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

@@ -77,12 +77,12 @@
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assume.assumeTrue;
-import static org.mockito.Matchers.anyObject;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
 @RunWith(Parameterized.class)
@@ -131,7 +131,7 @@ public OptimizelyClientTest(int datafileVersion,String datafile){
             optimizely = Optimizely.builder(datafile, eventHandler).build();
 
             // set to return DecisionResponse with null variation by default (instead of null DecisionResponse)
-            when(bucketer.bucket(anyObject(), anyObject(), anyObject())).thenReturn(DecisionResponse.nullNoReasons());
+            when(bucketer.bucket(any(), any(), any())).thenReturn(DecisionResponse.nullNoReasons());
 
             if(datafileVersion==3) {
                 Variation variation = optimizely.getProjectConfig().getExperiments().get(0).getVariations().get(0);
@@ -431,7 +431,7 @@ public void testGoodForcedTrack() {
 
         optimizelyClient.track("test_event", GENERIC_USER_ID);
 
-        verifyZeroInteractions(logger);
+        verifyNoInteractions(logger);
 
         ArgumentCaptor<LogEvent> logEventArgumentCaptor = ArgumentCaptor.forClass(LogEvent.class);
         try {
@@ -462,7 +462,7 @@ public void testGoodTrack() {
         OptimizelyClient optimizelyClient = new OptimizelyClient(optimizely,
                 logger);
         optimizelyClient.track("test_event", GENERIC_USER_ID);
-        verifyZeroInteractions(logger);
+        verifyNoInteractions(logger);
     }
 
     @Test
@@ -484,7 +484,7 @@ public void onTrack(@Nonnull String eventKey, @Nonnull String userId, @Nonnull M
         assertTrue(notificationId <= 0);
         assertFalse(optimizelyClient.getNotificationCenter().removeNotificationListener(notificationId));
         assertEquals(false, numberOfCalls[0]);
-        verifyZeroInteractions(logger);
+        verifyNoInteractions(logger);
 
     }
 
@@ -512,7 +512,7 @@ public void onTrack(@Nonnull String eventKey, @Nonnull String userId, @Nonnull M
         else {
             assertEquals(true, numberOfCalls[0]);
         }
-        verifyZeroInteractions(logger);
+        verifyNoInteractions(logger);
 
     }
 
@@ -524,7 +524,7 @@ public void testGoodTrackBucketing() {
         Experiment experiment = optimizelyClient.getProjectConfig().getExperimentsForEventKey("test_event").get(0);
         attributes.put(BUCKETING_ATTRIBUTE, bucketingId);
         optimizelyClient.track("test_event", "userId", attributes);
-        verifyZeroInteractions(logger);
+        verifyNoInteractions(logger);
     }
 
     @Test
@@ -569,7 +569,7 @@ public void testGoodForcedTrackAttribute() {
 
         optimizelyClient.track("test_event", GENERIC_USER_ID, attributes);
 
-        verifyZeroInteractions(logger);
+        verifyNoInteractions(logger);
 
         ArgumentCaptor<LogEvent> logEventArgumentCaptor = ArgumentCaptor.forClass(LogEvent.class);
 
@@ -611,7 +611,7 @@ public void testGoodTrackAttribute() {
 
         optimizelyClient.track("test_event", GENERIC_USER_ID, attributes);
 
-        verifyZeroInteractions(logger);
+        verifyNoInteractions(logger);
 
         Variation v = optimizelyClient.getForcedVariation(FEATURE_ANDROID_EXPERIMENT_KEY, GENERIC_USER_ID);
         assertEquals(v.getKey(), "var_2");
@@ -671,7 +671,7 @@ public void testGoodForcedTrackEventVal() {
                 Collections.<String, String>emptyMap(),
                 Collections.singletonMap(ReservedEventKey.REVENUE.toString(), 1L));
 
-        verifyZeroInteractions(logger);
+        verifyNoInteractions(logger);
 
         ArgumentCaptor<LogEvent> logEventArgumentCaptor = ArgumentCaptor.forClass(LogEvent.class);
 
@@ -705,7 +705,7 @@ public void testGoodTrackEventVal() {
                 GENERIC_USER_ID,
                 Collections.<String, String>emptyMap(),
                 Collections.singletonMap(ReservedEventKey.REVENUE.toString(), 1L));
-        verifyZeroInteractions(logger);
+        verifyNoInteractions(logger);
     }
 
     @Test
@@ -750,7 +750,7 @@ public void testGoodTrackAttributeEventVal() {
         final HashMap<String, String> attributes = new HashMap<>();
         optimizelyClient.track("test_event", GENERIC_USER_ID, attributes,
                 Collections.singletonMap(ReservedEventKey.REVENUE.toString(), 1L));
-        verifyZeroInteractions(logger);
+        verifyNoInteractions(logger);
     }
 
     @Test
@@ -770,7 +770,7 @@ public void testGoodForcedTrackAttributeEventVal() {
                 attributes,
                 Collections.singletonMap(ReservedEventKey.REVENUE.toString(), 1L));
 
-        verifyZeroInteractions(logger);
+        verifyNoInteractions(logger);
 
         ArgumentCaptor<LogEvent> logEventArgumentCaptor = ArgumentCaptor.forClass(LogEvent.class);
 
@@ -839,7 +839,7 @@ public void testTrackWithEventTags() {
         final HashMap<String, Object> eventTags = new HashMap<>();
         eventTags.put("foo", 843);
         optimizelyClient.track("test_event", GENERIC_USER_ID, attributes, eventTags);
-        verifyZeroInteractions(logger);
+        verifyNoInteractions(logger);
     }
 
     @Test
@@ -875,7 +875,7 @@ public void testForcedTrackWithEventTags() {
         // id of var_2
         assertTrue(logEvent.getBody().contains("\"enrich_decisions\":true"));
 
-        verifyZeroInteractions(logger);
+        verifyNoInteractions(logger);
 
         Variation v = optimizelyClient.getForcedVariation(FEATURE_ANDROID_EXPERIMENT_KEY, GENERIC_USER_ID);
         assertEquals(v.getKey(), "var_2");
@@ -979,7 +979,7 @@ public void testGoodGetVariationAttribute() {
                 logger);
         final HashMap<String, String> attributes = new HashMap<>();
         optimizelyClient.getVariation(FEATURE_ANDROID_EXPERIMENT_KEY, GENERIC_USER_ID, attributes);
-        verifyZeroInteractions(logger);
+        verifyNoInteractions(logger);
     }
 
     @Test
@@ -996,7 +996,7 @@ public void testGoodForcedGetVariationAttribute() {
 
         v = optimizelyClient.getVariation(FEATURE_ANDROID_EXPERIMENT_KEY, GENERIC_USER_ID, attributes);
 
-        verifyZeroInteractions(logger);
+        verifyNoInteractions(logger);
 
         assertEquals(v.getKey(), "var_2");
 
@@ -1180,7 +1180,7 @@ public void testGoodIsFeatureEnabledWithAttribute() {
                 Collections.singletonMap("house", "Gryffindor")
         ));
 
-        verifyZeroInteractions(logger);
+        verifyNoInteractions(logger);
 
         assertFalse(optimizelyClient.isFeatureEnabled(
                 "InvalidFeatureKey",
@@ -1301,7 +1301,7 @@ public void testIsFeatureEnabledWithFeatureEnabledTrue(){
                 Collections.singletonMap("house", "Gryffindor")
         ));
 
-        verifyZeroInteractions(logger);
+        verifyNoInteractions(logger);
 
     }
 
@@ -1398,7 +1398,7 @@ public void testGoodGetFeatureVariableBooleanWithAttr() {
                 GENERIC_USER_ID,
                 Collections.singletonMap("key", "value")
         ));
-        verifyZeroInteractions(logger);
+        verifyNoInteractions(logger);
 
     }
 
@@ -1505,7 +1505,7 @@ public void testGoodGetFeatureVariableDoubleWithAttr() {
                 GENERIC_USER_ID,
                 Collections.singletonMap("house", "Gryffindor")
         ));
-        verifyZeroInteractions(logger);
+        verifyNoInteractions(logger);
     }
 
     //FeatureVariableDouble Scenario#3 if feature not found
@@ -1616,7 +1616,7 @@ public void testGoodGetFeatureVariableIntegerWithAttr() {
                 GENERIC_USER_ID,
                 Collections.singletonMap("house", "Gryffindor")
         ));
-        verifyZeroInteractions(logger);
+        verifyNoInteractions(logger);
     }
 
     //FeatureVariableInteger Scenario#3 if feature not found
@@ -1723,7 +1723,7 @@ public void testGoodGetFeatureVariableStringWithAttr() {
                 GENERIC_USER_ID,
                 Collections.singletonMap("house", "Gryffindor")
         ));
-        verifyZeroInteractions(logger);
+        verifyNoInteractions(logger);
     }
 
     //FeatureVariableString Scenario#3 if feature not found
@@ -1837,7 +1837,7 @@ public void testGetFeatureVariableJsonWithAttr() {
         );
 
         assertTrue(compareJsonStrings(json.toString(), defaultValueOfStringVar));
-        verifyZeroInteractions(logger);
+        verifyNoInteractions(logger);
     }
 
     //FeatureVariableJSON Scenario#3 if feature not found
@@ -1949,7 +1949,7 @@ public void testGetAllFeatureVariablesWithAttr() {
         );
 
         assertTrue(compareJsonStrings(json.toString(), defaultValueOfStringVar));
-        verifyZeroInteractions(logger);
+        verifyNoInteractions(logger);
     }
 
     //GetAllFeatureVariables Scenario#3 if feature not found

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

@@ -26,8 +26,8 @@
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;