commit d126074065d076a6f35683bf9532bf15a1f6f6e9
author Dmitry Lomov <dslomov@google.com> Tue May 03 18:37:11 2016 +0000
committer Kristina Chodorow <kchodorow@google.com> Tue May 03 21:33:51 2016 +0000
tree 9f25a58fa67464ff2206a828be15e019d69fa22b
parent c9c473d8cae3d085eeeceadf92482793a97d3f16

Remove a dependency on dart_library rule from ConfiguredTargetTransitivePackagesTest.

--
MOS_MIGRATED_REVID=121398365

src/test/java/com/google/devtools/build/lib/analysis/AspectTest.java

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 8a518bf..f602e8b 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
@@ -40,7 +40,6 @@
 import com.google.devtools.build.lib.packages.AspectParameters;
 import com.google.devtools.build.lib.packages.NativeAspectClass;
 import com.google.devtools.build.lib.packages.RuleClass;
-import com.google.devtools.build.lib.testutil.TestRuleClassProvider;
 import com.google.devtools.build.lib.vfs.ModifiedFileSet;
 
 import org.junit.Test;
@@ -56,25 +55,13 @@
 @RunWith(JUnit4.class)
 public class AspectTest extends AnalysisTestCase {
 
-  private final void setRules(RuleDefinition... rules) throws Exception {
-    ConfiguredRuleClassProvider.Builder builder =
-        new ConfiguredRuleClassProvider.Builder();
-    TestRuleClassProvider.addStandardRules(builder);
-    for (RuleDefinition rule : rules) {
-      builder.addRuleDefinition(rule);
-    }
-
-    useRuleClassProvider(builder.build());
-    update();
-  }
-
   private void pkg(String name, String... contents) throws Exception {
     scratch.file("" + name + "/BUILD", contents);
   }
 
   @Test
   public void providersOfAspectAreMergedIntoDependency() throws Exception {
-    setRules(new TestAspects.BaseRule(), new AspectRequiringRule());
+    setRulesAvailableInTests(new TestAspects.BaseRule(), new AspectRequiringRule());
     pkg("a",
         "aspect(name='a', foo=[':b'])",
         "aspect(name='b', foo=[])");
@@ -86,7 +73,7 @@
 
   @Test
   public void aspectIsNotCreatedIfAdvertisedProviderIsNotPresent() throws Exception {
-    setRules(new TestAspects.BaseRule(), new TestAspects.LiarRule(),
+    setRulesAvailableInTests(new TestAspects.BaseRule(), new TestAspects.LiarRule(),
         new TestAspects.AspectRequiringProviderRule());
 
     pkg("a",
@@ -99,7 +86,7 @@
 
   @Test
   public void aspectCreationWorksThroughBind() throws Exception {
-    setRules(new TestAspects.BaseRule(), new TestAspects.HonestRule(),
+    setRulesAvailableInTests(new TestAspects.BaseRule(), new TestAspects.HonestRule(),
         new TestAspects.AspectRequiringProviderRule());
 
     pkg("a",
@@ -120,7 +107,7 @@
 
   @Test
   public void aspectCreatedIfAdvertisedProviderIsPresent() throws Exception {
-    setRules(new TestAspects.BaseRule(), new TestAspects.HonestRule(),
+    setRulesAvailableInTests(new TestAspects.BaseRule(), new TestAspects.HonestRule(),
         new TestAspects.AspectRequiringProviderRule());
 
     pkg("a",
@@ -134,7 +121,7 @@
 
   @Test
   public void aspectWithParametrizedDefinition() throws Exception {
-    setRules(
+    setRulesAvailableInTests(
         new TestAspects.BaseRule(),
         new TestAspects.HonestRule(),
         new TestAspects.ParametrizedDefinitionAspectRule());
@@ -156,7 +143,7 @@
 
   @Test
   public void aspectInError() throws Exception {
-    setRules(new TestAspects.BaseRule(), new TestAspects.ErrorAspectRule(),
+    setRulesAvailableInTests(new TestAspects.BaseRule(), new TestAspects.ErrorAspectRule(),
         new TestAspects.SimpleRule());
 
     pkg("a",
@@ -178,7 +165,7 @@
 
   @Test
   public void transitiveAspectInError() throws Exception {
-    setRules(new TestAspects.BaseRule(), new TestAspects.ErrorAspectRule(),
+    setRulesAvailableInTests(new TestAspects.BaseRule(), new TestAspects.ErrorAspectRule(),
         new TestAspects.SimpleRule());
 
     pkg("a",
@@ -201,7 +188,7 @@
 
   @Test
   public void sameTargetInDifferentAttributes() throws Exception {
-    setRules(new TestAspects.BaseRule(), new TestAspects.AspectRequiringRule(),
+    setRulesAvailableInTests(new TestAspects.BaseRule(), new TestAspects.AspectRequiringRule(),
         new TestAspects.SimpleRule());
     pkg("a",
         "aspect(name='a', foo=[':b'], bar=[':b'])",
@@ -214,7 +201,7 @@
 
   @Test
   public void informationFromBaseRulePassedToAspect() throws Exception {
-    setRules(new TestAspects.BaseRule(), new TestAspects.HonestRule(),
+    setRulesAvailableInTests(new TestAspects.BaseRule(), new TestAspects.HonestRule(),
         new TestAspects.AspectRequiringProviderRule());
 
     pkg("a",
@@ -280,7 +267,7 @@
    */
   @Test
   public void emptyAspectAttributesAreAvailableInRuleContext() throws Exception {
-    setRules(new TestAspects.BaseRule(),
+    setRulesAvailableInTests(new TestAspects.BaseRule(),
         new EmptyAspectAttributesAreAvailableInRuleContext.TestRule());
     pkg("a",
         "testrule(name='a', foo=[':b'])",
@@ -339,7 +326,7 @@
    */
   @Test
   public void extraActionsAreEmitted() throws Exception {
-    setRules(new TestAspects.BaseRule(),
+    setRulesAvailableInTests(new TestAspects.BaseRule(),
         new ExtraActionsAreEmitted.TestRule());
     useConfiguration("--experimental_action_listener=//extra_actions:listener");
     scratch.file(