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

4 files changed, 144 insertions, 105 deletions

diff --git a/src/test/java/com/google/devtools/build/android/AndroidResourceCompilationActionTest.java b/src/test/java/com/google/devtools/build/android/AndroidResourceCompilationActionTest.java
index 17b4ab48a3..9440eb32e0 100644
--- a/src/test/java/com/google/devtools/build/android/AndroidResourceCompilationActionTest.java
+++ b/src/test/java/com/google/devtools/build/android/AndroidResourceCompilationActionTest.java
@@ -25,10 +25,12 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
+import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.nio.file.attribute.FileTime;
 import java.util.Collections;
 import java.util.List;
@@ -110,13 +112,23 @@ public class AndroidResourceCompilationActionTest {
 
     Path jarPath = tempDir.resolve("app_resources.jar");
 
-    AndroidResourceCompilationAction.main(ImmutableList.<String>of(
-        "--primaryRTxt", binarySymbols.toString(),
-        "--primaryManifest", binaryManifest.toString(),
-        "--libraries",
-        libFooSymbols + ":" + libFooManifest + "," + libBarSymbols + ":" + libBarManifest,
-        "--classJarOutput", jarPath.toString()
-    ).toArray(new String[0]));
+    AndroidResourceCompilationAction.main(
+        ImmutableList.<String>of(
+                "--primaryRTxt",
+                binarySymbols.toString(),
+                "--primaryManifest",
+                binaryManifest.toString(),
+                "--libraries",
+                libFooSymbols
+                    + File.pathSeparator
+                    + libFooManifest
+                    + ","
+                    + libBarSymbols
+                    + File.pathSeparator
+                    + libBarManifest,
+                "--classJarOutput",
+                jarPath.toString())
+            .toArray(new String[0]));
 
     assertThat(Files.exists(jarPath)).isTrue();
     assertThat(Files.getLastModifiedTime(jarPath)).isEqualTo(FileTime.fromMillis(0));
@@ -124,22 +136,22 @@ public class AndroidResourceCompilationActionTest {
     try (ZipFile zip = new ZipFile(jarPath.toFile())) {
       List<? extends ZipEntry> zipEntries = Collections.list(zip.entries());
       Iterable<String> entries = getZipFilenames(zipEntries);
-      assertThat(entries).containsExactly(
-          "com/google/foo/R$attr.class",
-          "com/google/foo/R$id.class",
-          "com/google/foo/R$string.class",
-          "com/google/foo/R.class",
-          "com/google/bar/R$attr.class",
-          "com/google/bar/R$drawable.class",
-          "com/google/bar/R.class",
-          "com/google/app/R$attr.class",
-          "com/google/app/R$drawable.class",
-          "com/google/app/R$id.class",
-          "com/google/app/R$integer.class",
-          "com/google/app/R$string.class",
-          "com/google/app/R.class",
-          "META-INF/MANIFEST.MF"
-      );
+      assertThat(entries)
+          .containsExactly(
+              Paths.get("com/google/foo/R$attr.class").toString(),
+              Paths.get("com/google/foo/R$id.class").toString(),
+              Paths.get("com/google/foo/R$string.class").toString(),
+              Paths.get("com/google/foo/R.class").toString(),
+              Paths.get("com/google/bar/R$attr.class").toString(),
+              Paths.get("com/google/bar/R$drawable.class").toString(),
+              Paths.get("com/google/bar/R.class").toString(),
+              Paths.get("com/google/app/R$attr.class").toString(),
+              Paths.get("com/google/app/R$drawable.class").toString(),
+              Paths.get("com/google/app/R$id.class").toString(),
+              Paths.get("com/google/app/R$integer.class").toString(),
+              Paths.get("com/google/app/R$string.class").toString(),
+              Paths.get("com/google/app/R.class").toString(),
+              Paths.get("META-INF/MANIFEST.MF").toString());
     }
   }
 
@@ -174,15 +186,15 @@ public class AndroidResourceCompilationActionTest {
     try (ZipFile zip = new ZipFile(jarPath.toFile())) {
       List<? extends ZipEntry> zipEntries = Collections.list(zip.entries());
       Iterable<String> entries = getZipFilenames(zipEntries);
-      assertThat(entries).containsExactly(
-          "com/google/app/R$attr.class",
-          "com/google/app/R$drawable.class",
-          "com/google/app/R$id.class",
-          "com/google/app/R$integer.class",
-          "com/google/app/R$string.class",
-          "com/google/app/R.class",
-          "META-INF/MANIFEST.MF"
-      );
+      assertThat(entries)
+          .containsExactly(
+              Paths.get("com/google/app/R$attr.class").toString(),
+              Paths.get("com/google/app/R$drawable.class").toString(),
+              Paths.get("com/google/app/R$id.class").toString(),
+              Paths.get("com/google/app/R$integer.class").toString(),
+              Paths.get("com/google/app/R$string.class").toString(),
+              Paths.get("com/google/app/R.class").toString(),
+              Paths.get("META-INF/MANIFEST.MF").toString());
     }
   }
 
@@ -199,9 +211,7 @@ public class AndroidResourceCompilationActionTest {
     try (ZipFile zip = new ZipFile(jarPath.toFile())) {
       List<? extends ZipEntry> zipEntries = Collections.list(zip.entries());
       Iterable<String> entries = getZipFilenames(zipEntries);
-      assertThat(entries).containsExactly(
-          "META-INF/MANIFEST.MF"
-      );
+      assertThat(entries).containsExactly(Paths.get("META-INF/MANIFEST.MF").toString());
     }
   }
 
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());
   }
 
 }
diff --git a/src/test/java/com/google/devtools/build/lib/ideinfo/AndroidStudioInfoAspectTest.java b/src/test/java/com/google/devtools/build/lib/ideinfo/AndroidStudioInfoAspectTest.java
index de4392f844..7000ed487f 100644
--- a/src/test/java/com/google/devtools/build/lib/ideinfo/AndroidStudioInfoAspectTest.java
+++ b/src/test/java/com/google/devtools/build/lib/ideinfo/AndroidStudioInfoAspectTest.java
@@ -57,12 +57,13 @@ public class AndroidStudioInfoAspectTest extends AndroidStudioInfoAspectTestBase
     RuleIdeInfo ruleIdeInfo = getRuleInfoAndVerifyLabel(
         "//com/google/example:simple", ruleIdeInfos);
     ArtifactLocation location = ruleIdeInfo.getBuildFileArtifactLocation();
-    assertThat(location.getRelativePath()).isEqualTo("com/google/example/BUILD");
+    assertThat(Paths.get(location.getRelativePath()).toString())
+        .isEqualTo(Paths.get("com/google/example/BUILD").toString());
     assertThat(location.getIsSource()).isTrue();
     if (testLegacyAswbPluginVersionCompatibility()) {
       assertThat(ruleIdeInfo.getBuildFile()).isEqualTo(buildFilePath.toString());
       assertThat(Paths.get(location.getRootPath(), location.getRelativePath()).toString())
-          .isEqualTo(buildFilePath.toString());
+          .isEqualTo(Paths.get(buildFilePath.toString()).toString());
       assertThat(ruleIdeInfo.getKind()).isEqualTo(Kind.JAVA_LIBRARY);
     }
     assertThat(ruleIdeInfo.getKindString()).isEqualTo("java_library");
@@ -1082,11 +1083,12 @@ public class AndroidStudioInfoAspectTest extends AndroidStudioInfoAspectTestBase
         ruleIdeInfos);
     RuleIdeInfo toolchainInfo = toolchainEntry.getValue();
     ArtifactLocation location = ruleInfo.getBuildFileArtifactLocation();
-    assertThat(location.getRelativePath()).isEqualTo("com/google/example/BUILD");
+    assertThat(Paths.get(location.getRelativePath()).toString())
+        .isEqualTo(Paths.get("com/google/example/BUILD").toString());
     if (testLegacyAswbPluginVersionCompatibility()) {
       assertThat(ruleInfo.getBuildFile()).isEqualTo(buildFilePath.toString());
       assertThat(Paths.get(location.getRootPath(), location.getRelativePath()).toString())
-          .isEqualTo(buildFilePath.toString());
+          .isEqualTo(Paths.get(buildFilePath.toString()).toString());
     }
 
     assertThat(ruleInfo.hasCRuleIdeInfo()).isTrue();
@@ -1109,12 +1111,12 @@ public class AndroidStudioInfoAspectTest extends AndroidStudioInfoAspectTestBase
     RuleIdeInfo ruleIdeInfo = getRuleInfoAndVerifyLabel(
         "//com/google/example:simple", ruleIdeInfos);
     ArtifactLocation location = ruleIdeInfo.getBuildFileArtifactLocation();
-    assertThat(location.getRelativePath()).isEqualTo("com/google/example/BUILD");
-
+    assertThat(Paths.get(location.getRelativePath()).toString())
+        .isEqualTo(Paths.get("com/google/example/BUILD").toString());
     if (testLegacyAswbPluginVersionCompatibility()) {
       assertThat(ruleIdeInfo.getBuildFile()).isEqualTo(buildFilePath.toString());
       assertThat(Paths.get(location.getRootPath(), location.getRelativePath()).toString())
-          .isEqualTo(buildFilePath.toString());
+          .isEqualTo(Paths.get(buildFilePath.toString()).toString());
       assertThat(ruleIdeInfo.getKind()).isEqualTo(Kind.CC_LIBRARY);
     }
 
@@ -1266,11 +1268,12 @@ public class AndroidStudioInfoAspectTest extends AndroidStudioInfoAspectTestBase
     RuleIdeInfo ruleIdeInfo = getRuleInfoAndVerifyLabel(
         "//com/google/example:simple", ruleIdeInfos);
     ArtifactLocation location = ruleIdeInfo.getBuildFileArtifactLocation();
-    assertThat(location.getRelativePath()).isEqualTo("com/google/example/BUILD");
+    assertThat(Paths.get(location.getRelativePath()).toString())
+        .isEqualTo(Paths.get("com/google/example/BUILD").toString());
     if (testLegacyAswbPluginVersionCompatibility()) {
       assertThat(ruleIdeInfo.getBuildFile()).isEqualTo(buildFilePath.toString());
       assertThat(Paths.get(location.getRootPath(), location.getRelativePath()).toString())
-          .isEqualTo(buildFilePath.toString());
+          .isEqualTo(Paths.get(buildFilePath.toString()).toString());
       assertThat(ruleIdeInfo.getKind()).isEqualTo(Kind.CC_BINARY);
     }
     assertThat(ruleIdeInfo.getKindString()).isEqualTo("cc_binary");
@@ -1307,11 +1310,12 @@ public class AndroidStudioInfoAspectTest extends AndroidStudioInfoAspectTestBase
     RuleIdeInfo ruleIdeInfo = getRuleInfoAndVerifyLabel(
         "//com/google/example:simple", ruleIdeInfos);
     ArtifactLocation location = ruleIdeInfo.getBuildFileArtifactLocation();
-    assertThat(location.getRelativePath()).isEqualTo("com/google/example/BUILD");
+    assertThat(Paths.get(location.getRelativePath()).toString())
+        .isEqualTo(Paths.get("com/google/example/BUILD").toString());
     if (testLegacyAswbPluginVersionCompatibility()) {
       assertThat(ruleIdeInfo.getBuildFile()).isEqualTo(buildFilePath.toString());
       assertThat(Paths.get(location.getRootPath(), location.getRelativePath()).toString())
-          .isEqualTo(buildFilePath.toString());
+          .isEqualTo(Paths.get(buildFilePath.toString()).toString());
       assertThat(ruleIdeInfo.getKind()).isEqualTo(Kind.CC_TEST);
     }
     assertThat(ruleIdeInfo.getKindString()).isEqualTo("cc_test");
@@ -1585,11 +1589,12 @@ public class AndroidStudioInfoAspectTest extends AndroidStudioInfoAspectTestBase
         ruleIdeInfos);
     RuleIdeInfo toolchainInfo = toolchainEntry.getValue();
     ArtifactLocation location = ruleInfo.getBuildFileArtifactLocation();
-    assertThat(location.getRelativePath()).isEqualTo("com/google/example/BUILD");
+    assertThat(Paths.get(location.getRelativePath()).toString())
+        .isEqualTo(Paths.get("com/google/example/BUILD").toString());
     if (testLegacyAswbPluginVersionCompatibility()) {
       assertThat(ruleInfo.getBuildFile()).isEqualTo(buildFilePath.toString());
       assertThat(Paths.get(location.getRootPath(), location.getRelativePath()).toString())
-          .isEqualTo(buildFilePath.toString());
+          .isEqualTo(Paths.get(buildFilePath.toString()).toString());
     }
 
     assertThat(ruleInfo.hasCToolchainIdeInfo()).isFalse();