From 25f112e0eba147f14ac51736c41ced3d6b284b57 Mon Sep 17 00:00:00 2001 From: asteinb Date: Wed, 8 Aug 2018 09:52:27 -0700 Subject: Remove ValidatedAndroidData interface Now that ValidatedAndroidResources is the only implementation, we can just use that instead. RELNOTES: none PiperOrigin-RevId: 207900844 --- .../build/lib/rules/android/AarImportTest.java | 12 ++--- .../build/lib/rules/android/AndroidBinaryTest.java | 56 ++++++++++++---------- .../rules/android/AndroidBuildViewTestCase.java | 15 +----- .../lib/rules/android/AndroidLibraryTest.java | 21 ++++---- .../lib/rules/android/AndroidResourcesTest.java | 2 +- .../rules/android/ResourceFilterFactoryTest.java | 16 +++---- 6 files changed, 56 insertions(+), 66 deletions(-) (limited to 'src/test') diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AarImportTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AarImportTest.java index bf04757007..61c7365aa6 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/android/AarImportTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/android/AarImportTest.java @@ -144,12 +144,12 @@ public class AarImportTest extends BuildViewTestCase { .collect(Collectors.toSet())) .containsExactly("a/foo_symbols/symbols.zip", "a/library_symbols/symbols.zip"); - NestedSet directResources = + NestedSet directResources = libTarget.get(AndroidResourcesInfo.PROVIDER).getDirectAndroidResources(); assertThat(directResources).hasSize(1); - ValidatedAndroidData resourceContainer = directResources.iterator().next(); + ValidatedAndroidResources resourceContainer = directResources.iterator().next(); Truth.assertThat(resourceContainer.getAapt2RTxt()).isNotNull(); } @@ -157,11 +157,11 @@ public class AarImportTest extends BuildViewTestCase { public void testResourcesProvided() throws Exception { ConfiguredTarget aarImportTarget = getConfiguredTarget("//a:foo"); - NestedSet directResources = + NestedSet directResources = aarImportTarget.get(AndroidResourcesInfo.PROVIDER).getDirectAndroidResources(); assertThat(directResources).hasSize(1); - ValidatedAndroidData resourceContainer = directResources.iterator().next(); + ValidatedAndroidResources resourceContainer = directResources.iterator().next(); assertThat(resourceContainer.getManifest()).isNotNull(); Artifact resourceTreeArtifact = Iterables.getOnlyElement(resourceContainer.getResources()); @@ -182,7 +182,7 @@ public class AarImportTest extends BuildViewTestCase { @Test public void testResourcesExtractor() throws Exception { - ValidatedAndroidData resourceContainer = + ValidatedAndroidResources resourceContainer = getConfiguredTarget("//a:foo") .get(AndroidResourcesInfo.PROVIDER) .getDirectAndroidResources() @@ -384,7 +384,7 @@ public class AarImportTest extends BuildViewTestCase { @Test public void testNoCustomJavaPackage() throws Exception { - ValidatedAndroidData resourceContainer = + ValidatedAndroidResources resourceContainer = getConfiguredTarget("//a:foo") .get(AndroidResourcesInfo.PROVIDER) .getDirectAndroidResources() 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 args = resourceArguments(getValidatedData(binary)); + List 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 unexpectedResources = new ArrayList<>(); - List 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 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 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 resourceProcessingArgs = resourceArguments(getValidatedData(binary)); + List 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 resourceContentsPaths(String dir, ValidatedAndroidData resource) { + private List 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 resourceInputPaths(String dir, ValidatedAndroidData resource) { + private List 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 args = resourceArguments(resource); Artifact inputManifest = getFirstArtifactEndingWith( @@ -4318,7 +4322,7 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { ConfiguredTarget b = getDirectPrerequisite(a, "//java/b:b"); List 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 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 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 compiledResourceMergingArgs = - getGeneratingSpawnActionArgs(getValidatedData(b).getJavaClassJar()); + getGeneratingSpawnActionArgs(getValidatedResources(b).getJavaClassJar()); assertThat(compiledResourceMergingArgs).contains("MERGE_COMPILED"); diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBuildViewTestCase.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBuildViewTestCase.java index a360befaac..7a424bf829 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBuildViewTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBuildViewTestCase.java @@ -115,12 +115,12 @@ public abstract class AndroidBuildViewTestCase extends BuildViewTestCase { .isNotNull(); } - protected List resourceArguments(ValidatedAndroidData resource) + protected List resourceArguments(ValidatedAndroidResources resource) throws CommandLineExpansionException { return getGeneratingSpawnActionArgs(resource.getApk()); } - protected SpawnAction resourceGeneratingAction(ValidatedAndroidData resource) { + protected SpawnAction resourceGeneratingAction(ValidatedAndroidResources resource) { return getGeneratingSpawnAction(resource.getApk()); } @@ -130,17 +130,6 @@ public abstract class AndroidBuildViewTestCase extends BuildViewTestCase { protected static ValidatedAndroidResources getValidatedResources( ConfiguredTarget target, boolean transitive) { - ValidatedAndroidData validated = getValidatedData(target, transitive); - assertThat(validated).isInstanceOf(ValidatedAndroidResources.class); - return (ValidatedAndroidResources) validated; - } - - protected static ValidatedAndroidData getValidatedData(ConfiguredTarget target) { - return getValidatedData(target, /* transitive = */ false); - } - - protected static ValidatedAndroidData getValidatedData( - ConfiguredTarget target, boolean transitive) { Preconditions.checkNotNull(target); final AndroidResourcesInfo info = target.get(AndroidResourcesInfo.PROVIDER); assertThat(info).named("No android resources exported from the target.").isNotNull(); diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java index d045f95ee2..7d4fe45f1a 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java @@ -33,7 +33,7 @@ import com.google.devtools.build.lib.analysis.ConfiguredTarget; import com.google.devtools.build.lib.analysis.OutputGroupInfo; import com.google.devtools.build.lib.analysis.actions.FileWriteAction; import com.google.devtools.build.lib.analysis.actions.SpawnAction; -import com.google.devtools.build.lib.analysis.config.BuildConfiguration; +import com.google.devtools.build.lib.analysis.config.BuildConfiguration.StrictDepsMode; import com.google.devtools.build.lib.analysis.configuredtargets.FileConfiguredTarget; import com.google.devtools.build.lib.analysis.configuredtargets.OutputFileConfiguredTarget; import com.google.devtools.build.lib.cmdline.Label; @@ -185,8 +185,7 @@ public class AndroidLibraryTest extends AndroidBuildViewTestCase { "android_library(name = 'b', srcs = ['B.java'])"); Artifact artifact = getFileConfiguredTarget("//java/android/strict:libb.jar").getArtifact(); JavaCompileAction compileAction = (JavaCompileAction) getGeneratingAction(artifact); - assertThat(compileAction.getStrictJavaDepsMode()) - .isEqualTo(BuildConfiguration.StrictDepsMode.OFF); + assertThat(compileAction.getStrictJavaDepsMode()).isEqualTo(StrictDepsMode.OFF); } @Test @@ -195,8 +194,7 @@ public class AndroidLibraryTest extends AndroidBuildViewTestCase { "android_library(name = 'b', srcs = ['B.java'])"); Artifact artifact = getFileConfiguredTarget("//java/android/strict:libb.jar").getArtifact(); JavaCompileAction compileAction = (JavaCompileAction) getGeneratingAction(artifact); - assertThat(compileAction.getStrictJavaDepsMode()) - .isEqualTo(BuildConfiguration.StrictDepsMode.ERROR); + assertThat(compileAction.getStrictJavaDepsMode()).isEqualTo(StrictDepsMode.ERROR); } @Test @@ -206,8 +204,7 @@ public class AndroidLibraryTest extends AndroidBuildViewTestCase { "android_library(name = 'b', srcs = ['B.java'])"); Artifact artifact = getFileConfiguredTarget("//java/android/strict:libb.jar").getArtifact(); JavaCompileAction compileAction = (JavaCompileAction) getGeneratingAction(artifact); - assertThat(compileAction.getStrictJavaDepsMode()) - .isEqualTo(BuildConfiguration.StrictDepsMode.WARN); + assertThat(compileAction.getStrictJavaDepsMode()).isEqualTo(StrictDepsMode.WARN); } @Test @@ -941,7 +938,7 @@ public class AndroidLibraryTest extends AndroidBuildViewTestCase { " deps = [':bar'])", "android_library(name = 'bar',", " manifest = 'AndroidManifest.xml')"); - Function getLabel = ValidatedAndroidData::getLabel; + Function getLabel = ValidatedAndroidResources::getLabel; ConfiguredTarget foo = getConfiguredTarget("//java/apps/android:foo"); assertThat( Iterables.transform( @@ -1033,7 +1030,7 @@ public class AndroidLibraryTest extends AndroidBuildViewTestCase { NestedSet filesToBuild = getFilesToBuild(target); Set artifacts = actionsTestUtil().artifactClosureOf(filesToBuild); - ValidatedAndroidData resources = + ValidatedAndroidResources resources = Iterables.getOnlyElement( target.get(AndroidResourcesInfo.PROVIDER).getDirectAndroidResources()); @@ -1152,7 +1149,7 @@ public class AndroidLibraryTest extends AndroidBuildViewTestCase { .isEqualTo( ActionsTestUtil.getFirstArtifactEndingWith( artifactClosure, "java/android/AndroidManifest.xml")); - ValidatedAndroidData resources = + ValidatedAndroidResources resources = getOnlyElement( getConfiguredTarget("//java/android:r") .get(AndroidResourcesInfo.PROVIDER) @@ -1184,7 +1181,7 @@ public class AndroidLibraryTest extends AndroidBuildViewTestCase { .isEqualTo( ActionsTestUtil.getFirstArtifactEndingWith( artifactClosure, "handwriting/AndroidManifest.xml")); - ValidatedAndroidData resources = + ValidatedAndroidResources resources = getOnlyElement( getConfiguredTarget("//research/handwriting/java/com/google/research/handwriting:r") .get(AndroidResourcesInfo.PROVIDER) @@ -1218,7 +1215,7 @@ public class AndroidLibraryTest extends AndroidBuildViewTestCase { .isEqualTo( ActionsTestUtil.getFirstArtifactEndingWith( artifactClosure, "java/android/AndroidManifest.xml")); - ValidatedAndroidData resources = + ValidatedAndroidResources resources = getOnlyElement( getConfiguredTarget("//java/android:r") .get(AndroidResourcesInfo.PROVIDER) diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidResourcesTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidResourcesTest.java index d60f365b71..a57588a1f1 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidResourcesTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidResourcesTest.java @@ -467,7 +467,7 @@ public class AndroidResourcesTest extends ResourceTestBase { null, null); - ValidatedAndroidData validated = + ValidatedAndroidResources validated = processedData .generateRClass( AndroidDataContext.forNative(ruleContext), diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/ResourceFilterFactoryTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/ResourceFilterFactoryTest.java index 5ab028a7cd..d09214c3e0 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/android/ResourceFilterFactoryTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/android/ResourceFilterFactoryTest.java @@ -38,9 +38,9 @@ import org.junit.runners.JUnit4; @RunWith(JUnit4.class) public class ResourceFilterFactoryTest extends ResourceTestBase { - private NestedSet getResources(ImmutableList... resources) + private NestedSet getResources(ImmutableList... resources) throws Exception { - NestedSetBuilder builder = NestedSetBuilder.naiveLinkOrder(); + NestedSetBuilder builder = NestedSetBuilder.naiveLinkOrder(); for (ImmutableList resourceList : resources) { builder.add(getResources(resourceList)); } @@ -386,29 +386,29 @@ public class ResourceFilterFactoryTest extends ResourceTestBase { .containsExactly(directResourceToKeep, transitiveResourceToKeep) .inOrder(); - List directContainers = + List directContainers = filteredResourceDeps.getDirectResourceContainers().toList(); assertThat(directContainers).hasSize(2); - ValidatedAndroidData directToDiscard = directContainers.get(0); + ValidatedAndroidResources directToDiscard = directContainers.get(0); assertThat(directToDiscard.getResources()).isEmpty(); assertThat(directToDiscard.getResourceRoots()).isEmpty(); - ValidatedAndroidData directToKeep = directContainers.get(1); + ValidatedAndroidResources directToKeep = directContainers.get(1); assertThat(directToKeep.getResources()).containsExactly(directResourceToKeep); assertThat(directToKeep.getResourceRoots()) .containsExactly( directResourceToKeep.getExecPath().getParentDirectory().getParentDirectory()); - List transitiveContainers = + List transitiveContainers = filteredResourceDeps.getTransitiveResourceContainers().toList(); assertThat(transitiveContainers).hasSize(2); - ValidatedAndroidData transitiveToDiscard = transitiveContainers.get(0); + ValidatedAndroidResources transitiveToDiscard = transitiveContainers.get(0); assertThat(transitiveToDiscard.getResources()).isEmpty(); assertThat(transitiveToDiscard.getResourceRoots()).isEmpty(); - ValidatedAndroidData transitiveToKeep = transitiveContainers.get(1); + ValidatedAndroidResources transitiveToKeep = transitiveContainers.get(1); assertThat(transitiveToKeep.getResources()).containsExactly(transitiveResourceToKeep); assertThat(transitiveToKeep.getResourceRoots()) .containsExactly( -- cgit v1.2.3