This is an automated email from the ASF dual-hosted git repository. robbie pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/qpid-jms.git
The following commit(s) were added to refs/heads/master by this push: new 709cee2 NO-JIRA: update (or delete as unused) some mock usage to stop using deprecated method 709cee2 is described below commit 709cee28e2f22b7d860ac14e5a7f570e691ecd43 Author: Robbie Gemmell <rob...@apache.org> AuthorDate: Thu Dec 17 12:36:16 2020 +0000 NO-JIRA: update (or delete as unused) some mock usage to stop using deprecated method --- .../jms/tracing/opentracing/OpenTracingIntegrationTest.java | 12 ------------ .../qpid/jms/tracing/opentracing/OpenTracingTracerTest.java | 9 ++++++++- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/tracing/opentracing/OpenTracingIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/tracing/opentracing/OpenTracingIntegrationTest.java index f1e20f5..ed4cf2c 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/tracing/opentracing/OpenTracingIntegrationTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/tracing/opentracing/OpenTracingIntegrationTest.java @@ -74,11 +74,7 @@ import org.apache.qpid.proton.amqp.DescribedType; import org.apache.qpid.proton.amqp.Symbol; import org.apache.qpid.proton.amqp.UnsignedInteger; import org.hamcrest.Matchers; -import org.junit.Before; import org.junit.Test; -import org.mockito.ArgumentCaptor; -import org.mockito.Captor; -import org.mockito.MockitoAnnotations; import io.opentracing.Span; import io.opentracing.SpanContext; @@ -93,14 +89,6 @@ import io.opentracing.tag.Tags; public class OpenTracingIntegrationTest extends QpidJmsTestCase { - @Captor - private ArgumentCaptor<Map<String, String>> annotationMapCaptor; - - @Before - public void setUp() { - MockitoAnnotations.initMocks(this); - } - @Test(timeout = 20000) public void testSend() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer();) { diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/tracing/opentracing/OpenTracingTracerTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/tracing/opentracing/OpenTracingTracerTest.java index 2b8ccce..e6a2d90 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/tracing/opentracing/OpenTracingTracerTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/tracing/opentracing/OpenTracingTracerTest.java @@ -41,6 +41,7 @@ import org.apache.qpid.jms.test.QpidJmsTestCase; import org.apache.qpid.jms.tracing.JmsTracer; import org.apache.qpid.jms.tracing.JmsTracer.DeliveryOutcome; import org.apache.qpid.jms.tracing.TraceableMessage; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.mockito.ArgumentCaptor; @@ -67,10 +68,16 @@ public class OpenTracingTracerTest extends QpidJmsTestCase { @Captor private ArgumentCaptor<Map<String, String>> annotationMapCaptor; + private AutoCloseable closable; @Before public void setUp() { - MockitoAnnotations.initMocks(this); + closable = MockitoAnnotations.openMocks(this); + } + + @After + public void tearDown() throws Exception { + closable.close(); } @Test --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org