Fix tests on Windows

bazeltools · Oct 15, 2022 · 41a8cd5 · 41a8cd5
1 parent 8d96a87
commit 41a8cd5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/src/test/java/com/github/johnynek/jarjar/integration/BUILD b/src/test/java/com/github/johnynek/jarjar/integration/BUILD
@@ -35,5 +35,8 @@ java_test(
     srcs = ["DuplicateClassTest.java"],
     data = ["duplicate_class.jar"],
     test_class = "com.github.johnynek.jarjar.integration.DuplicateClassTest",
-    deps = [":base"],
+    deps = [
+        ":base",
+        "@bazel_tools//tools/java/runfiles",
+    ],
 )
diff --git a/src/test/java/com/github/johnynek/jarjar/integration/DuplicateClassTest.java b/src/test/java/com/github/johnynek/jarjar/integration/DuplicateClassTest.java
@@ -1,6 +1,7 @@
 package com.github.johnynek.jarjar.integration;
 
 
+import com.google.devtools.build.runfiles.Runfiles;
 import org.junit.Test;
 import java.util.Map;
 import java.util.List;
@@ -16,9 +17,13 @@
 
 public class DuplicateClassTest extends IntegrationTestBase {
 
+    private static final String DUPLICATE_CLASSES_JAR =
+      "com_github_johnynek_bazel_jar_jar/src/test/java/com/github/johnynek/jarjar/integration/duplicate_class.jar";
+
     @Test
     public void testErrorOnDuplicateClasses() throws Exception {
-      File duplicateClassJar = new File("src/test/java/com/github/johnynek/jarjar/integration/duplicate_class.jar");
+      Runfiles runfiles = Runfiles.create();
+      File duplicateClassJar = new File(runfiles.rlocation(DUPLICATE_CLASSES_JAR));
       assertTrue("Test is misconfigured if we can't find this", duplicateClassJar.exists());
 
       try {
@@ -34,7 +39,8 @@ public void testErrorOnDuplicateClasses() throws Exception {
 
     @Test
     public void ignoreDuplicateClasses() throws Exception {
-      File duplicateClassJar = new File("src/test/java/com/github/johnynek/jarjar/integration/duplicate_class.jar");
+      Runfiles runfiles = Runfiles.create();
+      File duplicateClassJar = new File(runfiles.rlocation(DUPLICATE_CLASSES_JAR));
       assertTrue("Test is misconfigured if we can't find this", duplicateClassJar.exists());
 
       File shaded = shadeJar(duplicateClassJar, new HashMap<String, String>() {{

diff --git a/src/test/java/com/github/johnynek/jarjar/integration/IntegrationTestBase.java b/src/test/java/com/github/johnynek/jarjar/integration/IntegrationTestBase.java
@@ -216,7 +216,7 @@ protected File shadeJar(File jarFile, Map<String, String> jarjarArgs, String[] r
    * @param fullyQualifiedName The fully qualified classname of the java class should use.
    */
   protected String basicJavaFile(String fullyQualifiedName) {
-    fullyQualifiedName = fullyQualifiedName.replaceAll("[.]", File.separator);
+    fullyQualifiedName = fullyQualifiedName.replace('.', File.separatorChar);
 
     String packageName = null;
     String className = null;