diff options
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java | 56 |
1 files changed, 30 insertions, 26 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java index 38d691b39d..565be7bc05 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java @@ -1090,7 +1090,7 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { "java/com/google/android/neversayneveragain/libb1.jar_desugared.jar"); assertThat( resourceInputPaths( - "java/com/google/android/neversayneveragain", getValidatedData(b1))) + "java/com/google/android/neversayneveragain", getValidatedResources(b1))) .doesNotContain("res/values/resource.xml"); ConfiguredTarget b2 = getConfiguredTarget("//java/com/google/android/neversayneveragain:b2"); @@ -1106,8 +1106,8 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { "java/com/google/android/neversayneveragain/_dx/l3/libl3.jar_desugared.jar", "java/com/google/android/neversayneveragain/libb2.jar_desugared.jar"); assertThat( - resourceInputPaths( - "java/com/google/android/neversayneveragain", getValidatedData(b2))) + resourceInputPaths( + "java/com/google/android/neversayneveragain", getValidatedResources(b2))) .doesNotContain("res/values/resource.xml"); ConfiguredTarget b3 = getConfiguredTarget("//java/com/google/android/neversayneveragain:b3"); @@ -1123,8 +1123,8 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { assertThat(b3Inputs) .doesNotContain("java/com/google/android/neversayneveragain/libl2.jar_desugared.jar"); assertThat( - resourceInputPaths( - "java/com/google/android/neversayneveragain", getValidatedData(b3))) + resourceInputPaths( + "java/com/google/android/neversayneveragain", getValidatedResources(b3))) .contains("res/values/resource.xml"); } @@ -1217,7 +1217,7 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { // Ensure that the args are present ConfiguredTarget binary = getConfiguredTarget("//java/com/google/android:b"); - List<String> args = resourceArguments(getValidatedData(binary)); + List<String> args = resourceArguments(getValidatedResources(binary)); assertThat(flagValue("--resourceConfigs", args)).contains("en,fr"); } @@ -1271,7 +1271,8 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { " aapt_version = 'aapt2',", " densities = ['hdpi, , ', 'xhdpi'],", " resource_files = ['" + Joiner.on("', '").join(resources) + "'])"); - ValidatedAndroidData directResources = getValidatedData(binary, /* transitive= */ false); + ValidatedAndroidResources directResources = + getValidatedResources(binary, /* transitive= */ false); // Validate that the AndroidResourceProvider for this binary contains all values. assertThat(resourceContentsPaths(dir, directResources)).containsExactlyElementsIn(resources); @@ -1577,9 +1578,7 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { throws Exception { List<String> unexpectedResources = new ArrayList<>(); - List<String> expectedFiltered = new ArrayList<>(); for (String qualifier : unexpectedQualifiers) { - expectedFiltered.add(folderType + "-" + qualifier + "/foo." + suffix); unexpectedResources.add("res/" + folderType + "-" + qualifier + "/foo." + suffix); } @@ -1593,7 +1592,6 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { expectedResources.add(unqualifiedResource); } else { unexpectedResources.add(unqualifiedResource); - expectedFiltered.add(folderType + "/foo." + suffix); } // Default resources should never be filtered @@ -1620,7 +1618,8 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { .getOutputDirectoryName()) .isNull(); - ValidatedAndroidData directResources = getValidatedData(binary, /* transitive= */ false); + ValidatedAndroidResources directResources = + getValidatedResources(binary, /* transitive= */ false); // Validate that the AndroidResourceProvider for this binary contains only the filtered values. assertThat(resourceContentsPaths(dir, directResources)) @@ -1677,8 +1676,10 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { " deps = [':lib'],", " resource_configuration_filters = ['en'])"); - ValidatedAndroidData directResources = getValidatedData(binary, /* transitive= */ false); - ValidatedAndroidData transitiveResources = getValidatedData(binary, /* transitive= */ true); + ValidatedAndroidResources directResources = + getValidatedResources(binary, /* transitive= */ false); + ValidatedAndroidResources transitiveResources = + getValidatedResources(binary, /* transitive= */ true); assertThat(resourceContentsPaths(dir, directResources)).isEmpty(); @@ -1726,7 +1727,8 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { " 'multiple/res/drawable-en-mdpi/foo.png'],", ")"); - ValidatedAndroidData directResources = getValidatedData(binary, /* transitive= */ false); + ValidatedAndroidResources directResources = + getValidatedResources(binary, /* transitive= */ false); // All of the resources are transitive assertThat(resourceContentsPaths(dir, directResources)).isEmpty(); @@ -1780,7 +1782,7 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { " ])"); List<String> resourceProcessingArgs = - getGeneratingSpawnActionArgs(getValidatedData(binary).getRTxt()); + getGeneratingSpawnActionArgs(getValidatedResources(binary).getRTxt()); assertThat( Iterables.filter( @@ -1812,7 +1814,7 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { " manifest = 'AndroidManifest.xml')"); List<String> resourceProcessingArgs = - getGeneratingSpawnActionArgs(getValidatedData(binary).getRTxt()); + getGeneratingSpawnActionArgs(getValidatedResources(binary).getRTxt()); assertThat(resourceProcessingArgs).containsAllOf("--resourceConfigs", "ar-rXB,en,en-rXA"); } @@ -1829,7 +1831,7 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { useConfiguration("--experimental_android_throw_on_resource_conflict"); ConfiguredTarget binary = getConfiguredTarget("//java/r/android:r"); - List<String> resourceProcessingArgs = resourceArguments(getValidatedData(binary)); + List<String> resourceProcessingArgs = resourceArguments(getValidatedResources(binary)); assertThat(resourceProcessingArgs).contains("--throwOnResourceConflict"); } @@ -1841,7 +1843,7 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { * @return the paths to all artifacts from the input that are contained within the given * directory, relative to that directory. */ - private List<String> resourceContentsPaths(String dir, ValidatedAndroidData resource) { + private List<String> resourceContentsPaths(String dir, ValidatedAndroidResources resource) { return pathsToArtifacts(dir, resource.getArtifacts()); } @@ -1853,7 +1855,7 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { * @return the paths to all artifacts used as inputs to resource processing that are contained * within the given directory, relative to that directory. */ - private List<String> resourceInputPaths(String dir, ValidatedAndroidData resource) { + private List<String> resourceInputPaths(String dir, ValidatedAndroidResources resource) { return pathsToArtifacts(dir, resourceGeneratingAction(resource).getInputs()); } @@ -2010,8 +2012,10 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { AndroidResourcesInfo resourcesInfo = binary.getConfiguredTarget().get(AndroidResourcesInfo.PROVIDER); assertThat(resourcesInfo.getTransitiveAndroidResources()).hasSize(2); - ValidatedAndroidData firstDep = resourcesInfo.getTransitiveAndroidResources().toList().get(0); - ValidatedAndroidData secondDep = resourcesInfo.getTransitiveAndroidResources().toList().get(1); + ValidatedAndroidResources firstDep = + resourcesInfo.getTransitiveAndroidResources().toList().get(0); + ValidatedAndroidResources secondDep = + resourcesInfo.getTransitiveAndroidResources().toList().get(1); assertThat(args) .containsAllOf( @@ -3353,7 +3357,7 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { " nocompress_extensions = ['.apk', '.so'],", ")"); ConfiguredTarget binary = getConfiguredTarget("//java/r/android:r"); - ValidatedAndroidData resource = getValidatedData(binary); + ValidatedAndroidResources resource = getValidatedResources(binary); List<String> args = resourceArguments(resource); Artifact inputManifest = getFirstArtifactEndingWith( @@ -4318,7 +4322,7 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { ConfiguredTarget b = getDirectPrerequisite(a, "//java/b:b"); List<String> resourceProcessingArgs = - getGeneratingSpawnActionArgs(getValidatedData(a).getRTxt()); + getGeneratingSpawnActionArgs(getValidatedResources(a).getRTxt()); assertThat(resourceProcessingArgs).contains("AAPT2_PACKAGE"); String directData = @@ -4329,7 +4333,7 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { assertThat(resourceProcessingArgs).contains("--useCompiledResourcesForMerge"); List<String> resourceMergingArgs = - getGeneratingSpawnActionArgs(getValidatedData(b).getJavaClassJar()); + getGeneratingSpawnActionArgs(getValidatedResources(b).getJavaClassJar()); assertThat(resourceMergingArgs).contains("MERGE_COMPILED"); } @@ -4362,7 +4366,7 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { ConfiguredTarget b = getDirectPrerequisite(a, "//java/b:b"); List<String> resourceProcessingArgs = - getGeneratingSpawnActionArgs(getValidatedData(a).getRTxt()); + getGeneratingSpawnActionArgs(getValidatedResources(a).getRTxt()); assertThat(resourceProcessingArgs).contains("PACKAGE"); String directData = @@ -4372,7 +4376,7 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { assertThat(directData).contains("merged.bin"); List<String> compiledResourceMergingArgs = - getGeneratingSpawnActionArgs(getValidatedData(b).getJavaClassJar()); + getGeneratingSpawnActionArgs(getValidatedResources(b).getJavaClassJar()); assertThat(compiledResourceMergingArgs).contains("MERGE_COMPILED"); |