Handle problematic resource qualifiers in references to individual resources

ResourceFilter already handles problematic qualifiers in the
resource_configuration_filters attribute. Also handle them in references to
individual resources.

RELNOTES: none
PiperOrigin-RevId: 160969753

1 files changed, 17 insertions, 1 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/ResourceTestBase.java b/src/test/java/com/google/devtools/build/lib/rules/android/ResourceTestBase.java
index cada5518d9..27ca3510df 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/android/ResourceTestBase.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/android/ResourceTestBase.java
@@ -28,7 +28,9 @@ import com.google.devtools.build.lib.packages.RuleErrorConsumer;
 import com.google.devtools.build.lib.vfs.FileSystem;
 import com.google.devtools.build.lib.vfs.Path;
 import com.google.devtools.build.lib.vfs.inmemoryfs.InMemoryFileSystem;
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.List;
 import org.junit.After;
 import org.junit.Before;
 
@@ -51,12 +53,16 @@ public abstract class ResourceTestBase {
     private String attributeErrorAttribute = null;
     private String attributeErrorMessage = null;
 
+    private final List<String> ruleWarnings = new ArrayList<>();
+
     // Use an ArrayListMultimap since it allows duplicates - we'll want to know if a warning is
     // reported twice.
     private final Multimap<String, String> attributeWarnings = ArrayListMultimap.create();
 
     @Override
-    public void ruleWarning(String message) {}
+    public void ruleWarning(String message) {
+      ruleWarnings.add(message);
+    }
 
     @Override
     public void ruleError(String message) {
@@ -74,6 +80,16 @@ public abstract class ResourceTestBase {
       attributeErrorMessage = message;
     }
 
+    public Collection<String> getAndClearRuleWarnings() {
+      Collection<String> warnings = ImmutableList.copyOf(ruleWarnings);
+      ruleWarnings.clear();
+      return warnings;
+    }
+
+    public void assertNoRuleWarnings() {
+      assertThat(ruleWarnings).isEmpty();
+    }
+
     public Collection<String> getAndClearAttributeWarnings(String attrName) {
       if (!attributeWarnings.containsKey(attrName)) {
         return ImmutableList.of();