Fix broken tests.

--
MOS_MIGRATED_REVID=102134151

7 files changed, 27 insertions, 18 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/AspectWithParameters.java b/src/main/java/com/google/devtools/build/lib/analysis/AspectWithParameters.java
index 0cffc4c388..be39f145ac 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/AspectWithParameters.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/AspectWithParameters.java
@@ -13,6 +13,7 @@
 // limitations under the License.
 package com.google.devtools.build.lib.analysis;
 
+import com.google.common.base.Preconditions;
 import com.google.devtools.build.lib.packages.AspectParameters;
 
 import java.util.Objects;
@@ -31,6 +32,7 @@ public final class AspectWithParameters {
 
   public AspectWithParameters(
       Class<? extends ConfiguredAspectFactory> aspect, AspectParameters parameters) {
+    Preconditions.checkNotNull(parameters);
     this.aspectFactory = aspect;
     this.parameters = parameters;
   }
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
index a7fff98a90..41f6ecd502 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
@@ -50,6 +50,7 @@ import com.google.devtools.build.lib.concurrent.ThreadSafety.ThreadSafe;
 import com.google.devtools.build.lib.events.Event;
 import com.google.devtools.build.lib.events.EventHandler;
 import com.google.devtools.build.lib.events.StoredEventHandler;
+import com.google.devtools.build.lib.packages.AspectParameters;
 import com.google.devtools.build.lib.packages.Attribute;
 import com.google.devtools.build.lib.packages.NoSuchPackageException;
 import com.google.devtools.build.lib.packages.NoSuchTargetException;
@@ -878,7 +879,7 @@ public class BuildView {
     ListMultimap<Attribute, Dependency> depNodeNames;
     try {
       depNodeNames = resolver.dependentNodeMap(ctNode, configurations.getHostConfiguration(),
-          /*aspect=*/null, /*aspectParameters=*/null, getConfigurableAttributeKeys(ctNode));
+          /*aspect=*/null, AspectParameters.EMPTY, getConfigurableAttributeKeys(ctNode));
     } catch (EvalException e) {
       throw new IllegalStateException(e);
     }
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/DependencyResolver.java b/src/main/java/com/google/devtools/build/lib/analysis/DependencyResolver.java
index f8ec20a445..debf6f4a98 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/DependencyResolver.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/DependencyResolver.java
@@ -504,7 +504,7 @@ public abstract class DependencyResolver {
       Set<ConfigMatchingProvider> configConditions) {
     try {
       return ImmutableSet.copyOf(dependentNodeMap(node, hostConfig, /*aspect=*/null,
-          /*aspectParameters=*/null, configConditions).values());
+          AspectParameters.EMPTY, configConditions).values());
     } catch (EvalException e) {
       throw new IllegalStateException(e);
     }
@@ -598,7 +598,7 @@ public abstract class DependencyResolver {
 
   private void visitRule(Rule rule, ListMultimap<Attribute, LabelAndConfiguration> labelMap,
       ListMultimap<Attribute, Dependency> outgoingEdges) {
-    visitRule(rule, /*aspect=*/null, /*aspectParameters=*/null, labelMap, outgoingEdges);
+    visitRule(rule, /*aspect=*/null, AspectParameters.EMPTY, labelMap, outgoingEdges);
   }
 
   private void visitRule(Rule rule, AspectDefinition aspect, AspectParameters aspectParameters,
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/PostConfiguredTargetFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/PostConfiguredTargetFunction.java
index d14bf46aa0..315d9651e1 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/PostConfiguredTargetFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/PostConfiguredTargetFunction.java
@@ -26,6 +26,7 @@ import com.google.devtools.build.lib.analysis.LabelAndConfiguration;
 import com.google.devtools.build.lib.analysis.TargetAndConfiguration;
 import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
 import com.google.devtools.build.lib.analysis.config.ConfigMatchingProvider;
+import com.google.devtools.build.lib.packages.AspectParameters;
 import com.google.devtools.build.lib.packages.Attribute;
 import com.google.devtools.build.lib.packages.RawAttributeMapper;
 import com.google.devtools.build.lib.packages.Rule;
@@ -101,7 +102,7 @@ public class PostConfiguredTargetFunction implements SkyFunction {
       BuildConfiguration hostConfiguration =
           buildViewProvider.getSkyframeBuildView().getHostConfiguration(ct.getConfiguration());
       deps = resolver.dependentNodeMap(ctgValue, hostConfiguration, /*aspect=*/null,
-          /*aspectParameters=*/null, configConditions);
+          AspectParameters.EMPTY, configConditions);
       if (ct.getConfiguration() != null && ct.getConfiguration().useDynamicConfigurations()) {
         deps = ConfiguredTargetFunction.trimConfigurations(env, ctgValue, deps, hostConfiguration,
             ruleClassProvider);
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 2906961e7b..338773d824 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
@@ -62,16 +62,17 @@ public class AspectValueTest extends AnalysisTestCase {
     Class<? extends ConfiguredAspectFactory> a2 = TestAspects.ExtraAttributeAspect.class;
 
     new EqualsTester()
-        .addEqualityGroup(AspectValue.key(l1, c1, a1, null), AspectValue.key(l1b, c1, a1, null))
+        .addEqualityGroup(AspectValue.key(l1, c1, a1, AspectParameters.EMPTY),
+            AspectValue.key(l1b, c1, a1, AspectParameters.EMPTY))
         .addEqualityGroup(AspectValue.key(l1, c1, a1, i1))
         .addEqualityGroup(AspectValue.key(l1, c1, a1, i2))
-        .addEqualityGroup(AspectValue.key(l2, c1, a1, null))
-        .addEqualityGroup(AspectValue.key(l1, c2, a1, null))
-        .addEqualityGroup(AspectValue.key(l2, c2, a1, null))
-        .addEqualityGroup(AspectValue.key(l1, c1, a2, null))
-        .addEqualityGroup(AspectValue.key(l2, c1, a2, null))
-        .addEqualityGroup(AspectValue.key(l1, c2, a2, null))
-        .addEqualityGroup(AspectValue.key(l2, c2, a2, null))
+        .addEqualityGroup(AspectValue.key(l2, c1, a1, AspectParameters.EMPTY))
+        .addEqualityGroup(AspectValue.key(l1, c2, a1, AspectParameters.EMPTY))
+        .addEqualityGroup(AspectValue.key(l2, c2, a1, AspectParameters.EMPTY))
+        .addEqualityGroup(AspectValue.key(l1, c1, a2, AspectParameters.EMPTY))
+        .addEqualityGroup(AspectValue.key(l2, c1, a2, AspectParameters.EMPTY))
+        .addEqualityGroup(AspectValue.key(l1, c2, a2, AspectParameters.EMPTY))
+        .addEqualityGroup(AspectValue.key(l2, c2, a2, AspectParameters.EMPTY))
         .addEqualityGroup(l1)  // A random object
         .testEquals();
   }
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 e149cb8693..edbcf63d3c 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,6 +27,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.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.NoSuchThingException;
 import com.google.devtools.build.lib.packages.Target;
@@ -116,7 +117,8 @@ public class DependencyResolverTest extends AnalysisTestCase {
         new TargetAndConfiguration(target, getTargetConfiguration()),
         getHostConfiguration(),
         aspectDefinition,
-        null, ImmutableSet.<ConfigMatchingProvider>of());
+        AspectParameters.EMPTY,
+        ImmutableSet.<ConfigMatchingProvider>of());
   }
 
   @SafeVarargs
@@ -124,7 +126,7 @@ public class DependencyResolverTest extends AnalysisTestCase {
       ListMultimap<Attribute, Dependency> dependentNodeMap,
       String attrName,
       String dep,
-      Class<? extends AspectFactory<?, ?, ?>>... aspects) {
+      AspectWithParameters... aspects) {
     Attribute attr = null;
     for (Attribute candidate : dependentNodeMap.keySet()) {
       if (candidate.getName().equals(attrName)) {
@@ -153,7 +155,7 @@ public class DependencyResolverTest extends AnalysisTestCase {
         "aspect(name='a', foo=[':b'])",
         "aspect(name='b', foo=[])");
     ListMultimap<Attribute, Dependency> map = dependentNodeMap("//a:a", null);
-    assertDep(map, "foo", "//a:b", TestAspects.SimpleAspect.class);
+    assertDep(map, "foo", "//a:b", new AspectWithParameters(TestAspects.SimpleAspect.class));
   }
 
   @Test
@@ -164,7 +166,7 @@ public class DependencyResolverTest extends AnalysisTestCase {
         "simple(name='b', foo=[])");
     ListMultimap<Attribute, Dependency> map =
         dependentNodeMap("//a:a", TestAspects.AttributeAspect.class);
-    assertDep(map, "foo", "//a:b", TestAspects.AttributeAspect.class);
+    assertDep(map, "foo", "//a:b", new AspectWithParameters(TestAspects.AttributeAspect.class));
   }
 
   @Test
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 ffea8bcc9f..5f41e3d4ec 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
@@ -306,8 +306,10 @@ public class TestAspects {
       @Override
       public AspectParameters apply(Rule rule) {
         if (rule.isAttrDefined("baz", STRING)) {
-          return new AspectParameters.Builder().addAttribute("baz",
-              rule.getAttributeContainer().getAttr("baz").toString()).build();
+          String value = rule.getAttributeContainer().getAttr("baz").toString();
+          if (!value.equals("")) {
+            return new AspectParameters.Builder().addAttribute("baz", value).build();
+          }
         }
         return AspectParameters.EMPTY;
       }