diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/protocol/websocket/WebSocketFrameEncoderTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/protocol/websocket/WebSocketFrameEncoderTest.java index 047464fa78..e4c2a46f58 100644 --- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/protocol/websocket/WebSocketFrameEncoderTest.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/protocol/websocket/WebSocketFrameEncoderTest.java @@ -24,7 +24,6 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; -import static org.mockito.Mockito.verifyZeroInteractions; import java.nio.charset.StandardCharsets; import java.util.List; @@ -73,7 +72,7 @@ public class WebSocketFrameEncoderTest { verify(spy).write(ctx, msg, promise); verify(ctx).write(msg, promise); verifyNoMoreInteractions(spy, ctx); - verifyZeroInteractions(promise); + verifyNoMoreInteractions(promise); } @Test @@ -160,6 +159,6 @@ public class WebSocketFrameEncoderTest { assertEquals(content.substring(offset), last.content().toString(StandardCharsets.UTF_8)); verifyNoMoreInteractions(spy, ctx); - verifyZeroInteractions(promise); + verifyNoMoreInteractions(promise); } } diff --git a/examples/features/standard/opentracing/src/test/java/org/apache/activemq/artemis/jms/example/OpenTracingPluginTest.java b/examples/features/standard/opentracing/src/test/java/org/apache/activemq/artemis/jms/example/OpenTracingPluginTest.java index da25745230..c80e3162ee 100644 --- a/examples/features/standard/opentracing/src/test/java/org/apache/activemq/artemis/jms/example/OpenTracingPluginTest.java +++ b/examples/features/standard/opentracing/src/test/java/org/apache/activemq/artemis/jms/example/OpenTracingPluginTest.java @@ -38,10 +38,9 @@ import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.Mockito; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyObject; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.mock; @@ -85,7 +84,7 @@ public class OpenTracingPluginTest { verify(spanBuilder, atLeastOnce()).setAttribute(anyString(), anyString()); verify(spanBuilder, atLeastOnce()).setSpanKind(any(SpanKind.class)); verify(spanBuilder, atLeastOnce()).startSpan(); - verify(message, atLeastOnce()).setUserContext(anyObject(), anyObject()); + verify(message, atLeastOnce()).setUserContext(any(Object.class), any(Object.class)); } @Test diff --git a/pom.xml b/pom.xml index f13d35a86c..69e7cce9b3 100644 --- a/pom.xml +++ b/pom.xml @@ -112,7 +112,7 @@ 3.1.2 1.39.0 9.2.1 - 3.12.4 + 4.4.0 2.1.2 4.1.75.Final 2.1.12