When creating RuleContext, explicitly pass the set of attributes an attached Aspect provides.
--
MOS_MIGRATED_REVID=106882046
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/AspectTest.java b/src/test/java/com/google/devtools/build/lib/analysis/AspectTest.java
index 33881a8..7341ba1 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/AspectTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/AspectTest.java
@@ -14,10 +14,24 @@
package com.google.devtools.build.lib.analysis;
import static com.google.common.truth.Truth.assertThat;
+import static com.google.devtools.build.lib.analysis.RuleConfiguredTarget.Mode.TARGET;
+import static com.google.devtools.build.lib.analysis.util.TestAspects.EMPTY_LATE_BOUND_LABEL;
+import static com.google.devtools.build.lib.packages.Attribute.attr;
+import static com.google.devtools.build.lib.packages.BuildType.LABEL;
+import static com.google.devtools.build.lib.packages.BuildType.LABEL_LIST;
import com.google.devtools.build.lib.analysis.util.AnalysisTestCase;
import com.google.devtools.build.lib.analysis.util.TestAspects;
+import com.google.devtools.build.lib.analysis.util.TestAspects.AspectInfo;
import com.google.devtools.build.lib.analysis.util.TestAspects.AspectRequiringRule;
+import com.google.devtools.build.lib.analysis.util.TestAspects.BaseRule;
+import com.google.devtools.build.lib.analysis.util.TestAspects.DummyRuleFactory;
+import com.google.devtools.build.lib.analysis.util.TestAspects.RuleInfo;
+import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
+import com.google.devtools.build.lib.collect.nestedset.Order;
+import com.google.devtools.build.lib.packages.AspectDefinition;
+import com.google.devtools.build.lib.packages.AspectParameters;
+import com.google.devtools.build.lib.packages.RuleClass;
import com.google.devtools.build.lib.testutil.TestRuleClassProvider;
import org.junit.After;
@@ -46,7 +60,6 @@
super.tearDown();
}
- @SafeVarargs
private final void setRules(RuleDefinition... rules) throws Exception {
ConfiguredRuleClassProvider.Builder builder =
new ConfiguredRuleClassProvider.Builder();
@@ -71,7 +84,7 @@
"aspect(name='b', foo=[])");
ConfiguredTarget a = getConfiguredTarget("//a:a");
- assertThat(a.getProvider(TestAspects.RuleInfo.class).getData())
+ assertThat(a.getProvider(RuleInfo.class).getData())
.containsExactly("aspect //a:b", "rule //a:a");
}
@@ -85,8 +98,7 @@
"liar(name='b', foo=[])");
ConfiguredTarget a = getConfiguredTarget("//a:a");
- assertThat(a.getProvider(TestAspects.RuleInfo.class).getData())
- .containsExactly("rule //a:a");
+ assertThat(a.getProvider(RuleInfo.class).getData()).containsExactly("rule //a:a");
}
@Test
@@ -99,7 +111,7 @@
"honest(name='b', foo=[])");
ConfiguredTarget a = getConfiguredTarget("//a:a");
- assertThat(a.getProvider(TestAspects.RuleInfo.class).getData())
+ assertThat(a.getProvider(RuleInfo.class).getData())
.containsExactly("rule //a:a", "aspect //a:b");
}
@@ -179,7 +191,7 @@
"aspect(name='b', foo=[])");
ConfiguredTarget a = getConfiguredTarget("//a:a");
- assertThat(a.getProvider(TestAspects.RuleInfo.class).getData())
+ assertThat(a.getProvider(RuleInfo.class).getData())
.containsExactly("aspect //a:b", "rule //a:a");
}
@@ -193,10 +205,67 @@
"honest(name='b', foo=[])");
ConfiguredTarget a = getConfiguredTarget("//a:a");
- assertThat(a.getProvider(TestAspects.RuleInfo.class).getData())
+ assertThat(a.getProvider(RuleInfo.class).getData())
.containsExactly("rule //a:a", "aspect //a:b data hello");
}
+ /**
+ * Rule definitions to be used in emptyAspectAttributesAreAvailableInRuleContext().
+ */
+ public static class EmptyAspectAttributesAreAvailableInRuleContext {
+ public static class TestRule implements RuleDefinition {
+ @Override
+ public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment environment) {
+ return builder
+ .add(attr("foo", LABEL_LIST).legacyAllowAnyFileType()
+ .aspect(AspectWithEmptyLateBoundAttribute.class))
+ .build();
+ }
+
+ @Override
+ public Metadata getMetadata() {
+ return RuleDefinition.Metadata.builder().name("testrule")
+ .factoryClass(DummyRuleFactory.class).ancestors(BaseRule.class).build();
+ }
+ }
+
+ public static class AspectWithEmptyLateBoundAttribute implements ConfiguredNativeAspectFactory {
+ @Override
+ public AspectDefinition getDefinition(AspectParameters params) {
+ return new AspectDefinition.Builder("testaspect")
+ .add(attr(":late", LABEL).value(EMPTY_LATE_BOUND_LABEL)).build();
+ }
+
+ @Override
+ public Aspect create(ConfiguredTarget base,
+ RuleContext ruleContext, AspectParameters parameters) throws InterruptedException {
+ Object lateBoundPrereq = ruleContext.getPrerequisite(":late", TARGET);
+ return new Aspect.Builder("testaspect")
+ .addProvider(
+ new AspectInfo(NestedSetBuilder.create(
+ Order.STABLE_ORDER, lateBoundPrereq != null ? "non-empty" : "empty")))
+ .build();
+ }
+ }
+ }
+
+ /**
+ * An Aspect has a late-bound attribute with no value (that is, a LateBoundLabel whose
+ * getDefault() returns `null`).
+ * Test that this attribute is available in the RuleContext which is provided to the Aspect's
+ * `create()` method.
+ */
+ @Test
+ public void emptyAspectAttributesAreAvailableInRuleContext() throws Exception {
+ setRules(new TestAspects.BaseRule(),
+ new EmptyAspectAttributesAreAvailableInRuleContext.TestRule());
+ pkg("a",
+ "testrule(name='a', foo=[':b'])",
+ "testrule(name='b')");
+ ConfiguredTarget a = getConfiguredTarget("//a:a");
+ assertThat(a.getProvider(RuleInfo.class).getData()).contains("empty");
+ }
+
@RunWith(JUnit4.class)
public static class AspectTestWithoutLoading extends AspectTest {
@Override
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/TestAspects.java b/src/test/java/com/google/devtools/build/lib/analysis/util/TestAspects.java
index 0551f11..0a67c92 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/TestAspects.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/TestAspects.java
@@ -46,7 +46,7 @@
import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
import com.google.devtools.build.lib.packages.AspectDefinition;
import com.google.devtools.build.lib.packages.AspectParameters;
-import com.google.devtools.build.lib.packages.Attribute;
+import com.google.devtools.build.lib.packages.Attribute.LateBoundLabel;
import com.google.devtools.build.lib.packages.Rule;
import com.google.devtools.build.lib.packages.RuleClass;
import com.google.devtools.build.lib.packages.RuleClass.Builder;
@@ -62,6 +62,14 @@
* and {@link com.google.devtools.build.lib.analysis.AspectTest}.
*/
public class TestAspects {
+
+ public static final LateBoundLabel EMPTY_LATE_BOUND_LABEL = new LateBoundLabel<Object>() {
+ @Override
+ public Label getDefault(Rule rule, Object configuration) {
+ return null;
+ }
+ };
+
/**
* A transitive info provider for collecting aspects in the transitive closure. Created by
* aspects.
@@ -233,8 +241,7 @@
ImmutableCollection<String> baz = aspectParameters.getAttribute("baz");
if (baz != null) {
try {
- builder.add(
- Attribute.attr("$dep", LABEL).value(Label.parseAbsolute(baz.iterator().next())));
+ builder.add(attr("$dep", LABEL).value(Label.parseAbsolute(baz.iterator().next())));
} catch (LabelSyntaxException e) {
throw new IllegalStateException();
}
