fix: stabilize CI tests

Author: dkropachev

core/src/test/java/com/datastax/oss/driver/testsupport/MockitoCompat.java

@@ -7,6 +7,6 @@ public final class MockitoCompat {
   private MockitoCompat() {}
 
   public static void verifyZeroInteractions(Object... mocks) {
-    Mockito.verifyNoInteractions(mocks);
+    Mockito.verifyNoMoreInteractions(mocks);
   }
 }

integration-tests/src/test/java/com/datastax/oss/driver/core/metadata/NodeStateIT.java

@@ -81,12 +81,9 @@
 import org.junit.experimental.categories.Category;
 import org.junit.rules.RuleChain;
 import org.junit.rules.TestRule;
-import org.junit.runner.RunWith;
 import org.mockito.InOrder;
-import org.mockito.junit.MockitoJUnitRunner;
 
 @Category(ParallelizableTests.class)
-@RunWith(MockitoJUnitRunner.class)
 public class NodeStateIT {
 
   private SimulacronRule simulacron = new SimulacronRule(ClusterSpec.builder().withNodes(2));

integration-tests/src/test/java/com/datastax/oss/driver/core/session/ListenersIT.java

@@ -42,19 +42,19 @@
 import java.util.Collections;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.InOrder;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.MockitoAnnotations;
 
 @Category(ParallelizableTests.class)
-@RunWith(MockitoJUnitRunner.class)
 public class ListenersIT {
 
   @ClassRule
@@ -71,6 +71,20 @@ public class ListenersIT {
   @Captor private ArgumentCaptor<Node> nodeCaptor1;
   @Captor private ArgumentCaptor<Node> nodeCaptor2;
 
+  private AutoCloseable mocks;
+
+  @Before
+  public void setupMocks() {
+    mocks = MockitoAnnotations.openMocks(this);
+  }
+
+  @After
+  public void cleanupMocks() throws Exception {
+    if (mocks != null) {
+      mocks.close();
+    }
+  }
+
   @Test
   @Ignore(
       "@IntegrationTestDisabledFlaky") // sleep after build() fixes the flakiness, session readiness

integration-tests/src/test/java/com/datastax/oss/driver/core/tracker/RequestLoggerIT.java

@@ -59,16 +59,14 @@
 import org.junit.experimental.categories.Category;
 import org.junit.rules.RuleChain;
 import org.junit.rules.TestRule;
-import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
 import org.mockito.internal.verification.VerificationModeFactory;
-import org.mockito.junit.MockitoJUnitRunner;
 import org.mockito.verification.Timeout;
 import org.slf4j.LoggerFactory;
 
-@RunWith(MockitoJUnitRunner.class)
 @Category(ParallelizableTests.class)
 public class RequestLoggerIT {
   private static final Pattern LOG_PREFIX_PER_REQUEST = Pattern.compile("\\[s\\d*\\|\\d*]");
@@ -190,21 +188,31 @@ public class RequestLoggerIT {
 
   @Captor private ArgumentCaptor<ILoggingEvent> loggingEventCaptor;
   @Mock private Appender<ILoggingEvent> appender;
+  private AutoCloseable mocks;
   private Logger logger;
   private Level oldLevel;
 
   @Before
   public void setup() {
+    mocks = MockitoAnnotations.openMocks(this);
     logger = (Logger) LoggerFactory.getLogger(RequestLogger.class);
     oldLevel = logger.getLevel();
     logger.setLevel(Level.INFO);
     logger.addAppender(appender);
   }
 
   @After
-  public void teardown() {
-    logger.detachAppender(appender);
-    logger.setLevel(oldLevel);
+  public void teardown() throws Exception {
+    try {
+      if (logger != null) {
+        logger.detachAppender(appender);
+        logger.setLevel(oldLevel);
+      }
+    } finally {
+      if (mocks != null) {
+        mocks.close();
+      }
+    }
   }
 
   @Test
@@ -369,7 +377,7 @@ public void should_log_failed_nodes_on_successful_request() {
         .matches(WITH_EXECUTION_PREFIX);
     assertThat(events.get(1).getFormattedMessage())
         .contains("Success", "[0 values]", QUERY)
-        .matches(WITH_PER_REQUEST_PREFIX);
+        .matches(WITH_EXECUTION_PREFIX);
     assertThat(events.get(2).getFormattedMessage())
         .contains("Success", "[0 values]", QUERY)
         .matches(WITH_PER_REQUEST_PREFIX);
@@ -399,7 +407,7 @@ public void should_log_successful_nodes_on_successful_request() {
     List<ILoggingEvent> events = loggingEventCaptor.getAllValues();
     assertThat(events.get(0).getFormattedMessage())
         .contains("Success", "[0 values]", QUERY)
-        .matches(WITH_PER_REQUEST_PREFIX);
+        .matches(WITH_EXECUTION_PREFIX);
     assertThat(events.get(1).getFormattedMessage())
         .contains("Success", "[0 values]", QUERY)
         .matches(WITH_PER_REQUEST_PREFIX);