Fix path resolving on Windows

Make all tests also run on Windows except for docx converter tests from flexmark-docx-converter module.

Author: travkin79

flexmark-test-util/src/main/java/com/vladsch/flexmark/test/util/TestUtils.java

@@ -534,13 +534,6 @@ public static String getFormattedSection(String section, int exampleNumber) {
         return section == null ? "" : section.trim() + ": " + exampleNumber;
     }
 
-    @NotNull
-    public static String getResolvedSpecResourcePath(@NotNull String testClassName, @NotNull String resourcePath) {
-        File specInfo = new File(resourcePath);
-        File classInfo = new File("/" + testClassName.replace('.', '/'));
-        return !specInfo.isAbsolute() ? new File(classInfo.getParent(), resourcePath).getAbsolutePath() : resourcePath;
-    }
-
     @NotNull
     public static String getAbsoluteSpecResourcePath(@NotNull String testClassPath, @NotNull String resourceRootPath, @NotNull String resourcePath) {
         File resourceFile = resourcePath.startsWith("/") ? new File(resourceRootPath, resourcePath.substring(1)) : new File(new File(testClassPath).getParent(), resourcePath);
@@ -552,9 +545,8 @@ public static String getSpecResourceFileUrl(@NotNull Class<?> resourceClass, @No
         if (resourcePath.isEmpty()) {
             throw new IllegalStateException("Empty resource paths not supported");
         } else {
-            String resolvedResourcePath = getResolvedSpecResourcePath(resourceClass.getName(), resourcePath);
-            URL url = resourceClass.getResource(resolvedResourcePath);
-            assert url != null : "Resource path: '" + resolvedResourcePath + "' not found.";
+            URL url = resourceClass.getResource(resourcePath);
+            assert url != null : "Resource path: '" + resourcePath + "' not found.";
             return adjustedFileUrl(url);
         }
     }

flexmark-test-util/src/main/java/com/vladsch/flexmark/test/util/spec/ResourceLocation.java

@@ -13,17 +13,11 @@ public class ResourceLocation {
     final private @NotNull Class<?> resourceClass;
     final private @NotNull String resourcePath;
     final private @NotNull String fileUrl;
-    final private @NotNull String resolvedResourcePath;
 
     public ResourceLocation(@NotNull Class<?> resourceClass, @NotNull String resourcePath, @NotNull String fileUrl) {
-        this(resourceClass, resourcePath, fileUrl, TestUtils.getResolvedSpecResourcePath(resourceClass.getName(), resourcePath));
-    }
-
-    private ResourceLocation(@NotNull Class<?> resourceClass, @NotNull String resourcePath, @NotNull String fileUrl, @NotNull String resolvedResourcePath) {
         this.resourceClass = resourceClass;
         this.resourcePath = resourcePath;
         this.fileUrl = fileUrl;
-        this.resolvedResourcePath = resolvedResourcePath;
     }
 
     @NotNull
@@ -55,11 +49,6 @@ public String getFileUrl(int lineNumber) {
         return TestUtils.getUrlWithLineNumber(getFileUrl(), lineNumber);
     }
 
-    @NotNull
-    public String getResolvedResourcePath() {
-        return resolvedResourcePath;
-    }
-
     public boolean isNull() {
         return this == NULL;
     }
@@ -83,23 +72,21 @@ public boolean equals(Object o) {
 
         if (!resourceClass.equals(location.resourceClass)) return false;
         if (!resourcePath.equals(location.resourcePath)) return false;
-        if (!fileUrl.equals(location.fileUrl)) return false;
-        return resolvedResourcePath.equals(location.resolvedResourcePath);
+        return fileUrl.equals(location.fileUrl);
     }
 
     // @formatter:off
-    @NotNull public ResourceLocation withResourceClass(@NotNull Class<?> resourceClass) { return new ResourceLocation(resourceClass, resourcePath,  fileUrl, resolvedResourcePath); };
-    @NotNull public ResourceLocation withResourcePath(@NotNull String resourcePath) { return new ResourceLocation(resourceClass, resourcePath,  fileUrl, resolvedResourcePath); };
-    @NotNull public ResourceLocation withFileUrl(@NotNull String fileUrl) { return new ResourceLocation(resourceClass, resourcePath,  fileUrl, resolvedResourcePath); };
-    @NotNull public ResourceLocation withResolvedResourcePath(@NotNull String resolvedResourcePath) { return new ResourceLocation(resourceClass, resourcePath,  fileUrl, resolvedResourcePath); };
+    @NotNull public ResourceLocation withResourceClass(@NotNull Class<?> resourceClass) { return new ResourceLocation(resourceClass, resourcePath,  fileUrl); };
+    @NotNull public ResourceLocation withResourcePath(@NotNull String resourcePath) { return new ResourceLocation(resourceClass, resourcePath,  fileUrl); };
+    @NotNull public ResourceLocation withFileUrl(@NotNull String fileUrl) { return new ResourceLocation(resourceClass, resourcePath,  fileUrl); };
+    @NotNull public ResourceLocation withResolvedResourcePath(@NotNull String resolvedResourcePath) { return new ResourceLocation(resourceClass, resourcePath,  fileUrl); };
     // @formatter:on
 
     @Override
     public int hashCode() {
         int result = resourceClass.hashCode();
         result = 31 * result + resourcePath.hashCode();
         result = 31 * result + fileUrl.hashCode();
-        result = 31 * result + resolvedResourcePath.hashCode();
         return result;
     }
 
@@ -113,15 +100,13 @@ public String toString() {
 
     public static @NotNull ResourceLocation of(@NotNull String resourcePath) {
         return new ResourceLocation(ComboSpecTestCase.class, resourcePath,
-                TestUtils.getSpecResourceFileUrl(ComboSpecTestCase.class, resourcePath),
-                TestUtils.getResolvedSpecResourcePath(ComboSpecTestCase.class.getName(), resourcePath)
+                TestUtils.getSpecResourceFileUrl(ComboSpecTestCase.class, resourcePath)
         );
     }
 
     public static @NotNull ResourceLocation of(@NotNull Class<?> resourceClass, @NotNull String resourcePath) {
         return new ResourceLocation(resourceClass, resourcePath,
-                TestUtils.getSpecResourceFileUrl(resourceClass, resourcePath),
-                TestUtils.getResolvedSpecResourcePath(resourceClass.getName(), resourcePath)
+                TestUtils.getSpecResourceFileUrl(resourceClass, resourcePath)
         );
     }
 
@@ -152,8 +137,7 @@ public static String getResourceText(@NotNull ResourceLocation location) {
 
     @NotNull
     public static InputStream getResourceInputStream(@NotNull ResourceLocation location) {
-        String useSpecResource = location.getResolvedResourcePath();
-        InputStream stream = location.getResourceClass().getResourceAsStream(useSpecResource);
+        InputStream stream = location.getResourceClass().getResourceAsStream(location.getResourcePath());
         if (stream == null) {
             throw new IllegalStateException("Could not load " + location);
         }

flexmark-test-util/src/main/java/com/vladsch/flexmark/test/util/spec/SpecExample.java

@@ -162,14 +162,14 @@ public String toString() {
             String fileName = traceElement.getFileName();
             // need path to class, so fake it with class resource file
             String javaFilePath = resourceClass.getName().replace('.', '/');
-            File javaPathFile = new File("/" + javaFilePath).getParentFile();
-            String javaPath = javaPathFile.getPath() + "/" + fileName;
+            File javaPathFile = new File('/' + javaFilePath).getParentFile();
+            String javaPath = new File(javaPathFile, fileName).getPath().replace('\\', '/');
             URL url = null;
             String prefix = null;
             String resourcePath = null;
             while (true) {
-                String absolutePath = Utils.removeSuffix(javaPathFile.getPath(), "/");
-                resourcePath = Utils.removePrefix(absolutePath, '/').replace('/', '.') + ".txt";
+                String absolutePath = Utils.removeSuffix(javaPathFile.getPath(), File.separator);
+                resourcePath = Utils.removePrefix(absolutePath, File.separatorChar).replace(File.separatorChar, '.') + ".txt";
                 url = resourceClass.getResource("/" + resourcePath);
                 if (url != null) {
                     prefix = Utils.getResourceAsString(resourceClass, "/" + resourcePath).trim();