[pinpoint-apm#8965] Apply SharedTestLifeCycle to MSSql

emeroad · Jun 24, 2022 · a4ae732 · a4ae732
1 parent e0ea4e8
commit a4ae732
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 41 deletions.
diff --git a/plugins-it/mssql-jdbc-it/src/test/java/com/navercorp/pinpoint/plugin/jdbc/mssql/MSSqlIT.java b/plugins-it/mssql-jdbc-it/src/test/java/com/navercorp/pinpoint/plugin/jdbc/mssql/MSSqlIT.java
@@ -29,18 +29,14 @@
 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.AfterSharedClass;
-import com.navercorp.pinpoint.test.plugin.shared.BeforeSharedClass;
-
-import org.junit.Assume;
+import com.navercorp.pinpoint.test.plugin.shared.SharedTestBeforeAllResult;
+import com.navercorp.pinpoint.test.plugin.shared.SharedTestLifeCycleClass;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.LogManager;
-import org.testcontainers.DockerClientFactory;
-import org.testcontainers.containers.MSSQLServerContainer;
 
 import java.util.Properties;
 
@@ -56,6 +52,7 @@
         JDBCTestConstants.VERSION, TestcontainersOption.TEST_CONTAINER, TestcontainersOption.MSSQL})
 @JvmVersion(8)
 @PinpointConfig("pinpoint-mssql.config")
+@SharedTestLifeCycleClass(MsSqlServer.class)
 public class MSSqlIT extends DataBaseTestCase {
 
     private static final String MSSQL = "MSSQL_JDBC";
@@ -68,53 +65,29 @@ public class MSSqlIT extends DataBaseTestCase {
     private static JDBCApi jdbcApi;
 
     private static JdbcUrlParserV2 jdbcUrlParser;
-    public static final MSSQLServerContainer mssqlserver = MSSQLServerContainerFactory.newMSSQLServerContainer(logger.getName());
 
-    // ---------- For @BeforeSharedClass, @AfterSharedClass   //
     private static String JDBC_URL;
-    private static String USER_NAME;
-    private static String PASS_WORD;
+    private static String USERNAME;
+    private static String PASSWORD;
 
     public static String getJdbcUrl() {
         return JDBC_URL;
     }
 
-    public static void setJdbcUrl(String jdbcUrl) {
-        JDBC_URL = jdbcUrl;
-    }
-
     public static String getUserName() {
-        return USER_NAME;
-    }
-
-    public static void setUserName(String userName) {
-        USER_NAME = userName;
+        return USERNAME;
     }
 
     public static String getPassWord() {
-        return PASS_WORD;
-    }
-
-    public static void setPassWord(String passWord) {
-        PASS_WORD = passWord;
+        return PASSWORD;
     }
-    // ---------- //
-
-    @BeforeSharedClass
-    public static void sharedSetup() {
-        Assume.assumeTrue("Docker not enabled", DockerClientFactory.instance().isDockerAvailable());
-        mssqlserver.start();
 
-        setJdbcUrl(mssqlserver.getJdbcUrl());
-        setUserName(mssqlserver.getUsername());
-        setPassWord(mssqlserver.getPassword());
-    }
 
-    @AfterSharedClass
-    public static void sharedTearDown() {
-        if (mssqlserver != null) {
-            mssqlserver.stop();
-        }
+    @SharedTestBeforeAllResult
+    public static void setBeforeAllResult(Properties beforeAllResult) {
+        JDBC_URL = beforeAllResult.getProperty("JDBC_URL");
+        USERNAME = beforeAllResult.getProperty("USERNAME");
+        PASSWORD = beforeAllResult.getProperty("PASSWORD");
     }
 
     @BeforeClass

diff --git a/...-it/mssql-jdbc-it/src/test/java/com/navercorp/pinpoint/plugin/jdbc/mssql/MsSqlServer.java b/...-it/mssql-jdbc-it/src/test/java/com/navercorp/pinpoint/plugin/jdbc/mssql/MsSqlServer.java
@@ -0,0 +1,37 @@
+package com.navercorp.pinpoint.plugin.jdbc.mssql;
+
+import com.navercorp.pinpoint.test.plugin.shared.SharedTestLifeCycle;
+import org.junit.Assume;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testcontainers.DockerClientFactory;
+import org.testcontainers.containers.MSSQLServerContainer;
+
+import java.util.Properties;
+
+public class MsSqlServer implements SharedTestLifeCycle {
+    private final Logger logger = LoggerFactory.getLogger(getClass());
+
+    private MSSQLServerContainer mssqlserver;
+
+    @Override
+    public Properties beforeAll() {
+        Assume.assumeTrue("Docker not enabled", DockerClientFactory.instance().isDockerAvailable());
+
+        mssqlserver = MSSQLServerContainerFactory.newMSSQLServerContainer(logger.getName());
+        mssqlserver.start();
+
+        Properties properties = new Properties();
+        properties.setProperty("JDBC_URL", mssqlserver.getJdbcUrl());
+        properties.setProperty("USERNAME", mssqlserver.getUsername());
+        properties.setProperty("PASSWORD", mssqlserver.getPassword());
+        return properties;
+    }
+
+    @Override
+    public void afterAll() {
+        if (mssqlserver != null) {
+            mssqlserver.stop();
+        }
+    }
+}