Fixed four more Bazel java tests on Windows causing by back-slash in file path

Newly passing:
//src/test/java/com/google/devtools/build/...
    android/ideinfo:PackageParserTest
    android/ideinfo:ArtifactLocationConverterTest
    android:AndroidResourceCompilationActionTest
    lib:ideinfo_test

--
Change-Id: If035533f3c238489d9791bac9ca49143b84b06df
Reviewed-on: https://bazel-review.googlesource.com/#/c/3913
MOS_MIGRATED_REVID=126072874

2 files changed, 81 insertions, 57 deletions

diff --git a/src/test/java/com/google/devtools/build/android/ideinfo/ArtifactLocationConverterTest.java b/src/test/java/com/google/devtools/build/android/ideinfo/ArtifactLocationConverterTest.java
index 0ac6311857..baa30494e2 100644
--- a/src/test/java/com/google/devtools/build/android/ideinfo/ArtifactLocationConverterTest.java
+++ b/src/test/java/com/google/devtools/build/android/ideinfo/ArtifactLocationConverterTest.java
@@ -26,6 +26,8 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
+import java.nio.file.Paths;
+
 /**
  * Tests {@link ArtifactLocationConverter}.
  */
@@ -44,12 +46,13 @@ public class ArtifactLocationConverterTest {
     ArtifactLocation parsed = converter.convert(
         Joiner.on(",").join("", "test.java", "/usr/local/code")
     );
-    assertThat(parsed).isEqualTo(
-        ArtifactLocation.newBuilder()
-        .setRootPath("/usr/local/code")
-        .setRelativePath("test.java")
-        .setIsSource(true)
-        .build());
+    assertThat(parsed)
+        .isEqualTo(
+            ArtifactLocation.newBuilder()
+                .setRootPath(Paths.get("/usr/local/code").toString())
+                .setRelativePath(Paths.get("test.java").toString())
+                .setIsSource(true)
+                .build());
   }
 
   @Test
@@ -57,13 +60,14 @@ public class ArtifactLocationConverterTest {
     ArtifactLocation parsed = converter.convert(
         Joiner.on(",").join("bin", "java/com/test.java", "/usr/local/_tmp/code/bin")
     );
-    assertThat(parsed).isEqualTo(
-        ArtifactLocation.newBuilder()
-            .setRootPath("/usr/local/_tmp/code/bin")
-            .setRootExecutionPathFragment("bin")
-            .setRelativePath("java/com/test.java")
-            .setIsSource(false)
-            .build());
+    assertThat(parsed)
+        .isEqualTo(
+            ArtifactLocation.newBuilder()
+                .setRootPath(Paths.get("/usr/local/_tmp/code/bin").toString())
+                .setRootExecutionPathFragment(Paths.get("bin").toString())
+                .setRelativePath(Paths.get("java/com/test.java").toString())
+                .setIsSource(false)
+                .build());
   }
 
   @Test
@@ -75,12 +79,13 @@ public class ArtifactLocationConverterTest {
   @Test
   public void testFutureFormat() throws Exception {
     ArtifactLocation parsed = converter.convert("bin/out,java/com/test.java");
-    assertThat(parsed).isEqualTo(
-        ArtifactLocation.newBuilder()
-            .setRootExecutionPathFragment("bin/out")
-            .setRelativePath("java/com/test.java")
-            .setIsSource(false)
-            .build());
+    assertThat(parsed)
+        .isEqualTo(
+            ArtifactLocation.newBuilder()
+                .setRootExecutionPathFragment(Paths.get("bin/out").toString())
+                .setRelativePath(Paths.get("java/com/test.java").toString())
+                .setIsSource(false)
+                .build());
   }
 
 
diff --git a/src/test/java/com/google/devtools/build/android/ideinfo/PackageParserTest.java b/src/test/java/com/google/devtools/build/android/ideinfo/PackageParserTest.java
index 3f466d6d79..b830bd14be 100644
--- a/src/test/java/com/google/devtools/build/android/ideinfo/PackageParserTest.java
+++ b/src/test/java/com/google/devtools/build/android/ideinfo/PackageParserTest.java
@@ -31,6 +31,7 @@ import org.junit.runners.JUnit4;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -131,21 +132,24 @@ public class PackageParserTest {
           "bin,java/com/google/Bla.java,/usr/local/_tmp/code/bin"
         )};
     PackageParser.PackageParserOptions options = PackageParser.parseArgs(args);
-    assertThat(options.outputManifest.toString()).isEqualTo("/tmp/out.manifest");
+    assertThat(options.outputManifest.toString())
+        .isEqualTo(Paths.get("/tmp/out.manifest").toString());
     assertThat(options.sources).hasSize(2);
-    assertThat(options.sources.get(0)).isEqualTo(
-        ArtifactLocation.newBuilder()
-            .setRootPath("/usr/local/google/code")
-            .setRelativePath("java/com/google/Foo.java")
-            .setIsSource(true)
-            .build());
-    assertThat(options.sources.get(1)).isEqualTo(
-        ArtifactLocation.newBuilder()
-            .setRootPath("/usr/local/_tmp/code/bin")
-            .setRootExecutionPathFragment("bin")
-            .setRelativePath("java/com/google/Bla.java")
-            .setIsSource(false)
-            .build());
+    assertThat(options.sources.get(0))
+        .isEqualTo(
+            ArtifactLocation.newBuilder()
+                .setRootPath(Paths.get("/usr/local/google/code").toString())
+                .setRelativePath(Paths.get("java/com/google/Foo.java").toString())
+                .setIsSource(true)
+                .build());
+    assertThat(options.sources.get(1))
+        .isEqualTo(
+            ArtifactLocation.newBuilder()
+                .setRootPath(Paths.get("/usr/local/_tmp/code/bin").toString())
+                .setRootExecutionPathFragment(Paths.get("bin").toString())
+                .setRelativePath(Paths.get("java/com/google/Bla.java").toString())
+                .setIsSource(false)
+                .build());
   }
 
   @Test
@@ -266,19 +270,21 @@ public class PackageParserTest {
         "java/com/google/Foo.java:java/com/google/Bla.java"
     };
     PackageParser.PackageParserOptions options = PackageParser.parseArgs(args);
-    assertThat(options.outputManifest.toString()).isEqualTo("/tmp/out.manifest");
+    assertThat(options.outputManifest.toString())
+        .isEqualTo(Paths.get("/tmp/out.manifest").toString());
     assertThat(options.sourcesAbsolutePaths.get(0).toString())
-        .isEqualTo("/usr/local/code/java/com/google/Foo.java");
+        .isEqualTo(Paths.get("/usr/local/code/java/com/google/Foo.java").toString());
     assertThat(options.sourcesAbsolutePaths.get(1).toString())
-        .isEqualTo("/usr/local/code/java/com/google/Bla.java");
+        .isEqualTo(Paths.get("/usr/local/code/java/com/google/Bla.java").toString());
 
     PackageParser.convertFromOldFormat(options);
     assertThat(options.sources).hasSize(2);
-    assertThat(options.sources.get(0)).isEqualTo(
-        ArtifactLocation.newBuilder()
-            .setRootPath("/usr/local/code/")
-            .setRelativePath("java/com/google/Foo.java")
-            .build());
+    assertThat(options.sources.get(0))
+        .isEqualTo(
+            ArtifactLocation.newBuilder()
+                .setRootPath(Paths.get("/usr/local/code/").toString() + File.separator)
+                .setRelativePath(Paths.get("java/com/google/Foo.java").toString())
+                .build());
 
     mockIoProvider
         .addSource(options.sources.get(0),
@@ -295,10 +301,20 @@ public class PackageParserTest {
 
     String writtenString = mockIoProvider.writer.toString();
     assertThat(writtenString).doesNotContain("location");
-    assertThat(writtenString).contains(
-        "absolute_path: \"/usr/local/code/java/com/google/Foo.java\"");
-    assertThat(writtenString).contains(
-        "absolute_path: \"/usr/local/code/java/com/google/Bla.java\"");
+    assertThat(writtenString)
+        .contains(
+            "absolute_path: \""
+                + Paths.get("/usr/local/code/java/com/google/Foo.java")
+                    .toString()
+                    .replace("\\", "\\\\")
+                + "\"");
+    assertThat(writtenString)
+        .contains(
+            "absolute_path: \""
+                + Paths.get("/usr/local/code/java/com/google/Bla.java")
+                    .toString()
+                    .replace("\\", "\\\\")
+                + "\"");
   }
 
   @Test
@@ -311,19 +327,22 @@ public class PackageParserTest {
             + "bin/out,java/com/google/Bla.java",
     };
     PackageParser.PackageParserOptions options = PackageParser.parseArgs(args);
-    assertThat(options.outputManifest.toString()).isEqualTo("/tmp/out.manifest");
+    assertThat(options.outputManifest.toString())
+        .isEqualTo(Paths.get("/tmp/out.manifest").toString());
     assertThat(options.sources).hasSize(2);
-    assertThat(options.sources.get(0)).isEqualTo(
-        ArtifactLocation.newBuilder()
-            .setRelativePath("java/com/google/Foo.java")
-            .setIsSource(true)
-            .build());
-    assertThat(options.sources.get(1)).isEqualTo(
-        ArtifactLocation.newBuilder()
-            .setRootExecutionPathFragment("bin/out")
-            .setRelativePath("java/com/google/Bla.java")
-            .setIsSource(false)
-            .build());
+    assertThat(options.sources.get(0))
+        .isEqualTo(
+            ArtifactLocation.newBuilder()
+                .setRelativePath(Paths.get("java/com/google/Foo.java").toString())
+                .setIsSource(true)
+                .build());
+    assertThat(options.sources.get(1))
+        .isEqualTo(
+            ArtifactLocation.newBuilder()
+                .setRootExecutionPathFragment(Paths.get("bin/out").toString())
+                .setRelativePath(Paths.get("java/com/google/Bla.java").toString())
+                .setIsSource(false)
+                .build());
   }
 
 }