Bump org.mockito:mockito-core from 3.12.4 to 5.14.2 (#288)

Ericsson · Dec 9, 2024 · ee96f7f · ee96f7f
1 parent fe9de42
commit ee96f7f
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 19 deletions.
diff --git a/.../src/test/java/com/ericsson/bss/cassandra/ecaudit/entry/suppressor/TestSuppressBlobs.java b/.../src/test/java/com/ericsson/bss/cassandra/ecaudit/entry/suppressor/TestSuppressBlobs.java
@@ -36,7 +36,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
 /**
@@ -72,7 +72,7 @@ public void testBlobsAreHidden(ColumnSpecification column, String expectedString
         Optional<String> result = suppressor.suppress(column, valueMock);
         // Then
         assertThat(result).contains(expectedString);
-        verifyZeroInteractions(valueMock);
+        verifyNoInteractions(valueMock);
     }
 
     public Object[][] testBlobsAreHidden_parameters()
@@ -101,7 +101,7 @@ public void testNonBlobsColumns(ColumnSpecification column)
         Optional<String> result = suppressor.suppress(column, valueMock);
         // Then
         assertThat(result).isEmpty();
-        verifyZeroInteractions(valueMock);
+        verifyNoInteractions(valueMock);
     }
 
     public Object[][] testNonBlobsColumns_parameters()

diff --git a/...com/ericsson/bss/cassandra/ecaudit/entry/suppressor/TestSuppressClusteringAndRegular.java b/...com/ericsson/bss/cassandra/ecaudit/entry/suppressor/TestSuppressClusteringAndRegular.java
@@ -28,7 +28,7 @@
 import org.mockito.junit.MockitoJUnitRunner;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 
 /**
  * Tests the {@link SuppressClusteringAndRegular} class.
@@ -52,7 +52,7 @@ public void testPartitionKeyIsNotSuppressed()
         Optional<String> result = suppressor.suppress(PARTITION_KEY_COLUMN, valueMock);
         // Then
         assertThat(result).isEmpty();
-        verifyZeroInteractions(valueMock);
+        verifyNoInteractions(valueMock);
     }
 
     @Test
@@ -64,7 +64,7 @@ public void testClusterKeyIsNotSuppressed()
         Optional<String> result = suppressor.suppress(CLUSTER_KEY_COLUMN, valueMock);
         // Then
         assertThat(result).contains("<int>");
-        verifyZeroInteractions(valueMock);
+        verifyNoInteractions(valueMock);
     }
 
     @Test
@@ -76,6 +76,6 @@ public void testRegularIsSuppressed()
         Optional<String> result = suppressor.suppress(REGULAR_COLUMN, valueMock);
         // Then
         assertThat(result).contains("<text>");
-        verifyZeroInteractions(valueMock);
+        verifyNoInteractions(valueMock);
     }
 }
diff --git a/...test/java/com/ericsson/bss/cassandra/ecaudit/entry/suppressor/TestSuppressEverything.java b/...test/java/com/ericsson/bss/cassandra/ecaudit/entry/suppressor/TestSuppressEverything.java
@@ -28,7 +28,7 @@
 import org.mockito.junit.MockitoJUnitRunner;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 
 /**
  * Tests the {@link SuppressEverything} class.
@@ -53,6 +53,6 @@ public void testSuppressorAlwaysReturnsType()
         // Then
         assertThat(textResult).contains("<text>");
         assertThat(integerResult).contains("<int>");
-        verifyZeroInteractions(valueMock);
+        verifyNoInteractions(valueMock);
     }
 }
diff --git a/...rc/test/java/com/ericsson/bss/cassandra/ecaudit/entry/suppressor/TestSuppressNothing.java b/...rc/test/java/com/ericsson/bss/cassandra/ecaudit/entry/suppressor/TestSuppressNothing.java
@@ -25,7 +25,7 @@
 import org.mockito.junit.MockitoJUnitRunner;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 
 /**
  * Tests the {@link SuppressNothing} class.
@@ -45,6 +45,6 @@ public void testSuppressorNeverSuppresses()
         Optional<String> result = suppressor.suppress(null, valueMock);
         // Then
         assertThat(result).isEmpty();
-        verifyZeroInteractions(valueMock);
+        verifyNoInteractions(valueMock);
     }
 }
diff --git a/...rc/test/java/com/ericsson/bss/cassandra/ecaudit/entry/suppressor/TestSuppressRegular.java b/...rc/test/java/com/ericsson/bss/cassandra/ecaudit/entry/suppressor/TestSuppressRegular.java
@@ -27,7 +27,7 @@
 import org.mockito.junit.MockitoJUnitRunner;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 
 /**
  * Tests the {@link SuppressRegular} class.
@@ -51,7 +51,7 @@ public void testPartitionKeyIsNotSuppressed()
         Optional<String> result = suppressor.suppress(PARTITION_KEY_COLUMN, valueMock);
         // Then
         assertThat(result).isEmpty();
-        verifyZeroInteractions(valueMock);
+        verifyNoInteractions(valueMock);
     }
 
     @Test
@@ -63,7 +63,7 @@ public void testClusterKeyIsSuppressed()
         Optional<String> result = suppressor.suppress(CLUSTER_KEY_COLUMN, valueMock);
         // Then
         assertThat(result).isEmpty();
-        verifyZeroInteractions(valueMock);
+        verifyNoInteractions(valueMock);
     }
 
     @Test
@@ -75,6 +75,6 @@ public void testRegularIsSuppressed()
         Optional<String> result = suppressor.suppress(REGULAR_COLUMN, valueMock);
         // Then
         assertThat(result).contains("<text>");
-        verifyZeroInteractions(valueMock);
+        verifyNoInteractions(valueMock);
     }
 }
diff --git a/ecaudit/src/test/java/com/ericsson/bss/cassandra/ecaudit/facade/TestDefaultAuditor.java b/ecaudit/src/test/java/com/ericsson/bss/cassandra/ecaudit/facade/TestDefaultAuditor.java
@@ -46,7 +46,7 @@
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.StrictStubs.class)
@@ -103,7 +103,7 @@ public void testAuditFiltered()
         verify(mockFilter).isWhitelisted(logEntry);
         verify(mockAuditMetrics).filterAuditRequest(timingCaptor.capture(), eq(TimeUnit.NANOSECONDS));
         verifyNoMoreInteractions(mockAuditMetrics);
-        verifyZeroInteractions(mockLogger, mockObfuscator);
+        verifyNoInteractions(mockLogger, mockObfuscator);
 
         long timeMeasured = timingCaptor.getValue();
         assertThat(timeMeasured).isLessThanOrEqualTo(timeTaken);
@@ -214,7 +214,7 @@ public void testAddedLoggerCanBeRemoved()
         auditor.audit(logEntry);
         // Then
         verify(mockLogger).log(logEntry);
-        verifyZeroInteractions(secondLogger);
+        verifyNoInteractions(secondLogger);
         reset(mockFilter, mockObfuscator, mockAuditMetrics);
     }
 

diff --git a/pom.xml b/pom.xml
@@ -63,7 +63,7 @@
         <commons-io.version>2.15.1</commons-io.version>
         <jcip-annotations.version>1.0</jcip-annotations.version>
         <junit.version>4.13.2</junit.version>
-        <mockito.version>3.12.4</mockito.version>
+        <mockito.version>5.14.2</mockito.version>
         <jmh.version>1.27</jmh.version>
         <junitparams.version>1.1.1</junitparams.version>
         <awaitility.version>4.1.1</awaitility.version>