Match testOnlyClasspath using URI instead of String.

We already get the "needle" in the form of a URI, so this skips
a step, and has the benefit of also working on Windows.

Author: prdoyle

test/framework/src/main/java/org/elasticsearch/entitlement/bootstrap/TestEntitlementBootstrap.java

@@ -29,8 +29,11 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -128,11 +131,11 @@ private static TestPolicyManager createPolicyManager(PathLookup pathLookup) thro
         FilesEntitlementsValidation.validate(pluginPolicies, pathLookup);
 
         String testOnlyPathString = System.getenv("es.entitlement.testOnlyPath");
-        Set<String> testOnlyClassPath;
+        Set<URI> testOnlyClassPath;
         if (testOnlyPathString == null) {
             testOnlyClassPath = Set.of();
         } else {
-            testOnlyClassPath = Arrays.stream(testOnlyPathString.split(separator)).collect(toCollection(TreeSet::new));
+            testOnlyClassPath = Arrays.stream(testOnlyPathString.split(separator)).map(Paths::get).map(Path::toUri).collect(toCollection(TreeSet::new));
         }
 
         return new TestPolicyManager(

test/framework/src/main/java/org/elasticsearch/entitlement/runtime/policy/TestPolicyManager.java

@@ -12,6 +12,7 @@
 import org.elasticsearch.entitlement.runtime.policy.entitlements.Entitlement;
 import org.elasticsearch.test.ESTestCase;
 
+import java.net.URI;
 import java.net.URISyntaxException;
 import java.nio.file.Path;
 import java.security.CodeSource;
@@ -35,7 +36,7 @@ public class TestPolicyManager extends PolicyManager {
      */
     final Map<Class<?>, ModuleEntitlements> classEntitlementsMap = new ConcurrentHashMap<>();
 
-    final Collection<String> testOnlyClasspath;
+    final Collection<URI> testOnlyClasspath;
 
     public TestPolicyManager(
         Policy serverPolicy,
@@ -44,7 +45,7 @@ public TestPolicyManager(
         Function<Class<?>, PolicyScope> scopeResolver,
         Map<String, Collection<Path>> pluginSourcePaths,
         PathLookup pathLookup,
-        Collection<String> testOnlyClasspath
+        Collection<URI> testOnlyClasspath
     ) {
         super(serverPolicy, apmAgentEntitlements, pluginPolicies, scopeResolver, pluginSourcePaths, pathLookup);
         this.testOnlyClasspath = testOnlyClasspath;
@@ -135,15 +136,12 @@ private boolean isTestCode(Class<?> requestingClass) {
             // This can happen for JDK classes
             return false;
         }
-        String needle;
+        URI needle;
         try {
-            needle = codeSource.getLocation().toURI().getPath();
+            needle = codeSource.getLocation().toURI();
         } catch (URISyntaxException e) {
             throw new IllegalStateException(e);
         }
-        if (needle.endsWith("/")) {
-            needle = needle.substring(0, needle.length() - 1);
-        }
         boolean result = testOnlyClasspath.contains(needle);
         return result;
     }