diff options
author | Yun Peng <pcloudy@google.com> | 2016-07-25 12:52:13 +0000 |
---|---|---|
committer | Damien Martin-Guillerez <dmarting@google.com> | 2016-07-25 14:28:00 +0000 |
commit | d5a301daedccb45a372ff96a2b1fc9128a8229ab (patch) | |
tree | f31ab267207d0e3a76506e456bb3c1d48a6b37f6 /src/test | |
parent | 0012c3524f672bce22d4bf06e49187f6bdaca4a4 (diff) |
Fixed PackageParserTest on Windows
fixes #1557
--
Change-Id: Iad9eddc754a9bd29671a1699c3ca88e6ecb95fb9
Reviewed-on: https://bazel-review.googlesource.com/#/c/4155
MOS_MIGRATED_REVID=128347449
Diffstat (limited to 'src/test')
-rw-r--r-- | src/test/java/com/google/devtools/build/android/ideinfo/PackageParserTest.java | 30 |
1 files changed, 15 insertions, 15 deletions
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 b830bd14be..b302641788 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 @@ -23,12 +23,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.devtools.build.lib.ideinfo.androidstudio.PackageManifestOuterClass.ArtifactLocation; import com.google.protobuf.MessageLite; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; - import java.io.BufferedReader; import java.io.ByteArrayInputStream; import java.io.File; @@ -43,8 +37,11 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.List; import java.util.Map; - import javax.annotation.Nonnull; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Unit tests for {@link PackageParser} @@ -261,14 +258,17 @@ public class PackageParserTest { @Test public void testHandlesOldFormat() throws Exception { - String[] args = new String[] { - "--output_manifest", - "/tmp/out.manifest", - "--sources_absolute_paths", - "/usr/local/code/java/com/google/Foo.java:/usr/local/code/java/com/google/Bla.java", - "--sources_execution_paths", - "java/com/google/Foo.java:java/com/google/Bla.java" - }; + String[] args = + new String[] { + "--output_manifest", + "/tmp/out.manifest", + "--sources_absolute_paths", + "/usr/local/code/java/com/google/Foo.java" + + File.pathSeparator + + "/usr/local/code/java/com/google/Bla.java", + "--sources_execution_paths", + "java/com/google/Foo.java" + File.pathSeparator + "java/com/google/Bla.java" + }; PackageParser.PackageParserOptions options = PackageParser.parseArgs(args); assertThat(options.outputManifest.toString()) .isEqualTo(Paths.get("/tmp/out.manifest").toString()); |