add add pattern.quote, add tests

objectionary · Dec 30, 2024 · c00b9b6 · c00b9b6
1 parent 6305004
commit c00b9b6
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 2 deletions.
diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/Unplace.java b/eo-maven-plugin/src/main/java/org/eolang/maven/Unplace.java
@@ -25,6 +25,7 @@
 
 import java.io.File;
 import java.nio.file.Path;
+import java.util.regex.Pattern;
 
 /**
  * Make program name from a path.
@@ -56,7 +57,7 @@ final class Unplace {
      * @param dir The name of the parent dir
      */
     Unplace(final Path dir) {
-        this(dir, ".eo$");
+        this(dir, ".eo");
     }
 
     /**
@@ -86,7 +87,10 @@ final class Unplace {
     public String make(final Path file) {
         return file.toString().substring(
             this.parent.toString().length() + 1
-        ).replaceAll(this.extension, "").replace(File.separator, ".");
+        ).replaceAll(
+            Pattern.quote(this.extension).concat("$"),
+            ""
+        ).replace(File.separator, ".");
     }
 
 }
diff --git a/eo-maven-plugin/src/test/java/org/eolang/maven/UnplaceTest.java b/eo-maven-plugin/src/test/java/org/eolang/maven/UnplaceTest.java
@@ -26,6 +26,8 @@
 import java.nio.file.Paths;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
 
@@ -55,4 +57,31 @@ void makesName(
         );
     }
 
+    @ParameterizedTest
+    @CsvSource({
+        "/tmp/foo/bar, /tmp/foo/bar/a/b/c.phi, a.b.c",
+        "/tmp/foo/bar, /tmp/foo/bar/a/b/.cd.ef.phi, a.b..cd.ef"
+    })
+    void makesNameWithCustomExtension(
+        final String base,
+        final String source,
+        final String name
+    ) {
+        MatcherAssert.assertThat(
+            CatalogsTest.TO_ADD_MESSAGE,
+            new Unplace(Paths.get(base), ".phi").make(
+                Paths.get(source)
+            ),
+            Matchers.equalTo(name)
+        );
+    }
+
+    @Test
+    void interpretsExtensionAsLiteralString() {
+        Assertions.assertDoesNotThrow(
+            () -> new Unplace(Paths.get("/tmp/foo/bar"), "(")
+                .make(Paths.get("/tmp/foo/bar/a/b/c(")),
+            "Extension interpreted not as literal string"
+        );
+    }
 }