Skip to content

Commit 31855d1

Browse files
committed
[#noissue] Fix plugin-it forked required libs
1 parent 79a4c93 commit 31855d1

File tree

3 files changed

+10
-1
lines changed

3 files changed

+10
-1
lines changed

‎agent-module/plugins-it/mssql-jdbc-it/src/test/java/com/navercorp/pinpoint/it/plugin/jdbc/mssql/MSSSqlConnectionIT.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import com.navercorp.pinpoint.bootstrap.plugin.test.PluginTestVerifier;
2222
import com.navercorp.pinpoint.bootstrap.plugin.test.PluginTestVerifierHolder;
2323
import com.navercorp.pinpoint.it.plugin.utils.AgentPath;
24+
import com.navercorp.pinpoint.it.plugin.utils.PluginITConstants;
2425
import com.navercorp.pinpoint.it.plugin.utils.TestcontainersOption;
2526
import com.navercorp.pinpoint.it.plugin.utils.jdbc.DriverManagerUtils;
2627
import com.navercorp.pinpoint.it.plugin.utils.jdbc.JDBCDriverClass;
@@ -55,7 +56,7 @@
5556
*/
5657
@PluginForkedTest
5758
@PinpointAgent(AgentPath.PATH)
58-
@Dependency({"com.microsoft.sqlserver:mssql-jdbc:[7.0.0.jre8]", JDBCTestConstants.VERSION, TestcontainersOption.TEST_CONTAINER, TestcontainersOption.MSSQL})
59+
@Dependency({"com.microsoft.sqlserver:mssql-jdbc:[7.0.0.jre8]", PluginITConstants.VERSION, JDBCTestConstants.VERSION, TestcontainersOption.TEST_CONTAINER, TestcontainersOption.MSSQL})
5960
@PinpointConfig("pinpoint-mssql.config")
6061
public class MSSSqlConnectionIT {
6162

‎agent-module/plugins-test/src/main/java/com/navercorp/pinpoint/test/plugin/AbstractPluginForkedTestSuite.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
package com.navercorp.pinpoint.test.plugin;
1818

1919
import com.navercorp.pinpoint.common.annotations.VisibleForTesting;
20+
import com.navercorp.pinpoint.common.util.OsType;
21+
import com.navercorp.pinpoint.common.util.OsUtils;
2022
import com.navercorp.pinpoint.common.util.SystemProperty;
2123
import com.navercorp.pinpoint.test.plugin.util.ArrayUtils;
2224
import com.navercorp.pinpoint.test.plugin.util.CodeSourceUtils;
@@ -240,6 +242,11 @@ private static List<String> extractLibrariesFromSystemClassLoader() {
240242
if (StringUtils.isEmpty(classPath)) {
241243
return Collections.emptyList();
242244
}
245+
if (OsUtils.getType() == OsType.WINDOW) {
246+
final String[] paths = classPath.split(";");
247+
return normalizePaths(paths);
248+
}
249+
243250
final String[] paths = classPath.split(":");
244251
return normalizePaths(paths);
245252
}

‎agent-module/plugins-test/src/main/java/com/navercorp/pinpoint/test/plugin/PluginClassLoading.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ public final class PluginClassLoading {
1818
Paths.get("agent-module", "plugins-test", "target", "classes").toString(),
1919
// "/test/target/classes", // pinpoint-test build output directory
2020
Paths.get("testcase", "target", "classes").toString(),
21+
"pinpoint-testcase",
2122
// "/testcase/target/classes",
2223
Paths.get("pinpoint", "agent-module", "plugins").toString(),
2324
// "/pinpoint/plugins/", // required when executing test on IDE

0 commit comments

Comments
 (0)