commit 8ff064545b5c286209c07a66eee430747a401a0e
author Dmitry Lomov <dslomov@google.com> Wed Oct 21 19:16:30 2015 +0000
committer Kristina Chodorow <kchodorow@google.com> Thu Oct 22 15:15:53 2015 +0000
tree ef58094d7c6c0f8210dd12d825a53089b4ea3446
parent 908f4c91b4b5c1f996f1b177ab5886b1468cb6a9

Introduce an AspectClass: a representation of a class of aspects.

For native aspects, AspectClass is a facade for Class<AspectFactory<...>>.

--
MOS_MIGRATED_REVID=105986390

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

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/AspectValueTest.java b/src/test/java/com/google/devtools/build/lib/analysis/AspectValueTest.java
index 47bfc54..15407b4 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/AspectValueTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/AspectValueTest.java
@@ -16,9 +16,11 @@
 import com.google.common.testing.EqualsTester;
 import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
 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.AttributeAspect;
+import com.google.devtools.build.lib.analysis.util.TestAspects.ExtraAttributeAspect;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.packages.AspectParameters;
+import com.google.devtools.build.lib.packages.NativeAspectClass;
 import com.google.devtools.build.lib.skyframe.AspectValue;
 
 import org.junit.After;
@@ -58,8 +60,8 @@
     AspectParameters i2 = new AspectParameters.Builder()
         .addAttribute("foo", "baz")
         .build();
-    Class<? extends ConfiguredAspectFactory> a1 = TestAspects.AttributeAspect.class;
-    Class<? extends ConfiguredAspectFactory> a2 = TestAspects.ExtraAttributeAspect.class;
+    NativeAspectClass a1 = new NativeAspectClass(AttributeAspect.class);
+    NativeAspectClass a2 = new NativeAspectClass(ExtraAttributeAspect.class);
 
     new EqualsTester()
         .addEqualityGroup(AspectValue.key(l1, c1, a1, AspectParameters.EMPTY),