From 9fd59aaca55fdf52cac3b105177bb1cd11d6e6e0 Mon Sep 17 00:00:00 2001 From: emeroad Date: Thu, 23 Jun 2022 18:36:10 +0900 Subject: [PATCH] [#8965] Apply SharedTestLifeCycle to RabbitMq --- .../plugin/rabbitmq/RabbitMQClientITBase.java | 13 --------- .../RabbitMQClient_2_7_0_to_3_3_0_IT.java | 2 ++ .../RabbitMQClient_3_3_0_to_4_0_0_IT.java | 2 ++ .../rabbitmq/RabbitMQClient_4_x_IT.java | 2 ++ .../rabbitmq/RabbitMQClient_5_x_IT.java | 2 ++ .../plugin/rabbitmq/TestBrokerServer.java | 27 +++++++++++++++++++ .../spring/SpringAmqpRabbitITBase.java | 19 +++++-------- .../SpringAmqpRabbit_1_3_3_to_1_4_2_IT.java | 3 +++ .../SpringAmqpRabbit_1_4_2_to_1_7_0_IT.java | 3 +++ .../SpringAmqpRabbit_1_7_0_to_1_7_7_IT.java | 3 +++ .../SpringAmqpRabbit_1_7_7_to_2_0_0_IT.java | 3 +++ .../SpringAmqpRabbit_2_0_0_to_2_0_3_IT.java | 3 +++ .../SpringAmqpRabbit_2_0_3_to_2_1_0_IT.java | 3 +++ .../SpringAmqpRabbit_2_1_x_to_2_x_IT.java | 4 ++- 14 files changed, 62 insertions(+), 27 deletions(-) create mode 100644 plugins-it/rabbitmq-it/src/test/java/com/navercorp/pinpoint/plugin/rabbitmq/TestBrokerServer.java diff --git a/plugins-it/rabbitmq-it/src/test/java/com/navercorp/pinpoint/plugin/rabbitmq/RabbitMQClientITBase.java b/plugins-it/rabbitmq-it/src/test/java/com/navercorp/pinpoint/plugin/rabbitmq/RabbitMQClientITBase.java index 641a6976913e..88539f7a7c65 100644 --- a/plugins-it/rabbitmq-it/src/test/java/com/navercorp/pinpoint/plugin/rabbitmq/RabbitMQClientITBase.java +++ b/plugins-it/rabbitmq-it/src/test/java/com/navercorp/pinpoint/plugin/rabbitmq/RabbitMQClientITBase.java @@ -17,9 +17,6 @@ package com.navercorp.pinpoint.plugin.rabbitmq; import com.navercorp.pinpoint.plugin.rabbitmq.util.RabbitMQTestConstants; -import com.navercorp.pinpoint.plugin.rabbitmq.util.TestBroker; -import com.navercorp.pinpoint.test.plugin.shared.AfterSharedClass; -import com.navercorp.pinpoint.test.plugin.shared.BeforeSharedClass; import com.rabbitmq.client.ConnectionFactory; import org.junit.Before; @@ -30,20 +27,10 @@ */ public abstract class RabbitMQClientITBase { - private static final TestBroker BROKER = new TestBroker(); private final ConnectionFactory connectionFactory = new ConnectionFactory(); protected final RabbitMQTestRunner testRunner = new RabbitMQTestRunner(connectionFactory); - @BeforeSharedClass - public static void sharedSetUp() throws Exception { - BROKER.start(); - } - - @AfterSharedClass - public static void sharedTearDown() { - BROKER.shutdown(); - } @Before public void setUp() { diff --git a/plugins-it/rabbitmq-it/src/test/java/com/navercorp/pinpoint/plugin/rabbitmq/RabbitMQClient_2_7_0_to_3_3_0_IT.java b/plugins-it/rabbitmq-it/src/test/java/com/navercorp/pinpoint/plugin/rabbitmq/RabbitMQClient_2_7_0_to_3_3_0_IT.java index fa48d091ebd7..42bae9bcd4b9 100644 --- a/plugins-it/rabbitmq-it/src/test/java/com/navercorp/pinpoint/plugin/rabbitmq/RabbitMQClient_2_7_0_to_3_3_0_IT.java +++ b/plugins-it/rabbitmq-it/src/test/java/com/navercorp/pinpoint/plugin/rabbitmq/RabbitMQClient_2_7_0_to_3_3_0_IT.java @@ -23,6 +23,7 @@ import com.navercorp.pinpoint.test.plugin.PinpointAgent; import com.navercorp.pinpoint.test.plugin.PinpointConfig; import com.navercorp.pinpoint.test.plugin.PinpointPluginTestSuite; +import com.navercorp.pinpoint.test.plugin.shared.SharedTestLifeCycleClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -36,6 +37,7 @@ @ImportPlugin({"com.navercorp.pinpoint:pinpoint-rabbitmq-plugin", "com.navercorp.pinpoint:pinpoint-jetty-plugin", "com.navercorp.pinpoint:pinpoint-user-plugin"}) @Dependency({"com.rabbitmq:amqp-client:[2.7.0,3.0.0)", "org.apache.qpid:qpid-broker:6.1.1"}) @JvmArgument("-DtestLoggerEnable=false") +@SharedTestLifeCycleClass(TestBrokerServer.class) public class RabbitMQClient_2_7_0_to_3_3_0_IT extends com.navercorp.pinpoint.plugin.rabbitmq.RabbitMQClientITBase { @Test diff --git a/plugins-it/rabbitmq-it/src/test/java/com/navercorp/pinpoint/plugin/rabbitmq/RabbitMQClient_3_3_0_to_4_0_0_IT.java b/plugins-it/rabbitmq-it/src/test/java/com/navercorp/pinpoint/plugin/rabbitmq/RabbitMQClient_3_3_0_to_4_0_0_IT.java index 9c3b03fa810a..7b88e12edc54 100644 --- a/plugins-it/rabbitmq-it/src/test/java/com/navercorp/pinpoint/plugin/rabbitmq/RabbitMQClient_3_3_0_to_4_0_0_IT.java +++ b/plugins-it/rabbitmq-it/src/test/java/com/navercorp/pinpoint/plugin/rabbitmq/RabbitMQClient_3_3_0_to_4_0_0_IT.java @@ -23,6 +23,7 @@ import com.navercorp.pinpoint.test.plugin.PinpointAgent; import com.navercorp.pinpoint.test.plugin.PinpointConfig; import com.navercorp.pinpoint.test.plugin.PinpointPluginTestSuite; +import com.navercorp.pinpoint.test.plugin.shared.SharedTestLifeCycleClass; import com.rabbitmq.client.ConnectionFactory; import org.junit.Test; import org.junit.runner.RunWith; @@ -37,6 +38,7 @@ @ImportPlugin({"com.navercorp.pinpoint:pinpoint-rabbitmq-plugin", "com.navercorp.pinpoint:pinpoint-jetty-plugin", "com.navercorp.pinpoint:pinpoint-user-plugin"}) @Dependency({"com.rabbitmq:amqp-client:[3.3.0,4.0.0)", "org.apache.qpid:qpid-broker:6.1.1"}) @JvmArgument("-DtestLoggerEnable=false") +@SharedTestLifeCycleClass(TestBrokerServer.class) public class RabbitMQClient_3_3_0_to_4_0_0_IT extends RabbitMQClientITBase { @Test diff --git a/plugins-it/rabbitmq-it/src/test/java/com/navercorp/pinpoint/plugin/rabbitmq/RabbitMQClient_4_x_IT.java b/plugins-it/rabbitmq-it/src/test/java/com/navercorp/pinpoint/plugin/rabbitmq/RabbitMQClient_4_x_IT.java index b25a0d88d398..6b9348368186 100644 --- a/plugins-it/rabbitmq-it/src/test/java/com/navercorp/pinpoint/plugin/rabbitmq/RabbitMQClient_4_x_IT.java +++ b/plugins-it/rabbitmq-it/src/test/java/com/navercorp/pinpoint/plugin/rabbitmq/RabbitMQClient_4_x_IT.java @@ -23,6 +23,7 @@ import com.navercorp.pinpoint.test.plugin.PinpointAgent; import com.navercorp.pinpoint.test.plugin.PinpointConfig; import com.navercorp.pinpoint.test.plugin.PinpointPluginTestSuite; +import com.navercorp.pinpoint.test.plugin.shared.SharedTestLifeCycleClass; import com.rabbitmq.client.ConnectionFactory; import org.junit.Test; import org.junit.runner.RunWith; @@ -37,6 +38,7 @@ @ImportPlugin({"com.navercorp.pinpoint:pinpoint-rabbitmq-plugin", "com.navercorp.pinpoint:pinpoint-jetty-plugin", "com.navercorp.pinpoint:pinpoint-user-plugin"}) @Dependency({"com.rabbitmq:amqp-client:[4.0.0,4.max)", "org.apache.qpid:qpid-broker:6.1.1"}) @JvmArgument("-DtestLoggerEnable=false") +@SharedTestLifeCycleClass(TestBrokerServer.class) public class RabbitMQClient_4_x_IT extends RabbitMQClientITBase { @Test diff --git a/plugins-it/rabbitmq-it/src/test/java/com/navercorp/pinpoint/plugin/rabbitmq/RabbitMQClient_5_x_IT.java b/plugins-it/rabbitmq-it/src/test/java/com/navercorp/pinpoint/plugin/rabbitmq/RabbitMQClient_5_x_IT.java index f07a597f473d..60556f2bef1a 100644 --- a/plugins-it/rabbitmq-it/src/test/java/com/navercorp/pinpoint/plugin/rabbitmq/RabbitMQClient_5_x_IT.java +++ b/plugins-it/rabbitmq-it/src/test/java/com/navercorp/pinpoint/plugin/rabbitmq/RabbitMQClient_5_x_IT.java @@ -24,6 +24,7 @@ import com.navercorp.pinpoint.test.plugin.PinpointAgent; import com.navercorp.pinpoint.test.plugin.PinpointConfig; import com.navercorp.pinpoint.test.plugin.PinpointPluginTestSuite; +import com.navercorp.pinpoint.test.plugin.shared.SharedTestLifeCycleClass; import com.rabbitmq.client.ConnectionFactory; import org.junit.Test; import org.junit.runner.RunWith; @@ -39,6 +40,7 @@ @Dependency({"com.rabbitmq:amqp-client:[5.0.0,)", "org.apache.qpid:qpid-broker:6.1.1"}) @JvmVersion(8) @JvmArgument("-DtestLoggerEnable=false") +@SharedTestLifeCycleClass(TestBrokerServer.class) public class RabbitMQClient_5_x_IT extends RabbitMQClientITBase { @Test diff --git a/plugins-it/rabbitmq-it/src/test/java/com/navercorp/pinpoint/plugin/rabbitmq/TestBrokerServer.java b/plugins-it/rabbitmq-it/src/test/java/com/navercorp/pinpoint/plugin/rabbitmq/TestBrokerServer.java new file mode 100644 index 000000000000..eeb0f99bb997 --- /dev/null +++ b/plugins-it/rabbitmq-it/src/test/java/com/navercorp/pinpoint/plugin/rabbitmq/TestBrokerServer.java @@ -0,0 +1,27 @@ +package com.navercorp.pinpoint.plugin.rabbitmq; + +import com.navercorp.pinpoint.plugin.rabbitmq.util.TestBroker; +import com.navercorp.pinpoint.test.plugin.shared.SharedTestLifeCycle; + +import java.util.Properties; + +public class TestBrokerServer implements SharedTestLifeCycle { + private TestBroker broker = new TestBroker(); + @Override + public Properties beforeAll() { + this.broker = new TestBroker(); + try { + broker.start(); + } catch (Exception e) { + throw new RuntimeException("broker start error", e); + } + return new Properties(); + } + + @Override + public void afterAll() { + if (broker != null) { + broker.shutdown(); + } + } +} diff --git a/plugins-it/rabbitmq-it/src/test/java/com/navercorp/pinpoint/plugin/rabbitmq/spring/SpringAmqpRabbitITBase.java b/plugins-it/rabbitmq-it/src/test/java/com/navercorp/pinpoint/plugin/rabbitmq/spring/SpringAmqpRabbitITBase.java index 51455410986b..548cc4592266 100644 --- a/plugins-it/rabbitmq-it/src/test/java/com/navercorp/pinpoint/plugin/rabbitmq/spring/SpringAmqpRabbitITBase.java +++ b/plugins-it/rabbitmq-it/src/test/java/com/navercorp/pinpoint/plugin/rabbitmq/spring/SpringAmqpRabbitITBase.java @@ -1,24 +1,17 @@ package com.navercorp.pinpoint.plugin.rabbitmq.spring; -import com.navercorp.pinpoint.plugin.rabbitmq.util.TestBroker; -import com.navercorp.pinpoint.test.plugin.shared.AfterSharedClass; -import com.navercorp.pinpoint.test.plugin.shared.BeforeSharedClass; +import com.navercorp.pinpoint.test.plugin.shared.SharedTestBeforeAllResult; + +import java.util.Properties; /** * @author kootaejin */ public class SpringAmqpRabbitITBase { - private static final TestBroker BROKER = new TestBroker(); - - @BeforeSharedClass - public static void sharedSetUp() throws Exception { - BROKER.start(); - } - - @AfterSharedClass - public static void sharedTearDown() { - BROKER.shutdown(); + @SharedTestBeforeAllResult + public static void setBeforeAllResult(Properties beforeAllResult) { + // empty } } diff --git a/plugins-it/rabbitmq-it/src/test/java/com/navercorp/pinpoint/plugin/rabbitmq/spring/SpringAmqpRabbit_1_3_3_to_1_4_2_IT.java b/plugins-it/rabbitmq-it/src/test/java/com/navercorp/pinpoint/plugin/rabbitmq/spring/SpringAmqpRabbit_1_3_3_to_1_4_2_IT.java index 22dcaa76caa0..b912604d7a3e 100644 --- a/plugins-it/rabbitmq-it/src/test/java/com/navercorp/pinpoint/plugin/rabbitmq/spring/SpringAmqpRabbit_1_3_3_to_1_4_2_IT.java +++ b/plugins-it/rabbitmq-it/src/test/java/com/navercorp/pinpoint/plugin/rabbitmq/spring/SpringAmqpRabbit_1_3_3_to_1_4_2_IT.java @@ -20,6 +20,7 @@ import com.navercorp.pinpoint.bootstrap.plugin.test.ExpectedTrace; import com.navercorp.pinpoint.bootstrap.plugin.test.PluginTestVerifier; import com.navercorp.pinpoint.common.trace.ServiceType; +import com.navercorp.pinpoint.plugin.rabbitmq.TestBrokerServer; import com.navercorp.pinpoint.plugin.rabbitmq.util.RabbitMQTestConstants; import com.navercorp.pinpoint.pluginit.utils.AgentPath; import com.navercorp.pinpoint.test.plugin.Dependency; @@ -29,6 +30,7 @@ import com.navercorp.pinpoint.test.plugin.PinpointConfig; import com.navercorp.pinpoint.test.plugin.PinpointPluginTestSuite; +import com.navercorp.pinpoint.test.plugin.shared.SharedTestLifeCycleClass; import com.navercorp.test.pinpoint.plugin.rabbitmq.PropagationMarker; import com.navercorp.test.pinpoint.plugin.rabbitmq.spring.config.CommonConfig; import com.navercorp.test.pinpoint.plugin.rabbitmq.spring.config.MessageListenerConfig_Pre_1_4_0; @@ -56,6 +58,7 @@ @ImportPlugin({"com.navercorp.pinpoint:pinpoint-rabbitmq-plugin", "com.navercorp.pinpoint:pinpoint-jetty-plugin", "com.navercorp.pinpoint:pinpoint-user-plugin"}) @Dependency({"org.springframework.amqp:spring-rabbit:[1.3.5.RELEASE,1.4.2.RELEASE)", "com.fasterxml.jackson.core:jackson-core:2.8.11", "org.apache.qpid:qpid-broker:6.1.1"}) @JvmArgument("-DtestLoggerEnable=false") +@SharedTestLifeCycleClass(TestBrokerServer.class) public class SpringAmqpRabbit_1_3_3_to_1_4_2_IT extends SpringAmqpRabbitITBase { private static final TestApplicationContext CONTEXT = new TestApplicationContext(); diff --git a/plugins-it/rabbitmq-it/src/test/java/com/navercorp/pinpoint/plugin/rabbitmq/spring/SpringAmqpRabbit_1_4_2_to_1_7_0_IT.java b/plugins-it/rabbitmq-it/src/test/java/com/navercorp/pinpoint/plugin/rabbitmq/spring/SpringAmqpRabbit_1_4_2_to_1_7_0_IT.java index 5f5e1aa5da87..fa4a62d89b28 100644 --- a/plugins-it/rabbitmq-it/src/test/java/com/navercorp/pinpoint/plugin/rabbitmq/spring/SpringAmqpRabbit_1_4_2_to_1_7_0_IT.java +++ b/plugins-it/rabbitmq-it/src/test/java/com/navercorp/pinpoint/plugin/rabbitmq/spring/SpringAmqpRabbit_1_4_2_to_1_7_0_IT.java @@ -20,6 +20,7 @@ import com.navercorp.pinpoint.bootstrap.plugin.test.ExpectedTrace; import com.navercorp.pinpoint.bootstrap.plugin.test.PluginTestVerifier; import com.navercorp.pinpoint.common.trace.ServiceType; +import com.navercorp.pinpoint.plugin.rabbitmq.TestBrokerServer; import com.navercorp.pinpoint.plugin.rabbitmq.util.RabbitMQTestConstants; import com.navercorp.pinpoint.pluginit.utils.AgentPath; import com.navercorp.pinpoint.test.plugin.Dependency; @@ -29,6 +30,7 @@ import com.navercorp.pinpoint.test.plugin.PinpointConfig; import com.navercorp.pinpoint.test.plugin.PinpointPluginTestSuite; +import com.navercorp.pinpoint.test.plugin.shared.SharedTestLifeCycleClass; import com.navercorp.test.pinpoint.plugin.rabbitmq.PropagationMarker; import com.navercorp.test.pinpoint.plugin.rabbitmq.spring.config.CommonConfig; import com.navercorp.test.pinpoint.plugin.rabbitmq.spring.config.MessageListenerConfig_Post_1_4_0; @@ -57,6 +59,7 @@ // 1.4.5, 1.4.6, 1.6.4.RELEASE has dependency issues @Dependency({"org.springframework.amqp:spring-rabbit:[1.4.2.RELEASE,1.4.5.RELEASE),[1.5.0.RELEASE,1.6.4.RELEASE),[1.6.5.RELEASE,1.7.0.RELEASE)", "com.fasterxml.jackson.core:jackson-core:2.8.11", "org.apache.qpid:qpid-broker:6.1.1"}) @JvmArgument("-DtestLoggerEnable=false") +@SharedTestLifeCycleClass(TestBrokerServer.class) public class SpringAmqpRabbit_1_4_2_to_1_7_0_IT extends SpringAmqpRabbitITBase { private static final TestApplicationContext CONTEXT = new TestApplicationContext(); diff --git a/plugins-it/rabbitmq-it/src/test/java/com/navercorp/pinpoint/plugin/rabbitmq/spring/SpringAmqpRabbit_1_7_0_to_1_7_7_IT.java b/plugins-it/rabbitmq-it/src/test/java/com/navercorp/pinpoint/plugin/rabbitmq/spring/SpringAmqpRabbit_1_7_0_to_1_7_7_IT.java index 73a365b47be3..2e7b348d97c9 100644 --- a/plugins-it/rabbitmq-it/src/test/java/com/navercorp/pinpoint/plugin/rabbitmq/spring/SpringAmqpRabbit_1_7_0_to_1_7_7_IT.java +++ b/plugins-it/rabbitmq-it/src/test/java/com/navercorp/pinpoint/plugin/rabbitmq/spring/SpringAmqpRabbit_1_7_0_to_1_7_7_IT.java @@ -20,6 +20,7 @@ import com.navercorp.pinpoint.bootstrap.plugin.test.ExpectedTrace; import com.navercorp.pinpoint.bootstrap.plugin.test.PluginTestVerifier; import com.navercorp.pinpoint.common.trace.ServiceType; +import com.navercorp.pinpoint.plugin.rabbitmq.TestBrokerServer; import com.navercorp.pinpoint.plugin.rabbitmq.util.RabbitMQTestConstants; import com.navercorp.pinpoint.pluginit.utils.AgentPath; import com.navercorp.pinpoint.test.plugin.Dependency; @@ -29,6 +30,7 @@ import com.navercorp.pinpoint.test.plugin.PinpointConfig; import com.navercorp.pinpoint.test.plugin.PinpointPluginTestSuite; +import com.navercorp.pinpoint.test.plugin.shared.SharedTestLifeCycleClass; import com.navercorp.test.pinpoint.plugin.rabbitmq.PropagationMarker; import com.navercorp.test.pinpoint.plugin.rabbitmq.spring.config.CommonConfig; import com.navercorp.test.pinpoint.plugin.rabbitmq.spring.config.MessageListenerConfig_Post_1_4_0; @@ -56,6 +58,7 @@ @ImportPlugin({"com.navercorp.pinpoint:pinpoint-rabbitmq-plugin", "com.navercorp.pinpoint:pinpoint-jetty-plugin", "com.navercorp.pinpoint:pinpoint-user-plugin"}) @Dependency({"org.springframework.amqp:spring-rabbit:[1.7.0.RELEASE,1.7.7.RELEASE)", "com.fasterxml.jackson.core:jackson-core:2.8.11", "org.apache.qpid:qpid-broker:6.1.1"}) @JvmArgument("-DtestLoggerEnable=false") +@SharedTestLifeCycleClass(TestBrokerServer.class) public class SpringAmqpRabbit_1_7_0_to_1_7_7_IT extends SpringAmqpRabbitITBase { private static final TestApplicationContext CONTEXT = new TestApplicationContext(); diff --git a/plugins-it/rabbitmq-it/src/test/java/com/navercorp/pinpoint/plugin/rabbitmq/spring/SpringAmqpRabbit_1_7_7_to_2_0_0_IT.java b/plugins-it/rabbitmq-it/src/test/java/com/navercorp/pinpoint/plugin/rabbitmq/spring/SpringAmqpRabbit_1_7_7_to_2_0_0_IT.java index 6a46bb7e6b8d..944f7e9fa14a 100644 --- a/plugins-it/rabbitmq-it/src/test/java/com/navercorp/pinpoint/plugin/rabbitmq/spring/SpringAmqpRabbit_1_7_7_to_2_0_0_IT.java +++ b/plugins-it/rabbitmq-it/src/test/java/com/navercorp/pinpoint/plugin/rabbitmq/spring/SpringAmqpRabbit_1_7_7_to_2_0_0_IT.java @@ -20,6 +20,7 @@ import com.navercorp.pinpoint.bootstrap.plugin.test.ExpectedTrace; import com.navercorp.pinpoint.bootstrap.plugin.test.PluginTestVerifier; import com.navercorp.pinpoint.common.trace.ServiceType; +import com.navercorp.pinpoint.plugin.rabbitmq.TestBrokerServer; import com.navercorp.pinpoint.plugin.rabbitmq.util.RabbitMQTestConstants; import com.navercorp.pinpoint.pluginit.utils.AgentPath; import com.navercorp.pinpoint.test.plugin.Dependency; @@ -29,6 +30,7 @@ import com.navercorp.pinpoint.test.plugin.PinpointConfig; import com.navercorp.pinpoint.test.plugin.PinpointPluginTestSuite; +import com.navercorp.pinpoint.test.plugin.shared.SharedTestLifeCycleClass; import com.navercorp.test.pinpoint.plugin.rabbitmq.PropagationMarker; import com.navercorp.test.pinpoint.plugin.rabbitmq.spring.config.CommonConfig; import com.navercorp.test.pinpoint.plugin.rabbitmq.spring.config.MessageListenerConfig_Post_1_4_0; @@ -59,6 +61,7 @@ @ImportPlugin({"com.navercorp.pinpoint:pinpoint-rabbitmq-plugin", "com.navercorp.pinpoint:pinpoint-jetty-plugin", "com.navercorp.pinpoint:pinpoint-user-plugin"}) @Dependency({"org.springframework.amqp:spring-rabbit:[1.7.7.RELEASE,2.0.0.RELEASE)", "com.fasterxml.jackson.core:jackson-core:2.8.11", "org.apache.qpid:qpid-broker:6.1.1"}) @JvmArgument("-DtestLoggerEnable=false") +@SharedTestLifeCycleClass(TestBrokerServer.class) public class SpringAmqpRabbit_1_7_7_to_2_0_0_IT extends SpringAmqpRabbitITBase { private static final TestApplicationContext CONTEXT = new TestApplicationContext(); diff --git a/plugins-it/rabbitmq-it/src/test/java/com/navercorp/pinpoint/plugin/rabbitmq/spring/SpringAmqpRabbit_2_0_0_to_2_0_3_IT.java b/plugins-it/rabbitmq-it/src/test/java/com/navercorp/pinpoint/plugin/rabbitmq/spring/SpringAmqpRabbit_2_0_0_to_2_0_3_IT.java index 0f045dd438b2..a4104aa9f05d 100644 --- a/plugins-it/rabbitmq-it/src/test/java/com/navercorp/pinpoint/plugin/rabbitmq/spring/SpringAmqpRabbit_2_0_0_to_2_0_3_IT.java +++ b/plugins-it/rabbitmq-it/src/test/java/com/navercorp/pinpoint/plugin/rabbitmq/spring/SpringAmqpRabbit_2_0_0_to_2_0_3_IT.java @@ -20,6 +20,7 @@ import com.navercorp.pinpoint.bootstrap.plugin.test.ExpectedTrace; import com.navercorp.pinpoint.bootstrap.plugin.test.PluginTestVerifier; import com.navercorp.pinpoint.common.trace.ServiceType; +import com.navercorp.pinpoint.plugin.rabbitmq.TestBrokerServer; import com.navercorp.pinpoint.plugin.rabbitmq.util.RabbitMQTestConstants; import com.navercorp.pinpoint.pluginit.utils.AgentPath; import com.navercorp.pinpoint.test.plugin.Dependency; @@ -30,6 +31,7 @@ import com.navercorp.pinpoint.test.plugin.PinpointConfig; import com.navercorp.pinpoint.test.plugin.PinpointPluginTestSuite; +import com.navercorp.pinpoint.test.plugin.shared.SharedTestLifeCycleClass; import com.navercorp.test.pinpoint.plugin.rabbitmq.PropagationMarker; import com.navercorp.test.pinpoint.plugin.rabbitmq.spring.config.CommonConfig; import com.navercorp.test.pinpoint.plugin.rabbitmq.spring.config.MessageListenerConfig_Post_1_4_0; @@ -66,6 +68,7 @@ @Dependency({"org.springframework.amqp:spring-rabbit:[2.0.0.RELEASE,2.0.3.RELEASE)", "com.fasterxml.jackson.core:jackson-core:2.8.11", "org.apache.qpid:qpid-broker:6.1.1"}) @JvmVersion(8) @JvmArgument("-DtestLoggerEnable=false") +@SharedTestLifeCycleClass(TestBrokerServer.class) public class SpringAmqpRabbit_2_0_0_to_2_0_3_IT extends SpringAmqpRabbitITBase { private static final TestApplicationContext CONTEXT = new TestApplicationContext(); diff --git a/plugins-it/rabbitmq-it/src/test/java/com/navercorp/pinpoint/plugin/rabbitmq/spring/SpringAmqpRabbit_2_0_3_to_2_1_0_IT.java b/plugins-it/rabbitmq-it/src/test/java/com/navercorp/pinpoint/plugin/rabbitmq/spring/SpringAmqpRabbit_2_0_3_to_2_1_0_IT.java index 79df99f7c8b2..6b6c7ea33fee 100644 --- a/plugins-it/rabbitmq-it/src/test/java/com/navercorp/pinpoint/plugin/rabbitmq/spring/SpringAmqpRabbit_2_0_3_to_2_1_0_IT.java +++ b/plugins-it/rabbitmq-it/src/test/java/com/navercorp/pinpoint/plugin/rabbitmq/spring/SpringAmqpRabbit_2_0_3_to_2_1_0_IT.java @@ -20,6 +20,7 @@ import com.navercorp.pinpoint.bootstrap.plugin.test.ExpectedTrace; import com.navercorp.pinpoint.bootstrap.plugin.test.PluginTestVerifier; import com.navercorp.pinpoint.common.trace.ServiceType; +import com.navercorp.pinpoint.plugin.rabbitmq.TestBrokerServer; import com.navercorp.pinpoint.plugin.rabbitmq.util.RabbitMQTestConstants; import com.navercorp.pinpoint.pluginit.utils.AgentPath; import com.navercorp.pinpoint.test.plugin.Dependency; @@ -30,6 +31,7 @@ import com.navercorp.pinpoint.test.plugin.PinpointConfig; import com.navercorp.pinpoint.test.plugin.PinpointPluginTestSuite; +import com.navercorp.pinpoint.test.plugin.shared.SharedTestLifeCycleClass; import com.navercorp.test.pinpoint.plugin.rabbitmq.PropagationMarker; import com.navercorp.test.pinpoint.plugin.rabbitmq.spring.config.CommonConfig; import com.navercorp.test.pinpoint.plugin.rabbitmq.spring.config.MessageListenerConfig_Post_1_4_0; @@ -65,6 +67,7 @@ @Dependency({"org.springframework.amqp:spring-rabbit:[2.0.3.RELEASE,2.1.0.RELEASE)", "com.fasterxml.jackson.core:jackson-core:2.8.11", "org.apache.qpid:qpid-broker:6.1.1"}) @JvmVersion(8) @JvmArgument("-DtestLoggerEnable=false") +@SharedTestLifeCycleClass(TestBrokerServer.class) public class SpringAmqpRabbit_2_0_3_to_2_1_0_IT extends SpringAmqpRabbitITBase { private static final TestApplicationContext CONTEXT = new TestApplicationContext(); diff --git a/plugins-it/rabbitmq-it/src/test/java/com/navercorp/pinpoint/plugin/rabbitmq/spring/SpringAmqpRabbit_2_1_x_to_2_x_IT.java b/plugins-it/rabbitmq-it/src/test/java/com/navercorp/pinpoint/plugin/rabbitmq/spring/SpringAmqpRabbit_2_1_x_to_2_x_IT.java index 508df2f02f00..6b88a82dd287 100644 --- a/plugins-it/rabbitmq-it/src/test/java/com/navercorp/pinpoint/plugin/rabbitmq/spring/SpringAmqpRabbit_2_1_x_to_2_x_IT.java +++ b/plugins-it/rabbitmq-it/src/test/java/com/navercorp/pinpoint/plugin/rabbitmq/spring/SpringAmqpRabbit_2_1_x_to_2_x_IT.java @@ -20,8 +20,8 @@ import com.navercorp.pinpoint.bootstrap.plugin.test.ExpectedTrace; import com.navercorp.pinpoint.bootstrap.plugin.test.PluginTestVerifier; import com.navercorp.pinpoint.common.trace.ServiceType; +import com.navercorp.pinpoint.plugin.rabbitmq.TestBrokerServer; import com.navercorp.pinpoint.plugin.rabbitmq.util.RabbitMQTestConstants; -import com.navercorp.pinpoint.plugin.rabbitmq.util.TestBroker; import com.navercorp.pinpoint.pluginit.utils.AgentPath; import com.navercorp.pinpoint.test.plugin.Dependency; import com.navercorp.pinpoint.test.plugin.ImportPlugin; @@ -31,6 +31,7 @@ import com.navercorp.pinpoint.test.plugin.PinpointConfig; import com.navercorp.pinpoint.test.plugin.PinpointPluginTestSuite; +import com.navercorp.pinpoint.test.plugin.shared.SharedTestLifeCycleClass; import com.navercorp.test.pinpoint.plugin.rabbitmq.PropagationMarker; import com.navercorp.test.pinpoint.plugin.rabbitmq.spring.config.CommonConfig; import com.navercorp.test.pinpoint.plugin.rabbitmq.spring.config.MessageListenerConfig_Post_1_4_0; @@ -65,6 +66,7 @@ @Dependency({"org.springframework.amqp:spring-rabbit:[2.1.0.RELEASE],(2.1.1.RELEASE,2.1.9.RELEASE),(2.1.9.RELEASE,)", "com.fasterxml.jackson.core:jackson-core:2.8.11", "org.apache.qpid:qpid-broker:6.1.1"}) @JvmVersion(8) @JvmArgument("-DtestLoggerEnable=false") +@SharedTestLifeCycleClass(TestBrokerServer.class) public class SpringAmqpRabbit_2_1_x_to_2_x_IT extends SpringAmqpRabbitITBase { private static final TestApplicationContext CONTEXT = new TestApplicationContext();