Log resolved path for debugging. (hbz/lobid-resources#1527)

Incidentally also changes paths to normalized and absolute, which _might_ affect behaviour.

Author: blackwinter

metafix/src/main/java/org/metafacture/metafix/Metafix.java

@@ -36,6 +36,7 @@
 import java.io.Reader;
 import java.io.StringReader;
 import java.io.UncheckedIOException;
+import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -145,17 +146,28 @@ public void literal(final String name, final String value) {
     }
 
     public String resolvePath(final String path) {
+        final Path basePath;
+
         if (path.startsWith(".")) {
             if (fixFile != null) {
-                return Paths.get(fixFile).resolveSibling(path).toString();
+                basePath = getPath(fixFile).getParent();
             }
             else {
                 throw new IllegalArgumentException("Cannot resolve relative path: " + path);
             }
         }
         else {
-            return path;
+            basePath = getPath("");
         }
+
+        final String resolvedPath = basePath.resolve(path).normalize().toString();
+        LOG.debug("Resolved path: path = '{}', result = '{}', base = '{}'", path, resolvedPath, basePath);
+
+        return resolvedPath;
+    }
+
+    private Path getPath(final String path) {
+        return Paths.get(path).toAbsolutePath().normalize();
     }
 
     public RecordTransformer getRecordTransformer(final String fixDef) {

metafix/src/test/java/org/metafacture/metafix/MetafixIfTest.java

@@ -1084,7 +1084,7 @@ public void shouldIncludeLocationAndTextInProcessExceptionInConditional() {
         final String text2 = "nothing()";
         final String message = "Error while executing Fix expression (at FILE, line 3): " + text1 + " " + text2;
 
-        MetafixTestHelpers.assertThrows(FixProcessException.class, s -> s.replaceAll("file:/.+?\\.fix", "FILE"), message, () ->
+        MetafixTestHelpers.assertProcessException(/*BasicIndexOutOfBoundsException.class*/null, s -> s.replaceAll("file:/.+?\\.fix", "FILE"), message, () ->
             MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
                     "if exists('animal')",
                     "nothing()",
@@ -1112,7 +1112,7 @@ public void shouldIncludeLocationAndTextInProcessExceptionInBody() {
         final String text = "add_field()";
         final String message = "Error while executing Fix expression (at FILE, line 4): " + text;
 
-        MetafixTestHelpers.assertThrows(FixProcessException.class, s -> s.replaceAll("file:/.+?\\.fix", "FILE"), message, () ->
+        MetafixTestHelpers.assertProcessException(/*BasicIndexOutOfBoundsException.class*/null, s -> s.replaceAll("file:/.+?\\.fix", "FILE"), message, () ->
             MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
                     "if exists('animal')",
                     "nothing()",

metafix/src/test/java/org/metafacture/metafix/MetafixLookupTest.java

@@ -830,7 +830,7 @@ public void shouldLookupInCopiedNestedArrays() {
 
     @Test
     public void shouldFailLookupInUnknownExternalMap() {
-        MetafixTestHelpers.assertProcessException(MorphExecutionException.class, "File not found: testMap.csv", () ->
+        MetafixTestHelpers.assertProcessException(MorphExecutionException.class, s -> s.replaceAll(": /.+?/testMap\\.csv", ": FILE"), "File not found: FILE", () ->
             MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
                     LOOKUP + " 'testMap.csv')"
                 ),

metafix/src/test/java/org/metafacture/metafix/MetafixTestHelpers.java

@@ -55,7 +55,11 @@ public static void assertExecutionException(final Class<?> expectedClass, final
     }
 
     public static void assertProcessException(final Class<?> expectedClass, final String expectedMessage, final Executable executable) {
-        assertThrows(FixProcessException.class, expectedClass, expectedMessage, executable, UnaryOperator.identity());
+        assertProcessException(expectedClass, UnaryOperator.identity(), expectedMessage, executable);
+    }
+
+    public static void assertProcessException(final Class<?> expectedClass, final UnaryOperator<String> operator, final String expectedMessage, final Executable executable) {
+        assertThrows(FixProcessException.class, expectedClass, expectedMessage, executable, operator);
     }
 
     public static void assertThrows(final Class<? extends Throwable> expectedClass, final String expectedMessage, final Executable executable) {