Merge pull request #2298 from telefonicaid/task/upgrade_mockito_dep

upgrade mockito dep from 1.9.5 to 5.5.0
telefonicaid · Sep 13, 2023 · bee00f8 · bee00f8
2 parents b5d2347 + becde33
commit bee00f8
Show file tree

Hide file tree

Showing 24 changed files with 145 additions and 148 deletions.
diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE
@@ -1,3 +1,4 @@
+- [cygnus-ngsi][cygnus-common] upgrade mockito dep from 1.9.5 to 5.5.0
 - [cygnus-ngsi] Fix runtime error: check access aggregator size (#2293)
 - [cygnus-ngsi] Switch log level to CYGNUS_LOG_LEVEL env var if was provided to docker (#2286)
 - [cygnus-common][SQL] Fix expiration records tablename used by delete and select (#2265)

diff --git a/cygnus-common/pom.xml b/cygnus-common/pom.xml
@@ -26,8 +26,8 @@
         <!-- Required for testing -->
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
-            <version>1.9.5</version>
+            <artifactId>mockito-core</artifactId>
+            <version>5.5.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/cygnus-common/src/test/java/com/telefonica/iot/cygnus/backends/ckan/CKANBackendImplTest.java b/cygnus-common/src/test/java/com/telefonica/iot/cygnus/backends/ckan/CKANBackendImplTest.java
@@ -32,7 +32,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import static org.mockito.Mockito.when;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 /**
  *

diff --git a/cygnus-common/src/test/java/com/telefonica/iot/cygnus/backends/ckan/CKANCacheTest.java b/cygnus-common/src/test/java/com/telefonica/iot/cygnus/backends/ckan/CKANCacheTest.java
@@ -28,7 +28,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import static org.mockito.Mockito.when;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 /**
  *

diff --git a/...mmon/src/test/java/com/telefonica/iot/cygnus/backends/dynamo/DynamoDBBackendImplTest.java b/...mmon/src/test/java/com/telefonica/iot/cygnus/backends/dynamo/DynamoDBBackendImplTest.java
@@ -29,7 +29,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import static org.mockito.Mockito.when;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 /**
  *

diff --git a/...mmon/src/test/java/com/telefonica/iot/cygnus/backends/hdfs/HDFSBackendImplBinaryTest.java b/...mmon/src/test/java/com/telefonica/iot/cygnus/backends/hdfs/HDFSBackendImplBinaryTest.java
@@ -26,7 +26,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import static org.junit.Assert.*; // this is required by "fail" like assertions
 import org.mockito.Mockito;
 import static org.mockito.Mockito.when;

diff --git a/...common/src/test/java/com/telefonica/iot/cygnus/backends/hdfs/HDFSBackendImplRESTTest.java b/...common/src/test/java/com/telefonica/iot/cygnus/backends/hdfs/HDFSBackendImplRESTTest.java
@@ -28,7 +28,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import static org.junit.Assert.*; // this is required by "fail" like assertions
 import static org.mockito.Mockito.*; // this is required by "when" like functions
 

diff --git a/cygnus-common/src/test/java/com/telefonica/iot/cygnus/backends/http/HttpBackendTest.java b/cygnus-common/src/test/java/com/telefonica/iot/cygnus/backends/http/HttpBackendTest.java
@@ -33,7 +33,7 @@
 import static org.junit.Assert.assertTrue;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 /**
  *
@@ -368,4 +368,4 @@ public void testFinishTransaction() {
         } // try catch
     } // testFinishTransaction
 
-} // HttpBackendTest
+} // HttpBackendTest
diff --git a/cygnus-common/src/test/java/com/telefonica/iot/cygnus/backends/http/JsonResponseTest.java b/cygnus-common/src/test/java/com/telefonica/iot/cygnus/backends/http/JsonResponseTest.java
@@ -29,7 +29,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 /**
  *

diff --git a/...s-common/src/test/java/com/telefonica/iot/cygnus/backends/kafka/KafkaBackendImplTest.java b/...s-common/src/test/java/com/telefonica/iot/cygnus/backends/kafka/KafkaBackendImplTest.java
@@ -33,7 +33,7 @@
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import static org.mockito.Mockito.when;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 /**
  *

diff --git a/cygnus-common/src/test/java/com/telefonica/iot/cygnus/backends/sql/SQLBackendImplTest.java b/cygnus-common/src/test/java/com/telefonica/iot/cygnus/backends/sql/SQLBackendImplTest.java
@@ -25,7 +25,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import java.sql.Connection;
 import java.sql.Statement;

diff --git a/cygnus-common/src/test/java/com/telefonica/iot/cygnus/backends/sql/SQLQueryUtilsTest.java b/cygnus-common/src/test/java/com/telefonica/iot/cygnus/backends/sql/SQLQueryUtilsTest.java
@@ -26,7 +26,7 @@
 
 import static com.telefonica.iot.cygnus.utils.CommonUtilsForTests.getTestTraceHead;
 import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.*;
 
 import java.sql.Connection;

diff --git a/...c/test/java/com/telefonica/iot/cygnus/channelselectors/RoundRobinChannelSelectorTest.java b/...c/test/java/com/telefonica/iot/cygnus/channelselectors/RoundRobinChannelSelectorTest.java
@@ -29,7 +29,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 /**
  *

diff --git a/...us-common/src/test/java/com/telefonica/iot/cygnus/management/ManagementInterfaceTest.java b/...us-common/src/test/java/com/telefonica/iot/cygnus/management/ManagementInterfaceTest.java
@@ -33,7 +33,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*; // this is required by "when" like functions
 import static com.telefonica.iot.cygnus.utils.CommonUtilsForTests.getTestTraceHead;

diff --git a/cygnus-common/src/test/java/com/telefonica/iot/cygnus/utils/CommonUtilsTest.java b/cygnus-common/src/test/java/com/telefonica/iot/cygnus/utils/CommonUtilsTest.java
@@ -31,7 +31,7 @@
 import static org.junit.Assert.assertTrue;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 /**
  *

diff --git a/cygnus-ngsi/pom.xml b/cygnus-ngsi/pom.xml
@@ -19,8 +19,8 @@
         <!-- Required for testing -->
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
-            <version>1.9.5</version>
+            <artifactId>mockito-core</artifactId>
+            <version>5.5.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/cygnus-ngsi/src/test/java/com/telefonica/iot/cygnus/handlers/NGSIRestHandlerTest.java b/cygnus-ngsi/src/test/java/com/telefonica/iot/cygnus/handlers/NGSIRestHandlerTest.java
@@ -39,7 +39,7 @@
 import static org.junit.Assert.*; // this is required by "fail" like assertions
 import org.junit.Before;
 import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.junit.Test;
 import org.mockito.Mock;
 import static org.mockito.Mockito.when;