NO-JIRA Update Mockito and simpleframework to latest major version

3 files changed, 9 insertions, 9 deletions

diff --git a/server/sonar-webserver-core/src/test/java/org/sonar/server/notification/email/EmailNotificationChannelTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/notification/email/EmailNotificationChannelTest.java
index e52f4db65d3..b31c7476c70 100644
--- a/server/sonar-webserver-core/src/test/java/org/sonar/server/notification/email/EmailNotificationChannelTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/notification/email/EmailNotificationChannelTest.java
@@ -52,8 +52,8 @@ import static org.apache.commons.lang.RandomStringUtils.random;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
 
 @RunWith(DataProviderRunner.class)
@@ -239,7 +239,7 @@ public class EmailNotificationChannelTest {
     int count = underTest.deliverAll(Collections.emptySet());
 
     assertThat(count).isZero();
-    verifyZeroInteractions(emailSettings);
+    verifyNoInteractions(emailSettings);
     assertThat(smtpServer.getMessages()).isEmpty();
   }
 
diff --git a/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/db/migration/AutoDbMigrationTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/db/migration/AutoDbMigrationTest.java
index 65a751a69bf..8e92b826eda 100644
--- a/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/db/migration/AutoDbMigrationTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/db/migration/AutoDbMigrationTest.java
@@ -36,7 +36,7 @@ import org.sonar.server.platform.db.migration.engine.MigrationEngine;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
 public class AutoDbMigrationTest {
@@ -84,7 +84,7 @@ public class AutoDbMigrationTest {
 
     underTest.start();
 
-    verifyZeroInteractions(migrationEngine);
+    verifyNoInteractions(migrationEngine);
     assertThat(logTester.logs(LoggerLevel.INFO)).isEmpty();
   }
 
@@ -108,7 +108,7 @@ public class AutoDbMigrationTest {
 
     underTest.start();
 
-    verifyZeroInteractions(migrationEngine);
+    verifyNoInteractions(migrationEngine);
     assertThat(logTester.logs(LoggerLevel.INFO)).isEmpty();
   }
 
diff --git a/server/sonar-webserver-core/src/test/java/org/sonar/server/webhook/WebhookQGChangeEventListenerTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/webhook/WebhookQGChangeEventListenerTest.java
index 23e4e7d3a30..4e98d1f2136 100644
--- a/server/sonar-webserver-core/src/test/java/org/sonar/server/webhook/WebhookQGChangeEventListenerTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/webhook/WebhookQGChangeEventListenerTest.java
@@ -60,7 +60,7 @@ 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.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 import static org.sonar.core.util.stream.MoreCollectors.toArrayList;
 import static org.sonar.db.component.BranchType.BRANCH;
@@ -94,7 +94,7 @@ public class WebhookQGChangeEventListenerTest {
     mockedUnderTest.onIssueChanges(qualityGateEvent, CHANGED_ISSUES_ARE_IGNORED);
 
     verify(webHooks).isEnabled(qualityGateEvent.getProject());
-    verifyZeroInteractions(webhookPayloadFactory, mockedDbClient);
+    verifyNoInteractions(webhookPayloadFactory, mockedDbClient);
   }
 
   @DataProvider
@@ -121,7 +121,7 @@ public class WebhookQGChangeEventListenerTest {
 
     underTest.onIssueChanges(qualityGateEvent, CHANGED_ISSUES_ARE_IGNORED);
 
-    verifyZeroInteractions(webhookPayloadFactory, mockedDbClient);
+    verifyNoInteractions(webhookPayloadFactory, mockedDbClient);
   }
 
   @Test
@@ -134,7 +134,7 @@ public class WebhookQGChangeEventListenerTest {
 
     underTest.onIssueChanges(qualityGateEvent, CHANGED_ISSUES_ARE_IGNORED);
 
-    verifyZeroInteractions(webhookPayloadFactory, mockedDbClient);
+    verifyNoInteractions(webhookPayloadFactory, mockedDbClient);
   }
 
   @Test