diff options
Diffstat (limited to 'src/test/java/com')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java | 41 |
1 files changed, 1 insertions, 40 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 25755bff87..e3971f489c 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 @@ -1199,8 +1199,6 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { public void testFilteredResourcesInvalidFilter() throws Exception { String badQualifier = "invalid-qualifier"; - useConfiguration("--experimental_android_resource_filtering_method", "filter_in_analysis"); - checkError( "java/r/android", "r", @@ -1268,10 +1266,7 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { mockAndroidSdkWithAapt2(); - useConfiguration( - "--android_sdk=//sdk:sdk", - "--experimental_android_resource_filtering_method", - "filter_in_analysis"); + useConfiguration("--android_sdk=//sdk:sdk"); ConfiguredTarget binary = scratchConfiguredTarget( @@ -1298,32 +1293,6 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { } @Test - public void testFilteredResourcesFilteringNotSpecified() throws Exception { - // TODO(asteinb): Once prefiltering is run by default, remove this test and remove the - // prefilter_resources flag from tests that currently explicitly specify to filter - List<String> resources = - ImmutableList.of("res/values/foo.xml", "res/values-en/foo.xml", "res/values-fr/foo.xml"); - String dir = "java/r/android"; - - ConfiguredTarget binary = - scratchConfiguredTarget( - dir, - "r", - "android_binary(name = 'r',", - " manifest = 'AndroidManifest.xml',", - " resource_configuration_filters = ['en'],", - " resource_files = ['" + Joiner.on("', '").join(resources) + "'])"); - - ResourceContainer directResources = getResourceContainer(binary, /* transitive= */ false); - - // Validate that the AndroidResourceProvider for this binary contains all values. - assertThat(resourceContentsPaths(dir, directResources)).containsExactlyElementsIn(resources); - - // Validate that the input to resource processing contains all values. - assertThat(resourceInputPaths(dir, directResources)).containsAllIn(resources); - } - - @Test public void testFilteredResourcesSimple() throws Exception { testDirectResourceFiltering( "en", @@ -1641,8 +1610,6 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { String dir = "java/r/android"; - useConfiguration("--experimental_android_resource_filtering_method", "filter_in_analysis"); - ConfiguredTarget binary = scratchConfiguredTarget( dir, @@ -1695,8 +1662,6 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { String dir = "java/r/android"; - useConfiguration("--experimental_android_resource_filtering_method", "filter_in_analysis"); - ConfiguredTarget binary = scratchConfiguredTarget( dir, @@ -1733,8 +1698,6 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { public void testFilteredTransitiveResourcesDifferentDensities() throws Exception { String dir = "java/r/android"; - useConfiguration("--experimental_android_resource_filtering_method", "filter_in_analysis"); - ConfiguredTarget binary = scratchConfiguredTarget( dir, @@ -1781,8 +1744,6 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { public void testFilteredResourcesAllFilteredOut() throws Exception { String dir = "java/r/android"; - useConfiguration("--experimental_android_resource_filtering_method", "filter_in_analysis"); - final String keptBaseDir = "partly_filtered_dir"; String removedLibraryDir = "fully_filtered_library_dir"; String removedBinaryDir = "fully_filtered_binary_dir"; |