Skip to content

Commit 18a0517

Browse files
emeroademeroad
committed
[pinpoint-apm#8965] Apply SharedTestLifeCycle to Oracle
1 parent 6c6b594 commit 18a0517

File tree

16 files changed

+253
-154
lines changed

16 files changed

+253
-154
lines changed

‎plugins-it/oracledb-it/src/test/java/com/navercorp/pinpoint/plugin/jdbc/oracle/Oracle11_Ojdbc6_IT.java

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,35 +18,29 @@
1818
import com.navercorp.pinpoint.pluginit.jdbc.DriverProperties;
1919
import com.navercorp.pinpoint.pluginit.jdbc.JDBCTestConstants;
2020
import com.navercorp.pinpoint.pluginit.utils.AgentPath;
21+
import com.navercorp.pinpoint.pluginit.utils.PluginITConstants;
2122
import com.navercorp.pinpoint.test.plugin.Dependency;
2223
import com.navercorp.pinpoint.test.plugin.ImportPlugin;
2324
import com.navercorp.pinpoint.test.plugin.PinpointAgent;
2425
import com.navercorp.pinpoint.test.plugin.PinpointPluginTestSuite;
25-
import com.navercorp.pinpoint.test.plugin.Repository;
26-
import com.navercorp.pinpoint.test.plugin.shared.BeforeSharedClass;
2726

27+
import com.navercorp.pinpoint.test.plugin.shared.SharedTestLifeCycleClass;
2828
import org.junit.BeforeClass;
2929
import org.junit.Test;
3030
import org.junit.runner.RunWith;
3131
import org.apache.logging.log4j.Logger;
3232
import org.apache.logging.log4j.LogManager;
33-
import org.testcontainers.containers.wait.strategy.Wait;
3433

3534
@RunWith(PinpointPluginTestSuite.class)
3635
@PinpointAgent(AgentPath.PATH)
37-
@Dependency({"com.oracle.database.jdbc:ojdbc6:(,)", JDBCTestConstants.VERSION, OracleITConstants.ORACLE_TESTCONTAINER_15_3})
36+
@Dependency({"com.oracle.database.jdbc:ojdbc6:(,)", PluginITConstants.VERSION, JDBCTestConstants.VERSION, OracleITConstants.ORACLE_TESTCONTAINER_15_3})
3837
@ImportPlugin("com.navercorp.pinpoint:pinpoint-oracle-jdbc-driver-plugin")
38+
@SharedTestLifeCycleClass(OracleServer11x.class)
3939
public class Oracle11_Ojdbc6_IT extends Oracle_IT_Base {
40-
private static final Logger logger = LogManager.getLogger(Oracle11_Ojdbc6_IT.class);
41-
42-
@BeforeSharedClass
43-
public static void sharedSetup() throws Exception {
44-
logger.info("Setting up oracle db...");
45-
startOracleDB(OracleITConstants.ORACLE_11_X_IMAGE, Wait.defaultWaitStrategy());
46-
}
40+
private final Logger logger = LogManager.getLogger(Oracle11_Ojdbc6_IT.class);
4741

4842
@BeforeClass
49-
public static void setup() throws Exception {
43+
public static void setup() {
5044
DriverProperties driverProperties = createDriverProperties();
5145
helper = new OracleItHelper(driverProperties);
5246
}

‎plugins-it/oracledb-it/src/test/java/com/navercorp/pinpoint/plugin/jdbc/oracle/Oracle12_18_Ojdbc8_IT.java

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,36 +18,29 @@
1818
import com.navercorp.pinpoint.pluginit.jdbc.DriverProperties;
1919
import com.navercorp.pinpoint.pluginit.jdbc.JDBCTestConstants;
2020
import com.navercorp.pinpoint.pluginit.utils.AgentPath;
21+
import com.navercorp.pinpoint.pluginit.utils.PluginITConstants;
2122
import com.navercorp.pinpoint.test.plugin.Dependency;
2223
import com.navercorp.pinpoint.test.plugin.ImportPlugin;
2324
import com.navercorp.pinpoint.test.plugin.PinpointAgent;
2425
import com.navercorp.pinpoint.test.plugin.PinpointPluginTestSuite;
25-
import com.navercorp.pinpoint.test.plugin.Repository;
26-
import com.navercorp.pinpoint.test.plugin.shared.BeforeSharedClass;
2726

27+
import com.navercorp.pinpoint.test.plugin.shared.SharedTestLifeCycleClass;
2828
import org.junit.BeforeClass;
2929
import org.junit.Test;
3030
import org.junit.runner.RunWith;
3131
import org.apache.logging.log4j.Logger;
3232
import org.apache.logging.log4j.LogManager;
33-
import org.testcontainers.containers.wait.strategy.Wait;
3433

3534
@RunWith(PinpointPluginTestSuite.class)
3635
@PinpointAgent(AgentPath.PATH)
37-
@Dependency({"com.oracle.database.jdbc:ojdbc8:[12,19)", JDBCTestConstants.VERSION, OracleITConstants.ORACLE_TESTCONTAINER_15_3})
36+
@Dependency({"com.oracle.database.jdbc:ojdbc8:[12,19)", PluginITConstants.VERSION, JDBCTestConstants.VERSION, OracleITConstants.ORACLE_TESTCONTAINER_15_3})
3837
@ImportPlugin("com.navercorp.pinpoint:pinpoint-oracle-jdbc-driver-plugin")
38+
@SharedTestLifeCycleClass(OracleServer12x.class)
3939
public class Oracle12_18_Ojdbc8_IT extends Oracle_IT_Base{
40-
private static final Logger logger = LogManager.getLogger(Oracle12_18_Ojdbc8_IT.class);
41-
42-
@BeforeSharedClass
43-
public static void sharedSetup() throws Exception {
44-
logger.info("Setting up oracle db...");
45-
46-
startOracleDB(OracleITConstants.ORACLE_12_X_IMAGE, Wait.forLogMessage(".*Database ready to use.*\\n", 1));
47-
}
40+
private final Logger logger = LogManager.getLogger(Oracle12_18_Ojdbc8_IT.class);
4841

4942
@BeforeClass
50-
public static void setup() throws Exception {
43+
public static void setup() {
5144
DriverProperties driverProperties = createDriverProperties();
5245
helper = new OracleItHelper(driverProperties);
5346
}

‎plugins-it/oracledb-it/src/test/java/com/navercorp/pinpoint/plugin/jdbc/oracle/Oracle19_Ojdbc10_IT.java

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,32 +17,31 @@
1717

1818
import com.navercorp.pinpoint.pluginit.jdbc.*;
1919
import com.navercorp.pinpoint.pluginit.utils.AgentPath;
20-
import com.navercorp.pinpoint.test.plugin.*;
21-
import com.navercorp.pinpoint.test.plugin.shared.BeforeSharedClass;
20+
import com.navercorp.pinpoint.pluginit.utils.PluginITConstants;
2221

22+
import com.navercorp.pinpoint.test.plugin.Dependency;
23+
import com.navercorp.pinpoint.test.plugin.ImportPlugin;
24+
import com.navercorp.pinpoint.test.plugin.JvmVersion;
25+
import com.navercorp.pinpoint.test.plugin.PinpointAgent;
26+
import com.navercorp.pinpoint.test.plugin.PinpointPluginTestSuite;
27+
import com.navercorp.pinpoint.test.plugin.shared.SharedTestLifeCycleClass;
2328
import org.junit.BeforeClass;
2429
import org.junit.Test;
2530
import org.junit.runner.RunWith;
2631
import org.apache.logging.log4j.Logger;
2732
import org.apache.logging.log4j.LogManager;
28-
import org.testcontainers.containers.wait.strategy.Wait;
2933

3034
@RunWith(PinpointPluginTestSuite.class)
3135
@PinpointAgent(AgentPath.PATH)
32-
@Dependency({"com.oracle.database.jdbc:ojdbc10:[19.9,)", JDBCTestConstants.VERSION, OracleITConstants.ORACLE_TESTCONTAINER})
36+
@Dependency({"com.oracle.database.jdbc:ojdbc10:[19.9,)", PluginITConstants.VERSION, JDBCTestConstants.VERSION, OracleITConstants.ORACLE_TESTCONTAINER})
3337
@JvmVersion(11)
3438
@ImportPlugin("com.navercorp.pinpoint:pinpoint-oracle-jdbc-driver-plugin")
39+
@SharedTestLifeCycleClass(OracleServer19x.class)
3540
public class Oracle19_Ojdbc10_IT extends Oracle_IT_Base {
36-
private static final Logger logger = LogManager.getLogger(Oracle19_Ojdbc10_IT.class);
37-
38-
@BeforeSharedClass
39-
public static void sharedSetup() throws Exception {
40-
logger.info("Setting up oracle db...");
41-
startOracleDB(OracleITConstants.ORACLE_18_X_IMAGE, Wait.forLogMessage(".*Completed.*", 1));
42-
}
41+
private final Logger logger = LogManager.getLogger(Oracle19_Ojdbc10_IT.class);
4342

4443
@BeforeClass
45-
public static void setup() throws Exception {
44+
public static void setup() {
4645
DriverProperties driverProperties = createDriverProperties();
4746
helper = new OracleItHelper(driverProperties);
4847
}

‎plugins-it/oracledb-it/src/test/java/com/navercorp/pinpoint/plugin/jdbc/oracle/Oracle19_Ojdbc10_IT_ConnectWithGssCredential_IT.java

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,32 +18,30 @@
1818
import com.navercorp.pinpoint.pluginit.jdbc.DriverProperties;
1919
import com.navercorp.pinpoint.pluginit.jdbc.JDBCTestConstants;
2020
import com.navercorp.pinpoint.pluginit.utils.AgentPath;
21-
import com.navercorp.pinpoint.test.plugin.*;
22-
import com.navercorp.pinpoint.test.plugin.shared.BeforeSharedClass;
23-
21+
import com.navercorp.pinpoint.pluginit.utils.PluginITConstants;
22+
import com.navercorp.pinpoint.test.plugin.Dependency;
23+
import com.navercorp.pinpoint.test.plugin.ImportPlugin;
24+
import com.navercorp.pinpoint.test.plugin.JvmVersion;
25+
import com.navercorp.pinpoint.test.plugin.PinpointAgent;
26+
import com.navercorp.pinpoint.test.plugin.PinpointPluginTestSuite;
27+
import com.navercorp.pinpoint.test.plugin.shared.SharedTestLifeCycleClass;
28+
import org.apache.logging.log4j.LogManager;
29+
import org.apache.logging.log4j.Logger;
2430
import org.junit.BeforeClass;
2531
import org.junit.Test;
2632
import org.junit.runner.RunWith;
27-
import org.apache.logging.log4j.Logger;
28-
import org.apache.logging.log4j.LogManager;
29-
import org.testcontainers.containers.wait.strategy.Wait;
3033

3134
@RunWith(PinpointPluginTestSuite.class)
3235
@PinpointAgent(AgentPath.PATH)
33-
@Dependency({"com.oracle.database.jdbc:ojdbc10:[19,19.9)", JDBCTestConstants.VERSION, OracleITConstants.ORACLE_TESTCONTAINER})
36+
@Dependency({"com.oracle.database.jdbc:ojdbc10:[19,19.9)", PluginITConstants.VERSION, JDBCTestConstants.VERSION, OracleITConstants.ORACLE_TESTCONTAINER})
3437
@JvmVersion(11)
3538
@ImportPlugin("com.navercorp.pinpoint:pinpoint-oracle-jdbc-driver-plugin")
39+
@SharedTestLifeCycleClass(OracleServer19x.class)
3640
public class Oracle19_Ojdbc10_IT_ConnectWithGssCredential_IT extends Oracle_IT_Base {
37-
private static final Logger logger = LogManager.getLogger(Oracle19_Ojdbc10_IT_ConnectWithGssCredential_IT.class);
38-
39-
@BeforeSharedClass
40-
public static void sharedSetup() throws Exception {
41-
logger.info("Setting up oracle db...");
42-
startOracleDB(OracleITConstants.ORACLE_18_X_IMAGE, Wait.forLogMessage(".*Completed.*", 1));
43-
}
41+
private final Logger logger = LogManager.getLogger(Oracle19_Ojdbc10_IT_ConnectWithGssCredential_IT.class);
4442

4543
@BeforeClass
46-
public static void setup() throws Exception {
44+
public static void setup() {
4745
DriverProperties driverProperties = createDriverProperties();
4846
helper = new OracleItHelper(driverProperties);
4947
}

‎plugins-it/oracledb-it/src/test/java/com/navercorp/pinpoint/plugin/jdbc/oracle/Oracle19_Ojdbc8_ConnectWithGssCredential_IT.java

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,33 +15,31 @@
1515
*/
1616
package com.navercorp.pinpoint.plugin.jdbc.oracle;
1717

18-
import com.navercorp.pinpoint.pluginit.jdbc.*;
18+
import com.navercorp.pinpoint.pluginit.jdbc.DriverProperties;
19+
import com.navercorp.pinpoint.pluginit.jdbc.JDBCTestConstants;
1920
import com.navercorp.pinpoint.pluginit.utils.AgentPath;
20-
import com.navercorp.pinpoint.test.plugin.*;
21-
import com.navercorp.pinpoint.test.plugin.shared.BeforeSharedClass;
22-
21+
import com.navercorp.pinpoint.pluginit.utils.PluginITConstants;
22+
import com.navercorp.pinpoint.test.plugin.Dependency;
23+
import com.navercorp.pinpoint.test.plugin.ImportPlugin;
24+
import com.navercorp.pinpoint.test.plugin.PinpointAgent;
25+
import com.navercorp.pinpoint.test.plugin.PinpointPluginTestSuite;
26+
import com.navercorp.pinpoint.test.plugin.shared.SharedTestLifeCycleClass;
27+
import org.apache.logging.log4j.LogManager;
28+
import org.apache.logging.log4j.Logger;
2329
import org.junit.BeforeClass;
2430
import org.junit.Test;
2531
import org.junit.runner.RunWith;
26-
import org.apache.logging.log4j.Logger;
27-
import org.apache.logging.log4j.LogManager;
28-
import org.testcontainers.containers.wait.strategy.Wait;
2932

3033
@RunWith(PinpointPluginTestSuite.class)
3134
@PinpointAgent(AgentPath.PATH)
32-
@Dependency({"com.oracle.database.jdbc:ojdbc8:[19,19.9)", JDBCTestConstants.VERSION, OracleITConstants.ORACLE_TESTCONTAINER})
35+
@Dependency({"com.oracle.database.jdbc:ojdbc8:[19,19.9)", PluginITConstants.VERSION, JDBCTestConstants.VERSION, OracleITConstants.ORACLE_TESTCONTAINER})
3336
@ImportPlugin("com.navercorp.pinpoint:pinpoint-oracle-jdbc-driver-plugin")
37+
@SharedTestLifeCycleClass(OracleServer19x.class)
3438
public class Oracle19_Ojdbc8_ConnectWithGssCredential_IT extends Oracle_IT_Base {
35-
private static final Logger logger = LogManager.getLogger(Oracle19_Ojdbc8_ConnectWithGssCredential_IT.class);
36-
37-
@BeforeSharedClass
38-
public static void sharedSetup() throws Exception {
39-
logger.info("Setting up oracle db...");
40-
startOracleDB(OracleITConstants.ORACLE_18_X_IMAGE, Wait.forLogMessage(".*Completed.*", 1));
41-
}
39+
private final Logger logger = LogManager.getLogger(Oracle19_Ojdbc8_ConnectWithGssCredential_IT.class);
4240

4341
@BeforeClass
44-
public static void setup() throws Exception {
42+
public static void setup() {
4543
DriverProperties driverProperties = createDriverProperties();
4644
helper = new OracleItHelper(driverProperties);
4745
}

‎plugins-it/oracledb-it/src/test/java/com/navercorp/pinpoint/plugin/jdbc/oracle/Oracle19_Ojdbc8_IT.java

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,33 +15,31 @@
1515
*/
1616
package com.navercorp.pinpoint.plugin.jdbc.oracle;
1717

18-
import com.navercorp.pinpoint.pluginit.jdbc.*;
18+
import com.navercorp.pinpoint.pluginit.jdbc.DriverProperties;
19+
import com.navercorp.pinpoint.pluginit.jdbc.JDBCTestConstants;
1920
import com.navercorp.pinpoint.pluginit.utils.AgentPath;
20-
import com.navercorp.pinpoint.test.plugin.*;
21-
import com.navercorp.pinpoint.test.plugin.shared.BeforeSharedClass;
22-
21+
import com.navercorp.pinpoint.pluginit.utils.PluginITConstants;
22+
import com.navercorp.pinpoint.test.plugin.Dependency;
23+
import com.navercorp.pinpoint.test.plugin.ImportPlugin;
24+
import com.navercorp.pinpoint.test.plugin.PinpointAgent;
25+
import com.navercorp.pinpoint.test.plugin.PinpointPluginTestSuite;
26+
import com.navercorp.pinpoint.test.plugin.shared.SharedTestLifeCycleClass;
27+
import org.apache.logging.log4j.LogManager;
28+
import org.apache.logging.log4j.Logger;
2329
import org.junit.BeforeClass;
2430
import org.junit.Test;
2531
import org.junit.runner.RunWith;
26-
import org.apache.logging.log4j.Logger;
27-
import org.apache.logging.log4j.LogManager;
28-
import org.testcontainers.containers.wait.strategy.Wait;
2932

3033
@RunWith(PinpointPluginTestSuite.class)
3134
@PinpointAgent(AgentPath.PATH)
32-
@Dependency({"com.oracle.database.jdbc:ojdbc8:[19.9,)", JDBCTestConstants.VERSION, OracleITConstants.ORACLE_TESTCONTAINER})
35+
@Dependency({"com.oracle.database.jdbc:ojdbc8:[19.9,)", PluginITConstants.VERSION, JDBCTestConstants.VERSION, OracleITConstants.ORACLE_TESTCONTAINER})
3336
@ImportPlugin("com.navercorp.pinpoint:pinpoint-oracle-jdbc-driver-plugin")
37+
@SharedTestLifeCycleClass(OracleServer19x.class)
3438
public class Oracle19_Ojdbc8_IT extends Oracle_IT_Base {
35-
private static final Logger logger = LogManager.getLogger(Oracle19_Ojdbc8_IT.class);
36-
37-
@BeforeSharedClass
38-
public static void sharedSetup() throws Exception {
39-
logger.info("Setting up oracle db...");
40-
startOracleDB(OracleITConstants.ORACLE_18_X_IMAGE, Wait.forLogMessage(".*Completed.*", 1));
41-
}
39+
private final Logger logger = LogManager.getLogger(Oracle19_Ojdbc8_IT.class);
4240

4341
@BeforeClass
44-
public static void setup() throws Exception {
42+
public static void setup() {
4543
DriverProperties driverProperties = createDriverProperties();
4644
helper = new OracleItHelper(driverProperties);
4745
}

‎plugins-it/oracledb-it/src/test/java/com/navercorp/pinpoint/plugin/jdbc/oracle/OracleItHelper.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ public void create(JDBCApi jdbcApi) throws Exception {
8585
statement.execute("CREATE OR REPLACE TRIGGER test_trigger BEFORE INSERT ON test FOR EACH ROW BEGIN SELECT test_seq.nextval INTO :new.id FROM dual; END;");
8686
statement.execute("CREATE OR REPLACE PROCEDURE concatCharacters(a IN VARCHAR2, b IN VARCHAR2, c OUT VARCHAR2) AS BEGIN c := a || b; END concatCharacters;");
8787
statement.execute("CREATE OR REPLACE PROCEDURE swapAndGetSum(a IN OUT NUMBER, b IN OUT NUMBER, c OUT NUMBER) IS BEGIN c := a; a := b; b := c; SELECT c + a INTO c FROM DUAL; END swapAndGetSum;");
88+
statement.close();
8889
conn.commit();
8990
conn.close();
9091
}

‎plugins-it/oracledb-it/src/test/java/com/navercorp/pinpoint/plugin/jdbc/oracle/OracleServer.java

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
package com.navercorp.pinpoint.plugin.jdbc.oracle;
2+
3+
import com.navercorp.pinpoint.pluginit.jdbc.DriverProperties;
4+
import com.navercorp.pinpoint.pluginit.jdbc.JDBCDriverClass;
5+
import com.navercorp.pinpoint.pluginit.jdbc.testcontainers.DatabaseContainers;
6+
import com.navercorp.pinpoint.test.plugin.shared.SharedTestLifeCycle;
7+
import org.apache.logging.log4j.LogManager;
8+
import org.apache.logging.log4j.Logger;
9+
import org.junit.Assume;
10+
import org.testcontainers.DockerClientFactory;
11+
import org.testcontainers.containers.OracleContainer;
12+
import org.testcontainers.containers.wait.strategy.WaitStrategy;
13+
14+
import java.time.Duration;
15+
import java.util.Objects;
16+
import java.util.Properties;
17+
18+
public class OracleServer implements SharedTestLifeCycle {
19+
private final Logger logger = LogManager.getLogger(getClass());
20+
private final String dockerImageVersion;
21+
private final WaitStrategy waitStrategy;
22+
23+
private OracleContainer oracle;
24+
25+
public OracleServer(String dockerImageVersion, WaitStrategy waitStrategy) {
26+
this.dockerImageVersion = Objects.requireNonNull(dockerImageVersion, "dockerImageVersion");
27+
this.waitStrategy = Objects.requireNonNull(waitStrategy, "waitStrategy");
28+
}
29+
30+
@Override
31+
public Properties beforeAll() {
32+
Assume.assumeTrue("Docker not enabled", DockerClientFactory.instance().isDockerAvailable());
33+
34+
logger.info("Setting up oracle db... {}", dockerImageVersion);
35+
36+
startOracleDB(dockerImageVersion, waitStrategy);
37+
logger.info("initSchema");
38+
initSchema();
39+
40+
41+
return DatabaseContainers.toProperties(oracle);
42+
}
43+
44+
private void initSchema() {
45+
DriverProperties driverProperties = new DriverProperties(oracle.getJdbcUrl(), oracle.getUsername(), oracle.getPassword(), new Properties());
46+
OracleItHelper helper = new OracleItHelper(driverProperties);
47+
JDBCDriverClass driverClass = new OracleJDBCDriverClass();
48+
OracleJDBCApi JDBC_API = new OracleJDBCApi(driverClass);
49+
try {
50+
helper.create(JDBC_API);
51+
} catch (Exception e) {
52+
throw new RuntimeException("schema init error", e);
53+
}
54+
}
55+
56+
private void startOracleDB(String dockerImageVersion, WaitStrategy waitStrategy) {
57+
Assume.assumeTrue("Docker not enabled", DockerClientFactory.instance().isDockerAvailable());
58+
oracle = new OracleContainerWithWait(dockerImageVersion);
59+
60+
if (waitStrategy != null) {
61+
oracle.setWaitStrategy(waitStrategy);
62+
oracle.withStartupTimeout(Duration.ofSeconds(300));
63+
oracle.addEnv("DBCA_ADDITIONAL_PARAMS", "-initParams sga_target=0M pga_aggreegate_target=0M");
64+
oracle.withReuse(true);
65+
}
66+
67+
oracle.start();
68+
}
69+
70+
@Override
71+
public void afterAll() {
72+
if (oracle != null) {
73+
oracle.stop();
74+
}
75+
}
76+
}

‎plugins-it/oracledb-it/src/test/java/com/navercorp/pinpoint/plugin/jdbc/oracle/OracleServer11x.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
package com.navercorp.pinpoint.plugin.jdbc.oracle;
2+
3+
import org.testcontainers.containers.wait.strategy.Wait;
4+
5+
public class OracleServer11x extends OracleServer {
6+
public OracleServer11x() {
7+
super(OracleITConstants.ORACLE_11_X_IMAGE, Wait.defaultWaitStrategy());
8+
}
9+
10+
}

‎plugins-it/oracledb-it/src/test/java/com/navercorp/pinpoint/plugin/jdbc/oracle/OracleServer12x.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
package com.navercorp.pinpoint.plugin.jdbc.oracle;
2+
3+
import org.testcontainers.containers.wait.strategy.Wait;
4+
5+
public class OracleServer12x extends OracleServer {
6+
public OracleServer12x() {
7+
super(OracleITConstants.ORACLE_12_X_IMAGE, Wait.forLogMessage(".*Database ready to use.*\\n", 1));
8+
}
9+
10+
}

‎plugins-it/oracledb-it/src/test/java/com/navercorp/pinpoint/plugin/jdbc/oracle/OracleServer19x.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
package com.navercorp.pinpoint.plugin.jdbc.oracle;
2+
3+
import org.testcontainers.containers.wait.strategy.Wait;
4+
5+
public class OracleServer19x extends OracleServer {
6+
public OracleServer19x() {
7+
super(OracleITConstants.ORACLE_18_X_IMAGE, Wait.forLogMessage(".*Completed.*", 1));
8+
}
9+
10+
}

0 commit comments

Comments
 (0)