diff --git a/test/jdk/java/lang/ClassLoader/loadLibraryDeadlock/LoadLibraryDeadlock.java b/test/jdk/java/lang/ClassLoader/loadLibraryDeadlock/LoadLibraryDeadlock.java index bab4d828457..4c615b74d1c 100644 --- a/test/jdk/java/lang/ClassLoader/loadLibraryDeadlock/LoadLibraryDeadlock.java +++ b/test/jdk/java/lang/ClassLoader/loadLibraryDeadlock/LoadLibraryDeadlock.java @@ -33,6 +33,7 @@ * triggered from JNI. */ import java.lang.*; +import java.net.URISyntaxException; public class LoadLibraryDeadlock { @@ -78,6 +79,11 @@ public class LoadLibraryDeadlock { private static String getLocation(Class c) { var pd = c.getProtectionDomain(); var cs = pd != null ? pd.getCodeSource() : null; - return cs != null ? cs.getLocation().getPath() : null; + try { + // same format as returned by TestLoadLibraryDeadlock::getLocation + return cs != null ? cs.getLocation().toURI().getPath() : null; + } catch (URISyntaxException ex) { + throw new RuntimeException(ex); + } } } diff --git a/test/jdk/java/lang/ClassLoader/loadLibraryDeadlock/TestLoadLibraryDeadlock.java b/test/jdk/java/lang/ClassLoader/loadLibraryDeadlock/TestLoadLibraryDeadlock.java index 0e031c8610b..7f4438b42ce 100644 --- a/test/jdk/java/lang/ClassLoader/loadLibraryDeadlock/TestLoadLibraryDeadlock.java +++ b/test/jdk/java/lang/ClassLoader/loadLibraryDeadlock/TestLoadLibraryDeadlock.java @@ -169,15 +169,20 @@ public class TestLoadLibraryDeadlock { "Unable to load native library."); Asserts.assertTrue( - countLines(outputAnalyzer, "Class1 loaded from " + bJar) > 0, - "Unable to load b.jar."); + countLines(outputAnalyzer, "Class1 loaded from " + toLocationString(bJar)) > 0, + "Unable to load " + toLocationString(bJar)); Asserts.assertTrue( - countLines(outputAnalyzer, "Class2 loaded from " + cJar) > 0, - "Unable to load signed c.jar."); + countLines(outputAnalyzer, "Class2 loaded from " + toLocationString(cJar)) > 0, + "Unable to load signed " + toLocationString(cJar)); Asserts.assertTrue( countLines(outputAnalyzer, "Signed jar loaded from native library.") > 0, "Unable to load signed jar from native library."); } + + private static String toLocationString(Path path) { + // same format as returned by LoadLibraryDeadlock::getLocation + return path.toUri().getPath(); + } }