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/DependencyResolverTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/DependencyResolverTest.java b/src/test/java/com/google/devtools/build/lib/analysis/DependencyResolverTest.java
index c534f69..9f89ecd 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/DependencyResolverTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/DependencyResolverTest.java
@@ -31,7 +31,6 @@
 import com.google.devtools.build.lib.packages.NoSuchTargetException;
 import com.google.devtools.build.lib.packages.NoSuchThingException;
 import com.google.devtools.build.lib.packages.Target;
-import com.google.devtools.build.lib.testutil.TestRuleClassProvider;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -88,19 +87,6 @@
     scratch.file("" + name + "/BUILD", contents);
   }
 
-  @SafeVarargs
-  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 ListMultimap<Attribute, Dependency> dependentNodeMap(
       String targetName, NativeAspectClass aspect) throws Exception {
     Target target = packageManager.getTarget(reporter, Label.parseAbsolute(targetName));
@@ -140,7 +126,7 @@
 
   @Test
   public void hasAspectsRequiredByRule() throws Exception {
-    setRules(new AspectRequiringRule(), new TestAspects.BaseRule());
+    setRulesAvailableInTests(new AspectRequiringRule(), new TestAspects.BaseRule());
     pkg("a",
         "aspect(name='a', foo=[':b'])",
         "aspect(name='b', foo=[])");
@@ -152,7 +138,7 @@
 
   @Test
   public void hasAspectsRequiredByAspect() throws Exception {
-    setRules(new TestAspects.BaseRule(), new TestAspects.SimpleRule());
+    setRulesAvailableInTests(new TestAspects.BaseRule(), new TestAspects.SimpleRule());
     pkg("a",
         "simple(name='a', foo=[':b'])",
         "simple(name='b', foo=[])");
@@ -165,7 +151,7 @@
 
   @Test
   public void hasAspectDependencies() throws Exception {
-    setRules(new TestAspects.BaseRule());
+    setRulesAvailableInTests(new TestAspects.BaseRule());
     pkg("a", "base(name='a')");
     pkg("extra", "base(name='extra')");
     ListMultimap<Attribute, Dependency> map =