commit 3bf4fd06a0658440e87b5485e00be22007782b0d
author Janak Ramakrishnan <janakr@google.com> Tue Mar 21 19:01:13 2017 +0000
committer Yue Gan <yueg@google.com> Wed Mar 22 10:54:03 2017 +0000
tree bc6defb2fa3af66316e875bc6f5168507c6d36e8
parent a5578af6fdddd643f3be4d1de14d026c73b4f3e2

Remove only-in-tests null checks in SkyframeActionExecutor.

Still on step -0.5, let's be honest.

--
PiperOrigin-RevId: 150783638
MOS_MIGRATED_REVID=150783638

src/test/java/com/google/devtools/build/lib/skyframe/ParallelBuilderTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ParallelBuilderTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/ParallelBuilderTest.java
index 75dcc14..76667a3 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/ParallelBuilderTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/ParallelBuilderTest.java
@@ -775,12 +775,12 @@
     buildArtifacts(baz);
     // Check that the percentages increase non-linearly, because foo has 10 input files
     List<String> expectedMessages = Lists.newArrayList(
-        "Test foo START",
-        "Test foo FINISH",
-        "Test bar START",
-        "Test bar FINISH",
-        "Test baz START",
-        "Test baz FINISH");
+        " Test foo START",
+        " Test foo FINISH",
+        " Test bar START",
+        " Test bar FINISH",
+        " Test baz START",
+        " Test baz FINISH");
     assertThat(messages).containsAllIn(expectedMessages);
 
     // Now do an incremental rebuild of bar and baz,
@@ -792,10 +792,10 @@
     // (in-memory) file system, rather than using cached entries.
     buildArtifacts(baz);
     expectedMessages = Lists.newArrayList(
-        "Test bar START",
-        "Test bar FINISH",
-        "Test baz START",
-        "Test baz FINISH");
+        " Test bar START",
+        " Test bar FINISH",
+        " Test baz START",
+        " Test baz FINISH");
     assertThat(messages).containsAllIn(expectedMessages);
   }
 }

src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java

diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java b/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java
index 46932ea..2ca64ea 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java
@@ -53,6 +53,8 @@
 import com.google.devtools.build.lib.skyframe.ExternalFilesHelper.ExternalFileAction;
 import com.google.devtools.build.lib.skyframe.PackageLookupFunction.CrossRepositoryLabelViolationStrategy;
 import com.google.devtools.build.lib.skyframe.PackageLookupValue.BuildFileName;
+import com.google.devtools.build.lib.skyframe.SkyframeActionExecutor.ActionCompletedReceiver;
+import com.google.devtools.build.lib.skyframe.SkyframeActionExecutor.ProgressSupplier;
 import com.google.devtools.build.lib.testutil.FoundationTestCase;
 import com.google.devtools.build.lib.testutil.TestConstants;
 import com.google.devtools.build.lib.testutil.TestRuleClassProvider;
@@ -242,6 +244,8 @@
             false,
             new ActionCacheChecker(actionCache, null, ALWAYS_EXECUTE_FILTER, null),
             null);
+        skyframeActionExecutor.setActionExecutionProgressReportingObjects(
+            EMPTY_PROGRESS_SUPPLIER, EMPTY_COMPLETION_RECEIVER);
 
         List<SkyKey> keys = new ArrayList<>();
         for (Artifact artifact : artifacts) {
@@ -461,4 +465,18 @@
       return actionTemplateExpansionFunction.extractTag(skyKey);
     }
   }
+
+  private static final ProgressSupplier EMPTY_PROGRESS_SUPPLIER =
+      new ProgressSupplier() {
+        @Override
+        public String getProgressString() {
+          return "";
+        }
+      };
+
+  private static final ActionCompletedReceiver EMPTY_COMPLETION_RECEIVER =
+      new ActionCompletedReceiver() {
+        @Override
+        public void actionCompleted(Action action) {}
+      };
 }