Bump Mockito dependencies (#1711)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
opensearch-project · Jan 12, 2024 · e3a8a59 · e3a8a59
1 parent ce66775
commit e3a8a59
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/client/build.gradle b/client/build.gradle
@@ -18,7 +18,7 @@ dependencies {
     implementation project(path: ":${rootProject.name}-common", configuration: 'shadow')
     compileOnly group: 'org.opensearch', name: 'opensearch', version: "${opensearch_version}"
     testImplementation group: 'junit', name: 'junit', version: '4.13.2'
-    testImplementation group: 'org.mockito', name: 'mockito-core', version: '5.3.1'
+    testImplementation group: 'org.mockito', name: 'mockito-core', version: '5.7.0'
 
 }
 

diff --git a/common/build.gradle b/common/build.gradle
@@ -19,7 +19,7 @@ dependencies {
     testImplementation group: 'junit', name: 'junit', version: '4.13.2'
     compileOnly "org.opensearch.client:opensearch-rest-client:${opensearch_version}"
     compileOnly "org.opensearch:common-utils:${common_utils_version}"
-    testImplementation group: 'org.mockito', name: 'mockito-core', version: '4.4.0'
+    testImplementation group: 'org.mockito', name: 'mockito-core', version: '5.7.0'
 
     compileOnly group: 'org.apache.commons', name: 'commons-text', version: '1.10.0'
     compileOnly group: 'com.google.code.gson', name: 'gson', version: '2.10.1'

diff --git a/memory/build.gradle b/memory/build.gradle
@@ -33,7 +33,7 @@ dependencies {
         exclude module : 'hamcrest'
         exclude module : 'hamcrest-core'
     }
-    testImplementation group: 'org.mockito', name: 'mockito-core', version: '4.4.0'
+    testImplementation group: 'org.mockito', name: 'mockito-core', version: '5.7.0'
     testImplementation "org.opensearch.test:framework:${opensearch_version}"
     testImplementation "org.opensearch.client:opensearch-rest-client:${opensearch_version}"
     testImplementation group: 'com.google.code.gson', name: 'gson', version: '2.10.1'

diff --git a/ml-algorithms/build.gradle b/ml-algorithms/build.gradle
@@ -41,7 +41,7 @@ dependencies {
     implementation group: 'io.protostuff', name: 'protostuff-api', version: '1.8.0'
     implementation group: 'io.protostuff', name: 'protostuff-collectionschema', version: '1.8.0'
     testImplementation group: 'junit', name: 'junit', version: '4.13.2'
-    testImplementation group: 'org.mockito', name: 'mockito-core', version: '5.3.1'
+    testImplementation group: 'org.mockito', name: 'mockito-core', version: '5.7.0'
     implementation group: 'com.google.guava', name: 'guava', version: '32.0.1-jre'
     implementation group: 'com.google.code.gson', name: 'gson', version: '2.10.1'
     implementation platform("ai.djl:bom:0.21.0")

diff --git a/plugin/src/test/java/org/opensearch/ml/bwc/MLCommonsBackwardsCompatibilityRestTestCase.java b/plugin/src/test/java/org/opensearch/ml/bwc/MLCommonsBackwardsCompatibilityRestTestCase.java
@@ -5,6 +5,7 @@
 
 package org.opensearch.ml.bwc;
 
+import static org.hamcrest.Matchers.equalTo;
 import static org.opensearch.client.RestClientBuilder.DEFAULT_MAX_CONN_PER_ROUTE;
 import static org.opensearch.client.RestClientBuilder.DEFAULT_MAX_CONN_TOTAL;
 import static org.opensearch.commons.ConfigConstants.OPENSEARCH_SECURITY_SSL_HTTP_ENABLED;
@@ -750,7 +751,7 @@ public String getTaskState(String taskId) throws IOException {
         return (String) task.get("state");
     }
 
-    public void waitForTask(String taskId, MLTaskState targetState) throws InterruptedException {
+    public void waitForTask(String taskId, MLTaskState targetState) throws InterruptedException, IOException {
         AtomicBoolean taskDone = new AtomicBoolean(false);
         waitUntil(() -> {
             try {
@@ -763,6 +764,7 @@ public void waitForTask(String taskId, MLTaskState targetState) throws Interrupt
             }
             return taskDone.get();
         }, CUSTOM_MODEL_TIMEOUT, TimeUnit.SECONDS);
+        assertThat(getTaskState(taskId), equalTo(targetState.name()));
         assertTrue(taskDone.get());
     }
 }