From c15ba2e54d0e17fe894bfeadb21228e0a76e9e40 Mon Sep 17 00:00:00 2001
From: Dmitry Lomov <dslomov@google.com>
Date: Fri, 30 Oct 2015 15:50:01 +0000
Subject: Implement propagation along dependencies for Skylark aspects.

--
MOS_MIGRATED_REVID=106694515
---
 .../google/devtools/build/lib/analysis/AspectDefinitionTest.java    | 2 +-
 .../google/devtools/build/lib/analysis/DependencyResolverTest.java  | 5 +----
 .../com/google/devtools/build/lib/analysis/util/TestAspects.java    | 6 +++---
 3 files changed, 5 insertions(+), 8 deletions(-)

(limited to 'src/test/java/com/google/devtools/build/lib/analysis')

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/AspectDefinitionTest.java b/src/test/java/com/google/devtools/build/lib/analysis/AspectDefinitionTest.java
index 09dd5e2b8f..b81f2f260a 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/AspectDefinitionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/AspectDefinitionTest.java
@@ -34,7 +34,7 @@ public class AspectDefinitionTest {
    * A dummy aspect factory. Is there to demonstrate how to define aspects and so that we can test
    * {@code attributeAspect}.
    */
-  public static final class TestAspectFactory implements ConfiguredAspectFactory {
+  public static final class TestAspectFactory implements ConfiguredNativeAspectFactory {
     private final AspectDefinition definition;
 
     /**
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 67889a8fbd..1a7a24c490 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
@@ -27,7 +27,6 @@ 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.AspectDefinition;
-import com.google.devtools.build.lib.packages.AspectFactory;
 import com.google.devtools.build.lib.packages.AspectParameters;
 import com.google.devtools.build.lib.packages.Attribute;
 import com.google.devtools.build.lib.packages.NativeAspectClass;
@@ -111,9 +110,7 @@ public class DependencyResolverTest extends AnalysisTestCase {
   private ListMultimap<Attribute, Dependency> dependentNodeMap(
       String targetName, Class<? extends ConfiguredAspectFactory> aspect) throws Exception {
     AspectDefinition aspectDefinition =
-        aspect == null
-            ? null
-            : AspectFactory.Util.create(new NativeAspectClass(aspect)).getDefinition();
+        aspect == null ? null : new NativeAspectClass(aspect).getDefinition();
     Target target = packageManager.getTarget(reporter, Label.parseAbsolute(targetName));
     return dependencyResolver.dependentNodeMap(
         new TargetAndConfiguration(target, getTargetConfiguration()),
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 433cb22b09..1b2ffbbab6 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
@@ -26,7 +26,7 @@ import com.google.common.base.Function;
 import com.google.common.collect.Iterables;
 import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.analysis.Aspect;
-import com.google.devtools.build.lib.analysis.ConfiguredAspectFactory;
+import com.google.devtools.build.lib.analysis.ConfiguredNativeAspectFactory;
 import com.google.devtools.build.lib.analysis.ConfiguredTarget;
 import com.google.devtools.build.lib.analysis.RuleConfiguredTarget.Mode;
 import com.google.devtools.build.lib.analysis.RuleConfiguredTargetBuilder;
@@ -133,7 +133,7 @@ public class TestAspects {
   /**
    * A base class for mock aspects to reduce boilerplate.
    */
-  public abstract static class BaseAspect implements ConfiguredAspectFactory {
+  public abstract static class BaseAspect implements ConfiguredNativeAspectFactory {
     @Override
     public Aspect create(ConfiguredTarget base, RuleContext ruleContext,
         AspectParameters parameters) {
@@ -222,7 +222,7 @@ public class TestAspects {
   /**
    * An aspect that raises an error.
    */
-  public static class ErrorAspect implements ConfiguredAspectFactory {
+  public static class ErrorAspect implements ConfiguredNativeAspectFactory {
     @Override
     public Aspect create(ConfiguredTarget base, RuleContext ruleContext,
         AspectParameters parameters) {
-- 
cgit v1.2.3