From 9612a3fe7d6ec4d4e8c8bd22ab4acdbffbe09e0a Mon Sep 17 00:00:00 2001 From: ajmichael Date: Fri, 6 Apr 2018 12:47:09 -0700 Subject: Stop passing location of testdata as jvm property. We can use the builtin env variables to get this. RELNOTES: None PiperOrigin-RevId: 191926221 --- .../java/com/google/devtools/build/android/BUILD | 3 --- .../build/android/ManifestMergerActionTest.java | 23 ++++++++-------------- 2 files changed, 8 insertions(+), 18 deletions(-) (limited to 'src/test/java/com/google') diff --git a/src/test/java/com/google/devtools/build/android/BUILD b/src/test/java/com/google/devtools/build/android/BUILD index 37970afa76..afb17513ba 100644 --- a/src/test/java/com/google/devtools/build/android/BUILD +++ b/src/test/java/com/google/devtools/build/android/BUILD @@ -197,9 +197,6 @@ java_test( data = [ "//src/test/java/com/google/devtools/build/android/testing/manifestmerge:test_data", ], - jvm_flags = [ - "-Dtestdatadir=io_bazel/src/test/java/com/google/devtools/build/android/testing/manifestmerge", - ], deps = [ ":test_utils", "//src/tools/android/java/com/google/devtools/build/android:android_builder_lib", diff --git a/src/test/java/com/google/devtools/build/android/ManifestMergerActionTest.java b/src/test/java/com/google/devtools/build/android/ManifestMergerActionTest.java index 264d6f9e85..b39f34c835 100644 --- a/src/test/java/com/google/devtools/build/android/ManifestMergerActionTest.java +++ b/src/test/java/com/google/devtools/build/android/ManifestMergerActionTest.java @@ -95,10 +95,6 @@ public class ManifestMergerActionTest { @Test public void testMerge_GenerateDummyManifest() throws Exception { - final Path workingDir = Paths.get(System.getProperty("user.dir")); - assertThat(workingDir.toFile().exists()).isTrue(); - assertThat(workingDir.toFile().isDirectory()).isTrue(); - Files.createDirectories(working.resolve("output")); Path mergedManifest = working.resolve("output/mergedManifest.xml"); @@ -124,18 +120,15 @@ public class ManifestMergerActionTest { } @Test public void testMerge() throws Exception { - final Path workingDir = Paths.get(System.getProperty("user.dir")); - assertThat(workingDir.toFile().exists()).isTrue(); - assertThat(workingDir.toFile().isDirectory()).isTrue(); - - String dataDir = System.getProperty("testdatadir"); - if (dataDir.charAt(dataDir.length() - 1) != '/') { - dataDir = dataDir + '/'; - } + String dataDir = + Paths.get(System.getenv("TEST_WORKSPACE"), System.getenv("TEST_BINARY")) + .resolveSibling("testing/manifestmerge") + .toString() + .replace("\\", "/"); - final Path mergerManifest = rlocation(dataDir + "merger/AndroidManifest.xml"); - final Path mergeeManifestOne = rlocation(dataDir + "mergeeOne/AndroidManifest.xml"); - final Path mergeeManifestTwo = rlocation(dataDir + "mergeeTwo/AndroidManifest.xml"); + final Path mergerManifest = rlocation(dataDir + "/merger/AndroidManifest.xml"); + final Path mergeeManifestOne = rlocation(dataDir + "/mergeeOne/AndroidManifest.xml"); + final Path mergeeManifestTwo = rlocation(dataDir + "/mergeeTwo/AndroidManifest.xml"); assertThat(mergerManifest.toFile().exists()).isTrue(); assertThat(mergeeManifestOne.toFile().exists()).isTrue(); assertThat(mergeeManifestTwo.toFile().exists()).isTrue(); -- cgit v1.2.3