diff --git a/plugins-it/cxf-it/src/test/java/com/navercorp/pinpoint/plugin/cxf/CxfClientIT.java b/plugins-it/cxf-it/src/test/java/com/navercorp/pinpoint/plugin/cxf/CxfClientIT.java index bb4879113ad7..6020db0a4a67 100644 --- a/plugins-it/cxf-it/src/test/java/com/navercorp/pinpoint/plugin/cxf/CxfClientIT.java +++ b/plugins-it/cxf-it/src/test/java/com/navercorp/pinpoint/plugin/cxf/CxfClientIT.java @@ -27,8 +27,6 @@ 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.SharedTestBeforeAllResult; -import com.navercorp.pinpoint.test.plugin.shared.SharedTestLifeCycleClass; import org.apache.cxf.interceptor.LoggingInInterceptor; import org.apache.cxf.interceptor.LoggingMessage; import org.apache.cxf.interceptor.LoggingOutInterceptor; @@ -36,11 +34,11 @@ import org.apache.cxf.jaxrs.client.ClientConfiguration; import org.apache.cxf.jaxrs.client.WebClient; import org.apache.cxf.message.Message; +import org.junit.AfterClass; +import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; -import java.util.Properties; - import static com.navercorp.pinpoint.bootstrap.plugin.test.Expectations.annotation; import static com.navercorp.pinpoint.bootstrap.plugin.test.Expectations.event; @@ -51,18 +49,22 @@ @Dependency({"org.apache.cxf:cxf-rt-rs-client:[3.0.0][3.0.16][3.1.0][3.1.16],[3.2.1,)", WebServer.VERSION, PluginITConstants.VERSION}) @ImportPlugin({"com.navercorp.pinpoint:pinpoint-cxf-plugin", "com.navercorp.pinpoint:pinpoint-jdk-http-plugin"}) @PinpointConfig("cxf/pinpoint-cxf-test.config") -@SharedTestLifeCycleClass(HttpWebServer.class) public class CxfClientIT { - private static String HOST_PORT; + public static WebServer webServer; + + @BeforeClass + public static void beforeClass() throws Exception { + webServer = WebServer.newTestWebServer(); + } - @SharedTestBeforeAllResult - public static void setBeforeAllResult(Properties beforeAllResult) { - HOST_PORT = beforeAllResult.getProperty("HOST_PORT"); + @AfterClass + public static void afterClass() throws Exception { + webServer = WebServer.cleanup(webServer); } public String getAddress() { - return "http://" + HOST_PORT; + return webServer.getCallHttpUrl(); } @Test diff --git a/plugins-it/cxf-it/src/test/java/com/navercorp/pinpoint/plugin/cxf/HttpWebServer.java b/plugins-it/cxf-it/src/test/java/com/navercorp/pinpoint/plugin/cxf/HttpWebServer.java deleted file mode 100644 index a04b7a1351b7..000000000000 --- a/plugins-it/cxf-it/src/test/java/com/navercorp/pinpoint/plugin/cxf/HttpWebServer.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.navercorp.pinpoint.plugin.cxf; - -import com.navercorp.pinpoint.pluginit.utils.WebServer; -import com.navercorp.pinpoint.test.plugin.shared.SharedTestLifeCycle; - -import java.util.Properties; - -public class HttpWebServer implements SharedTestLifeCycle { - private WebServer webServer; - - @Override - public Properties beforeAll() { - try { - webServer = WebServer.newTestWebServer(); - - Properties properties = new Properties(); - properties.setProperty("HOST_PORT", webServer.getHostAndPort()); - return properties; - } catch (Exception e) { - throw new RuntimeException("webserver start error", e); - } - } - - @Override - public void afterAll() { - webServer = WebServer.cleanup(webServer); - } -} diff --git a/plugins-it/httpclient3-it/src/test/java/com/navercorp/pinpoint/plugin/httpclient3/HttpClientIT.java b/plugins-it/httpclient3-it/src/test/java/com/navercorp/pinpoint/plugin/httpclient3/HttpClientIT.java index 28191c18e442..ebfa35e72abd 100644 --- a/plugins-it/httpclient3-it/src/test/java/com/navercorp/pinpoint/plugin/httpclient3/HttpClientIT.java +++ b/plugins-it/httpclient3-it/src/test/java/com/navercorp/pinpoint/plugin/httpclient3/HttpClientIT.java @@ -24,19 +24,17 @@ import com.navercorp.pinpoint.test.plugin.ImportPlugin; import com.navercorp.pinpoint.test.plugin.PinpointAgent; import com.navercorp.pinpoint.test.plugin.PinpointPluginTestSuite; -import com.navercorp.pinpoint.test.plugin.shared.SharedTestBeforeAllResult; -import com.navercorp.pinpoint.test.plugin.shared.SharedTestLifeCycleClass; import org.apache.commons.httpclient.DefaultHttpMethodRetryHandler; import org.apache.commons.httpclient.HostConfiguration; import org.apache.commons.httpclient.HttpClient; import org.apache.commons.httpclient.NameValuePair; import org.apache.commons.httpclient.methods.GetMethod; import org.apache.commons.httpclient.params.HttpMethodParams; +import org.junit.AfterClass; +import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; -import java.util.Properties; - /** * @author jaehong.kim */ @@ -44,18 +42,27 @@ @PinpointAgent(AgentPath.PATH) @ImportPlugin("com.navercorp.pinpoint:pinpoint-httpclient3-plugin") @Dependency({ "commons-httpclient:commons-httpclient:[3.0],[3.0.1],[3.1]", WebServer.VERSION, PluginITConstants.VERSION}) -@SharedTestLifeCycleClass(HttpWebServer.class) public class HttpClientIT { - private static String HOST_PORT; + public static WebServer webServer; + + @BeforeClass + public static void beforeClass() throws Exception { + webServer = WebServer.newTestWebServer(); + + } - @SharedTestBeforeAllResult - public static void setBeforeAllResult(Properties beforeAllResult) { - HOST_PORT = beforeAllResult.getProperty("HOST_PORT"); + @AfterClass + public static void afterClass() throws Exception { + webServer = WebServer.cleanup(webServer); } public String getAddress() { - return "http://" + HOST_PORT; + return webServer.getCallHttpUrl(); + } + + public static String getHostPort() { + return webServer.getHostAndPort(); } diff --git a/plugins-it/httpclient3-it/src/test/java/com/navercorp/pinpoint/plugin/httpclient3/HttpWebServer.java b/plugins-it/httpclient3-it/src/test/java/com/navercorp/pinpoint/plugin/httpclient3/HttpWebServer.java deleted file mode 100644 index 9fe7bf19b1fd..000000000000 --- a/plugins-it/httpclient3-it/src/test/java/com/navercorp/pinpoint/plugin/httpclient3/HttpWebServer.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.navercorp.pinpoint.plugin.httpclient3; - -import com.navercorp.pinpoint.pluginit.utils.WebServer; -import com.navercorp.pinpoint.test.plugin.shared.SharedTestLifeCycle; - -import java.util.Properties; - -public class HttpWebServer implements SharedTestLifeCycle { - private WebServer webServer; - - @Override - public Properties beforeAll() { - try { - webServer = WebServer.newTestWebServer(); - - Properties properties = new Properties(); - properties.setProperty("HOST_PORT", webServer.getHostAndPort()); - return properties; - } catch (Exception e) { - throw new RuntimeException("webserver start error", e); - } - } - - @Override - public void afterAll() { - webServer = WebServer.cleanup(webServer); - } -} diff --git a/plugins-it/httpclient4-it/src/test/java/com/navercorp/pinpoint/plugin/httpclient4/CloaeableHttpClientIT.java b/plugins-it/httpclient4-it/src/test/java/com/navercorp/pinpoint/plugin/httpclient4/CloaeableHttpClientIT.java index 8829b4893c79..0ce639548c25 100644 --- a/plugins-it/httpclient4-it/src/test/java/com/navercorp/pinpoint/plugin/httpclient4/CloaeableHttpClientIT.java +++ b/plugins-it/httpclient4-it/src/test/java/com/navercorp/pinpoint/plugin/httpclient4/CloaeableHttpClientIT.java @@ -25,7 +25,6 @@ import com.navercorp.pinpoint.test.plugin.PinpointAgent; import com.navercorp.pinpoint.test.plugin.PinpointPluginTestSuite; -import com.navercorp.pinpoint.test.plugin.shared.SharedTestLifeCycleClass; import org.apache.http.HttpClientConnection; import org.apache.http.HttpEntity; import org.apache.http.HttpRequest; @@ -56,7 +55,6 @@ @ImportPlugin("com.navercorp.pinpoint:pinpoint-httpclient4-plugin") @Dependency({"org.apache.httpcomponents:httpclient:[4.3],[4.3.1],[4.3.2],[4.3.3],[4.3.4],[4.3.6],[4.4],[4.4.1],[4.5],[4.5.1],[4.5.2],[4.5.3],[4.5.4],[4.3.5]", WebServer.VERSION, PluginITConstants.VERSION}) -@SharedTestLifeCycleClass(HttpWebServer.class) public class CloaeableHttpClientIT extends HttpClientITBase { @Test diff --git a/plugins-it/httpclient4-it/src/test/java/com/navercorp/pinpoint/plugin/httpclient4/ClosableAsyncHttpClientIT.java b/plugins-it/httpclient4-it/src/test/java/com/navercorp/pinpoint/plugin/httpclient4/ClosableAsyncHttpClientIT.java index ee08a653afe1..43b6545617af 100644 --- a/plugins-it/httpclient4-it/src/test/java/com/navercorp/pinpoint/plugin/httpclient4/ClosableAsyncHttpClientIT.java +++ b/plugins-it/httpclient4-it/src/test/java/com/navercorp/pinpoint/plugin/httpclient4/ClosableAsyncHttpClientIT.java @@ -26,7 +26,6 @@ import com.navercorp.pinpoint.test.plugin.PinpointAgent; import com.navercorp.pinpoint.test.plugin.PinpointPluginTestSuite; -import com.navercorp.pinpoint.test.plugin.shared.SharedTestLifeCycleClass; import org.apache.http.Consts; import org.apache.http.HttpResponse; import org.apache.http.NameValuePair; @@ -58,7 +57,6 @@ @ImportPlugin("com.navercorp.pinpoint:pinpoint-httpclient4-plugin") @Dependency({"org.apache.httpcomponents:httpasyncclient:[4.0],[4.0.1],[4.0.2],[4.1],[4.1.1],[4.1.2],[4.1.3]", WebServer.VERSION, PluginITConstants.VERSION}) -@SharedTestLifeCycleClass(HttpWebServer.class) public class ClosableAsyncHttpClientIT extends HttpClientITBase { @Test diff --git a/plugins-it/httpclient4-it/src/test/java/com/navercorp/pinpoint/plugin/httpclient4/HttpClientIT.java b/plugins-it/httpclient4-it/src/test/java/com/navercorp/pinpoint/plugin/httpclient4/HttpClientIT.java index 1176ae4c67ad..5c164a919df5 100644 --- a/plugins-it/httpclient4-it/src/test/java/com/navercorp/pinpoint/plugin/httpclient4/HttpClientIT.java +++ b/plugins-it/httpclient4-it/src/test/java/com/navercorp/pinpoint/plugin/httpclient4/HttpClientIT.java @@ -56,7 +56,6 @@ @ImportPlugin("com.navercorp.pinpoint:pinpoint-httpclient4-plugin") @Dependency({"org.apache.httpcomponents:httpclient:[4.0],[4.0.1],[4.0.2],[4.0.3],[4.1],[4.1.1],[4.1.2],[4.1.3],[4.2],[4.2.1],[4.2.2],[4.2.3],[4.2.4],[4.2.4],[4.2.6],[4.3.3]", WebServer.VERSION, PluginITConstants.VERSION}) -@SharedTestLifeCycleClass(HttpWebServer.class) public class HttpClientIT extends HttpClientITBase { @Test diff --git a/plugins-it/httpclient4-it/src/test/java/com/navercorp/pinpoint/plugin/httpclient4/HttpClientITBase.java b/plugins-it/httpclient4-it/src/test/java/com/navercorp/pinpoint/plugin/httpclient4/HttpClientITBase.java index 84c175ceaff9..68dba168023d 100644 --- a/plugins-it/httpclient4-it/src/test/java/com/navercorp/pinpoint/plugin/httpclient4/HttpClientITBase.java +++ b/plugins-it/httpclient4-it/src/test/java/com/navercorp/pinpoint/plugin/httpclient4/HttpClientITBase.java @@ -16,26 +16,31 @@ package com.navercorp.pinpoint.plugin.httpclient4; -import com.navercorp.pinpoint.test.plugin.shared.SharedTestBeforeAllResult; +import com.navercorp.pinpoint.pluginit.utils.WebServer; +import org.junit.AfterClass; +import org.junit.BeforeClass; import java.util.Properties; public abstract class HttpClientITBase { + public static WebServer webServer; - private static String ADDRESS; - private static String HOST_PORT; + @BeforeClass + public static void beforeClass() throws Exception { + webServer = WebServer.newTestWebServer(); - @SharedTestBeforeAllResult - public static void setBeforeAllResult(Properties beforeAllResult) { - HOST_PORT = beforeAllResult.getProperty("HOST_PORT"); + } + @AfterClass + public static void afterClass() throws Exception { + webServer = WebServer.cleanup(webServer); } public String getAddress() { - return "http://" + HOST_PORT; + return webServer.getCallHttpUrl(); } public static String getHostPort() { - return HOST_PORT; + return webServer.getHostAndPort(); } } diff --git a/plugins-it/httpclient4-it/src/test/java/com/navercorp/pinpoint/plugin/httpclient4/HttpWebServer.java b/plugins-it/httpclient4-it/src/test/java/com/navercorp/pinpoint/plugin/httpclient4/HttpWebServer.java deleted file mode 100644 index 0e9cd58130a3..000000000000 --- a/plugins-it/httpclient4-it/src/test/java/com/navercorp/pinpoint/plugin/httpclient4/HttpWebServer.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.navercorp.pinpoint.plugin.httpclient4; - -import com.navercorp.pinpoint.pluginit.utils.WebServer; -import com.navercorp.pinpoint.test.plugin.shared.SharedTestLifeCycle; - -import java.util.Properties; - -public class HttpWebServer implements SharedTestLifeCycle { - private WebServer webServer; - - @Override - public Properties beforeAll() { - try { - webServer = WebServer.newTestWebServer(); - - Properties properties = new Properties(); - properties.setProperty("HOST_PORT", webServer.getHostAndPort()); - return properties; - } catch (Exception e) { - throw new RuntimeException("webserver start error", e); - } - } - - @Override - public void afterAll() { - webServer = WebServer.cleanup(webServer); - } -} diff --git a/plugins-it/mysql-jdbc-driver-plugin-it/src/test/java/com/navercorp/pinpoint/plugin/jdbc/mysql/MySqlLoadBalance_5_X_IT.java b/plugins-it/mysql-jdbc-driver-plugin-it/src/test/java/com/navercorp/pinpoint/plugin/jdbc/mysql/MySqlLoadBalance_5_X_IT.java index f306a3685880..3c14ed420205 100644 --- a/plugins-it/mysql-jdbc-driver-plugin-it/src/test/java/com/navercorp/pinpoint/plugin/jdbc/mysql/MySqlLoadBalance_5_X_IT.java +++ b/plugins-it/mysql-jdbc-driver-plugin-it/src/test/java/com/navercorp/pinpoint/plugin/jdbc/mysql/MySqlLoadBalance_5_X_IT.java @@ -28,6 +28,7 @@ import com.navercorp.pinpoint.test.plugin.JvmVersion; import com.navercorp.pinpoint.test.plugin.PinpointAgent; import com.navercorp.pinpoint.test.plugin.PinpointPluginTestSuite; +import com.navercorp.pinpoint.test.plugin.shared.SharedTestLifeCycleClass; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; @@ -54,6 +55,7 @@ @Dependency({"mysql:mysql-connector-java:[5.1.6],[5.1.34],[5.1.36,5.max]", "log4j:log4j:1.2.16", "org.slf4j:slf4j-log4j12:1.7.5", JDBCTestConstants.VERSION, TestcontainersOption.MYSQLDB}) +@SharedTestLifeCycleClass(MySqlServer.class) public class MySqlLoadBalance_5_X_IT extends MySql_IT_Base { private final Logger logger = LogManager.getLogger(this.getClass()); diff --git a/plugins-it/spring-it/src/test/java/com/navercorp/pinpoint/plugin/spring/web/HttpWebServer.java b/plugins-it/spring-it/src/test/java/com/navercorp/pinpoint/plugin/spring/web/HttpWebServer.java deleted file mode 100644 index da5db219a948..000000000000 --- a/plugins-it/spring-it/src/test/java/com/navercorp/pinpoint/plugin/spring/web/HttpWebServer.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.navercorp.pinpoint.plugin.spring.web; - -import com.navercorp.pinpoint.pluginit.utils.WebServer; -import com.navercorp.pinpoint.test.plugin.shared.SharedTestLifeCycle; - -import java.util.Properties; - -public class HttpWebServer implements SharedTestLifeCycle { - private WebServer webServer; - - @Override - public Properties beforeAll() { - try { - webServer = WebServer.newTestWebServer(); - - Properties properties = new Properties(); - properties.setProperty("HOST_PORT", webServer.getHostAndPort()); - return properties; - } catch (Exception e) { - throw new RuntimeException("webserver start error", e); - } - } - - @Override - public void afterAll() { - webServer = WebServer.cleanup(webServer); - } -} diff --git a/plugins-it/spring-it/src/test/java/com/navercorp/pinpoint/plugin/spring/web/RestTemplateIT.java b/plugins-it/spring-it/src/test/java/com/navercorp/pinpoint/plugin/spring/web/RestTemplateIT.java index ae3dc2adefd0..a6bc939d54d5 100644 --- a/plugins-it/spring-it/src/test/java/com/navercorp/pinpoint/plugin/spring/web/RestTemplateIT.java +++ b/plugins-it/spring-it/src/test/java/com/navercorp/pinpoint/plugin/spring/web/RestTemplateIT.java @@ -26,8 +26,8 @@ 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.SharedTestBeforeAllResult; -import com.navercorp.pinpoint.test.plugin.shared.SharedTestLifeCycleClass; +import org.junit.AfterClass; +import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.http.client.AbstractClientHttpRequest; @@ -35,8 +35,6 @@ import org.springframework.http.client.Netty4ClientHttpRequestFactory; import org.springframework.web.client.RestTemplate; -import java.util.Properties; - import static com.navercorp.pinpoint.bootstrap.plugin.test.Expectations.annotation; import static com.navercorp.pinpoint.bootstrap.plugin.test.Expectations.event; @@ -50,24 +48,29 @@ WebServer.VERSION, PluginITConstants.VERSION}) @PinpointConfig("pinpoint-disabled-plugin-test.config") @ImportPlugin({"com.navercorp.pinpoint:pinpoint-resttemplate-plugin"}) -@SharedTestLifeCycleClass(HttpWebServer.class) public class RestTemplateIT { - private static String HOST_PORT; - @SharedTestBeforeAllResult - public static void setBeforeAllResult(Properties beforeAllResult) { - HOST_PORT = beforeAllResult.getProperty("HOST_PORT"); + public static WebServer webServer; + + @BeforeClass + public static void beforeClass() throws Exception { + webServer = WebServer.newTestWebServer(); + } + + @AfterClass + public static void afterClass() throws Exception { + webServer = WebServer.cleanup(webServer); } - public static String getCallUrl() { - return "http://" + HOST_PORT; + public String getAddress() { + return webServer.getCallHttpUrl(); } @Test public void test1() throws Exception { RestTemplate restTemplate = new RestTemplate(); - String forObject = restTemplate.getForObject(getCallUrl(), String.class); + String forObject = restTemplate.getForObject(getAddress(), String.class); PluginTestVerifier verifier = PluginTestVerifierHolder.getInstance(); verifier.printCache(); @@ -79,7 +82,7 @@ public void test1() throws Exception { @Test public void test2() throws Exception { RestTemplate restTemplate = new RestTemplate(new HttpComponentsClientHttpRequestFactory()); - String forObject = restTemplate.getForObject(getCallUrl(), String.class); + String forObject = restTemplate.getForObject(getAddress(), String.class); PluginTestVerifier verifier = PluginTestVerifierHolder.getInstance(); verifier.printCache(); @@ -91,7 +94,7 @@ public void test2() throws Exception { @Test public void test3() throws Exception { RestTemplate restTemplate = new RestTemplate(new Netty4ClientHttpRequestFactory()); - String forObject = restTemplate.getForObject(getCallUrl(), String.class); + String forObject = restTemplate.getForObject(getAddress(), String.class); PluginTestVerifier verifier = PluginTestVerifierHolder.getInstance(); verifier.awaitTrace(event("ASYNC", "Asynchronous Invocation"), 20, 3000);