Skip to content

Commit 24b2b19

Browse files
authored
Fix CustomElementMatchers test on windows (#3765)
1 parent d4280c9 commit 24b2b19

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

apm-agent-plugin-sdk/src/test/java/co/elastic/apm/agent/sdk/bytebuddy/CustomElementMatchersTest.java

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@
2626
import java.io.File;
2727
import java.io.IOException;
2828
import java.net.MalformedURLException;
29+
import java.net.URI;
2930
import java.net.URISyntaxException;
3031
import java.net.URL;
3132
import java.net.URLClassLoader;
32-
import java.net.URI;
33-
import java.nio.file.Files;
3433
import java.nio.file.FileSystem;
3534
import java.nio.file.FileSystems;
35+
import java.nio.file.Files;
3636
import java.nio.file.Path;
3737
import java.nio.file.Paths;
3838
import java.security.CodeSigner;
@@ -42,7 +42,12 @@
4242
import java.util.List;
4343
import java.util.Map;
4444

45-
import static co.elastic.apm.agent.sdk.bytebuddy.CustomElementMatchers.*;
45+
import static co.elastic.apm.agent.sdk.bytebuddy.CustomElementMatchers.classLoaderCanLoadClass;
46+
import static co.elastic.apm.agent.sdk.bytebuddy.CustomElementMatchers.implementationVersionGte;
47+
import static co.elastic.apm.agent.sdk.bytebuddy.CustomElementMatchers.implementationVersionLte;
48+
import static co.elastic.apm.agent.sdk.bytebuddy.CustomElementMatchers.isAgentClassLoader;
49+
import static co.elastic.apm.agent.sdk.bytebuddy.CustomElementMatchers.isInAnyPackage;
50+
import static co.elastic.apm.agent.sdk.bytebuddy.CustomElementMatchers.isInternalPluginClassLoader;
4651
import static net.bytebuddy.matcher.ElementMatchers.none;
4752
import static org.assertj.core.api.Assertions.assertThat;
4853

@@ -84,7 +89,7 @@ void testSemVerFallbackOnMavenProperties(@TempDir Path tempDir) throws URISyntax
8489
Map<String, String> fsProperties = new HashMap<>();
8590
fsProperties.put("create", "false");
8691

87-
URI fsUri = URI.create("jar:file://" + modifiedJar.toAbsolutePath());
92+
URI fsUri = URI.create("jar:" + modifiedJar.toUri());
8893
try (FileSystem zipFs = FileSystems.newFileSystem(fsUri, fsProperties)) {
8994
Files.delete(zipFs.getPath("META-INF", "MANIFEST.MF"));
9095
}

0 commit comments

Comments
 (0)