commit b487ac69185fd0080461a3c8795589fe4532f4bb
author Dmitry Lomov <dslomov@google.com> Mon Nov 09 13:09:12 2015 +0000
committer Damien Martin-Guillerez <dmarting@google.com> Tue Nov 10 10:19:28 2015 +0000
tree 4b36b926124ac8dfee576ee05385a51e4b7b41e7
parent c7d277f25f4ebcaed4c08e110f549fc5eef44bec

Aspect terminology update.

Aspect => ConfiguredAspect
AspectWithParameters => Aspect

--
MOS_MIGRATED_REVID=107375211

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 5a190d5..3bf70e8 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
@@ -26,7 +26,7 @@
 import com.google.devtools.build.lib.analysis.util.TestAspects;
 import com.google.devtools.build.lib.analysis.util.TestAspects.AspectRequiringRule;
 import com.google.devtools.build.lib.cmdline.Label;
-import com.google.devtools.build.lib.packages.AspectWithParameters;
+import com.google.devtools.build.lib.packages.Aspect;
 import com.google.devtools.build.lib.packages.Attribute;
 import com.google.devtools.build.lib.packages.NativeAspectClass;
 import com.google.devtools.build.lib.packages.NoSuchThingException;
@@ -113,7 +113,7 @@
     return dependencyResolver.dependentNodeMap(
         new TargetAndConfiguration(target, getTargetConfiguration()),
         getHostConfiguration(),
-        aspect != null ? new AspectWithParameters(new NativeAspectClass<T>(aspect)) : null,
+        aspect != null ? new Aspect(new NativeAspectClass<T>(aspect)) : null,
         ImmutableSet.<ConfigMatchingProvider>of());
   }
 
@@ -122,7 +122,7 @@
       ListMultimap<Attribute, Dependency> dependentNodeMap,
       String attrName,
       String dep,
-      AspectWithParameters... aspects) {
+      Aspect... aspects) {
     Attribute attr = null;
     for (Attribute candidate : dependentNodeMap.keySet()) {
       if (candidate.getName().equals(attrName)) {
@@ -152,10 +152,7 @@
         "aspect(name='b', foo=[])");
     ListMultimap<Attribute, Dependency> map = dependentNodeMap("//a:a", null);
     assertDep(
-        map,
-        "foo",
-        "//a:b",
-        new AspectWithParameters(new NativeAspectClass(TestAspects.SimpleAspect.class)));
+        map, "foo", "//a:b", new Aspect(new NativeAspectClass(TestAspects.SimpleAspect.class)));
   }
 
   @Test
@@ -167,10 +164,7 @@
     ListMultimap<Attribute, Dependency> map =
         dependentNodeMap("//a:a", TestAspects.AttributeAspect.class);
     assertDep(
-        map,
-        "foo",
-        "//a:b",
-        new AspectWithParameters(new NativeAspectClass(TestAspects.AttributeAspect.class)));
+        map, "foo", "//a:b", new Aspect(new NativeAspectClass(TestAspects.AttributeAspect.class)));
   }
 
   @Test
@@ -205,18 +199,18 @@
     BuildConfiguration host = getHostConfiguration();
     BuildConfiguration target = getTargetConfiguration();
 
-    ImmutableSet<AspectWithParameters> twoAspects =
+    ImmutableSet<Aspect> twoAspects =
         ImmutableSet.of(
-            new AspectWithParameters(new NativeAspectClass(TestAspects.SimpleAspect.class)),
-            new AspectWithParameters(new NativeAspectClass(TestAspects.AttributeAspect.class)));
-    ImmutableSet<AspectWithParameters> inverseAspects =
+            new Aspect(new NativeAspectClass(TestAspects.SimpleAspect.class)),
+            new Aspect(new NativeAspectClass(TestAspects.AttributeAspect.class)));
+    ImmutableSet<Aspect> inverseAspects =
         ImmutableSet.of(
-            new AspectWithParameters(new NativeAspectClass(TestAspects.AttributeAspect.class)),
-            new AspectWithParameters(new NativeAspectClass(TestAspects.SimpleAspect.class)));
-    ImmutableSet<AspectWithParameters> differentAspects =
+            new Aspect(new NativeAspectClass(TestAspects.AttributeAspect.class)),
+            new Aspect(new NativeAspectClass(TestAspects.SimpleAspect.class)));
+    ImmutableSet<Aspect> differentAspects =
         ImmutableSet.of(
-            new AspectWithParameters(new NativeAspectClass(TestAspects.AttributeAspect.class)),
-            new AspectWithParameters(new NativeAspectClass(TestAspects.ErrorAspect.class)));
+            new Aspect(new NativeAspectClass(TestAspects.AttributeAspect.class)),
+            new Aspect(new NativeAspectClass(TestAspects.ErrorAspect.class)));
 
     new EqualsTester()
         .addEqualityGroup(