Fix handling different file URLs "file:/" and "file://"

Author: travkin79

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

@@ -76,7 +76,8 @@ public class TestUtils {
     final public static DataKey<Collection<Extension>> LOAD_EXTENSIONS = LoadUnloadDataKeyAggregator.LOAD_EXTENSIONS;
     final private static DataHolder EMPTY_OPTIONS = new DataSet();
     final public static DataKey<BiFunction<String, String, DataHolder>> CUSTOM_OPTION = new DataKey<>("CUSTOM_OPTION", (option, params) -> EMPTY_OPTIONS);
-    final public static String FILE_PROTOCOL = ResourceUrlResolver.FILE_PROTOCOL;
+    final public static String FILE_PROTOCOL_SINGLE_SLASH = ResourceUrlResolver.FILE_PROTOCOL_SINGLE_SLASH;
+    final public static String FILE_PROTOCOL_DOUBLE_SLASH = ResourceUrlResolver.FILE_PROTOCOL_DOUBLE_SLASH;
 
     public static DataHolder processOption(@NotNull Map<String, ? extends DataHolder> optionsMap, @NotNull String option) {
         DataHolder dataHolder = null;
@@ -612,7 +613,13 @@ public static DataHolder[] dataHolders(@Nullable DataHolder other, @Nullable Dat
     public static String getTestResourceRootDirectoryForModule(@NotNull Class<?> resourceClass, @NotNull String moduleRootPackage) {
         String fileUrl;
         fileUrl = getSpecResourceFileUrl(resourceClass, wrapWith(moduleRootPackage, "/", ".txt"));
-        return removePrefix(removeSuffix(fileUrl, suffixWith(moduleRootPackage, ".txt")), FILE_PROTOCOL);
+        fileUrl = removeSuffix(fileUrl, suffixWith(moduleRootPackage, ".txt"));
+        if (fileUrl.startsWith(FILE_PROTOCOL_DOUBLE_SLASH)) {
+            fileUrl = removePrefix(fileUrl, FILE_PROTOCOL_DOUBLE_SLASH);
+        } else if (fileUrl.startsWith(FILE_PROTOCOL_SINGLE_SLASH)) {
+        	fileUrl = removePrefix(fileUrl, FILE_PROTOCOL_SINGLE_SLASH);
+        }
+        return fileUrl;
     }
 
     @NotNull
@@ -623,7 +630,11 @@ public static String getRootDirectoryForModule(@NotNull Class<?> resourceClass,
         if (pos != -1) {
             fileUrl = fileUrl.substring(0, pos);
         }
-        fileUrl = fileUrl.substring(FILE_PROTOCOL.length());
+        if (fileUrl.startsWith(FILE_PROTOCOL_DOUBLE_SLASH)) {
+            fileUrl = fileUrl.substring(FILE_PROTOCOL_DOUBLE_SLASH.length());
+        } else if (fileUrl.startsWith(FILE_PROTOCOL_SINGLE_SLASH)) {
+            fileUrl = fileUrl.substring(FILE_PROTOCOL_SINGLE_SLASH.length());
+        }
         return fileUrl;
     }
 

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

@@ -35,7 +35,7 @@ public static String adjustedFileUrl(@NotNull URL url) {
             } else {
                 File file = new File(filePath);
                 if (file.exists()) {
-                    return TestUtils.FILE_PROTOCOL + filePath;
+                    return TestUtils.FILE_PROTOCOL_DOUBLE_SLASH + filePath;
                 }
             }
         }

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

@@ -11,10 +11,11 @@ public interface ResourceUrlResolver extends Function<String, String> {
     @Override
     String apply(String externalForm);
 
-    String FILE_PROTOCOL = "file://";
+    String FILE_PROTOCOL_SINGLE_SLASH = "file:/";
+    String FILE_PROTOCOL_DOUBLE_SLASH = FILE_PROTOCOL_SINGLE_SLASH + "/";
 
     static boolean isFileProtocol(@NotNull String externalForm) {
-        return externalForm.startsWith("file:/");
+        return externalForm.startsWith(FILE_PROTOCOL_SINGLE_SLASH);
     }
 
     static boolean hasProtocol(@NotNull String externalForm) {