3 files changed, 20 insertions, 6 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java
index ad53743335..59a74a8eb4 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java
@@ -263,8 +263,15 @@ public abstract class AnalysisTestCase extends FoundationTestCase {
     ImmutableSortedSet<String> multiCpu = ImmutableSortedSet.copyOf(requestOptions.multiCpus);
     masterConfig = skyframeExecutor.createConfigurations(
         configurationFactory, buildOptions, directories, multiCpu, false);
-    analysisResult = buildView.update(loadingResult, masterConfig, viewOptions,
-        AnalysisTestUtil.TOP_LEVEL_ARTIFACT_CONTEXT, reporter, eventBus);
+    analysisResult =
+        buildView.update(
+            loadingResult,
+            masterConfig,
+            ImmutableList.<String>of(),
+            viewOptions,
+            AnalysisTestUtil.TOP_LEVEL_ARTIFACT_CONTEXT,
+            reporter,
+            eventBus);
   }
 
   protected void update(FlagBuilder config, String... labels) throws Exception {
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
index 46f4e4daab..81f7dc433b 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
@@ -1281,8 +1281,14 @@ public abstract class BuildViewTestCase extends FoundationTestCase {
       // TODO(bazel-team): What's supposed to happen in this case?
       return null;
     }
-    return view.update(loadingResult, masterConfig, viewOptions,
-        AnalysisTestUtil.TOP_LEVEL_ARTIFACT_CONTEXT, reporter, eventBus);
+    return view.update(
+        loadingResult,
+        masterConfig,
+        ImmutableList.<String>of(),
+        viewOptions,
+        AnalysisTestUtil.TOP_LEVEL_ARTIFACT_CONTEXT,
+        reporter,
+        eventBus);
   }
 
   protected static Predicate<Artifact> artifactNamed(final String name) {
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 5438b43d6b..bf564fb225 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
@@ -132,8 +132,9 @@ public class TestAspects {
   public abstract static class BaseAspect implements ConfiguredAspectFactory {
     @Override
     public Aspect create(ConfiguredTarget base, RuleContext ruleContext) {
-      return new Aspect.Builder()
-          .addProvider(AspectInfo.class,
+      return new Aspect.Builder(getClass().getName())
+          .addProvider(
+              AspectInfo.class,
               new AspectInfo(collectAspectData("aspect " + ruleContext.getLabel(), ruleContext)))
           .build();
     }