B!! solving obscure bug with package settings and package that use te…

…xt that is earlier in the path
approvals · Apr 11, 2022 · c0c248c · c0c248c
1 parent aea011c
commit c0c248c
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 11 deletions.
diff --git a/approvaltests-tests/src/test/java/org/approvaltests/MethodVerification.java b/approvaltests-tests/src/test/java/org/approvaltests/MethodVerification.java
@@ -35,15 +35,7 @@ public static Queryable<Class<?>> getClasses(String startingDirectory, Function1
   }
   public static Class<?> getJavaClass(String path)
   {
-    String className = path.substring(0, path.length() - ".java".length());
-    if (className.contains(".com."))
-    {
-      className = className.substring(className.indexOf(".com.") + 1);
-    }
-    if (className.contains(".org."))
-    {
-      className = className.substring(className.indexOf(".org.") + 1);
-    }
+    String className = getJavaClassNameFromPath(path);
     try
     {
       Class<?> aClass = Class.forName(className);
@@ -52,7 +44,20 @@ public static Class<?> getJavaClass(String path)
     catch (Throwable e)
     {
       SimpleLogger.variable("Path", path);
+      SimpleLogger.variable("className", className);
       throw ObjectUtils.throwAsError(e);
     }
   }
+  public static String getJavaClassNameFromPath(String path)
+  {
+    String className = path.substring(0, path.length() - ".java".length());
+    String[] top = {"com", "org", "tests"};
+    for (String head : top)
+    {
+      head = "." + head + ".";
+      if (className.contains(head))
+      { return className.substring(className.indexOf(head) + 1); }
+    }
+    return className;
+  }
 }
diff --git a/approvaltests-tests/src/test/java/tests/PackageSettings.java b/approvaltests-tests/src/test/java/tests/PackageSettings.java
@@ -0,0 +1,6 @@
+package tests;
+
+public class PackageSettings
+{
+  public static String ApprovalBaseDirectory = "../resources";
+}
diff --git a/approvaltests-tests/src/test/java/tests/StackTraceNamerTest.java b/approvaltests-tests/src/test/java/tests/StackTraceNamerTest.java
@@ -0,0 +1,20 @@
+package tests;
+
+import org.approvaltests.namer.StackTraceNamer;
+import org.junit.jupiter.api.Test;
+
+import java.io.File;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class StackTraceNamerTest
+{
+  @Test
+  void testNameCollision()
+  {
+    StackTraceNamer approvalNamer = new StackTraceNamer();
+    String actual = approvalNamer.getApprovedFile(".txt").toString();
+    assertTrue(actual.contains(File.separator + "src" + File.separator),
+        "actual " + actual + " does not contain /src/");
+  }
+}
diff --git a/approvaltests/src/main/java/org/approvaltests/namer/StackTraceNamer.java b/approvaltests/src/main/java/org/approvaltests/namer/StackTraceNamer.java
@@ -36,8 +36,8 @@ public String getBaseDirectory()
     if (!StringUtils.isEmpty(NamerFactory.getApprovalBaseDirectory()))
     {
       String packageName = info.getFullClassName().substring(0, info.getFullClassName().lastIndexOf("."));
-      String packagepath = packageName.replace('.', File.separatorChar);
-      String currentBase = baseDir.substring(0, baseDir.indexOf(packagepath));
+      String packagepath = File.separator + packageName.replace('.', File.separatorChar);
+      String currentBase = baseDir.substring(0, baseDir.indexOf(packagepath) + 1);
       String newBase = currentBase + NamerFactory.getApprovalBaseDirectory() + File.separator + packagepath;
       baseDir = ObjectUtils.throwAsError(() -> new File(newBase).getCanonicalPath().toString());
     }