Avoid crash when a test and its alias are specified on the command line for "blaze test".

RELNOTES: None.
PiperOrigin-RevId: 174386473

2 files changed, 8 insertions, 0 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/runtime/ExperimentalStateTrackerTest.java b/src/test/java/com/google/devtools/build/lib/runtime/ExperimentalStateTrackerTest.java
index 09b5dda3fb..d827f64b4c 100644
--- a/src/test/java/com/google/devtools/build/lib/runtime/ExperimentalStateTrackerTest.java
+++ b/src/test/java/com/google/devtools/build/lib/runtime/ExperimentalStateTrackerTest.java
@@ -341,6 +341,7 @@ public class ExperimentalStateTrackerTest extends FoundationTestCase {
     when(filteringComplete.getTestTargets()).thenReturn(ImmutableSet.of(targetA, targetB));
     TestSummary testSummary = Mockito.mock(TestSummary.class);
     when(testSummary.getTarget()).thenReturn(targetA);
+    when(testSummary.getLabel()).thenReturn(labelA);
 
     stateTracker.testFilteringComplete(filteringComplete);
     stateTracker.testSummary(testSummary);
@@ -374,6 +375,7 @@ public class ExperimentalStateTrackerTest extends FoundationTestCase {
     TestSummary testSummary = Mockito.mock(TestSummary.class);
     when(testSummary.getStatus()).thenReturn(BlazeTestStatus.PASSED);
     when(testSummary.getTarget()).thenReturn(targetA);
+    when(testSummary.getLabel()).thenReturn(labelA);
 
     stateTracker.testFilteringComplete(filteringComplete);
     stateTracker.testSummary(testSummary);
@@ -404,6 +406,7 @@ public class ExperimentalStateTrackerTest extends FoundationTestCase {
     TestSummary testSummary = Mockito.mock(TestSummary.class);
     when(testSummary.getStatus()).thenReturn(BlazeTestStatus.FAILED);
     when(testSummary.getTarget()).thenReturn(targetA);
+    when(testSummary.getLabel()).thenReturn(labelA);
 
     stateTracker.testFilteringComplete(filteringComplete);
     stateTracker.testSummary(testSummary);
@@ -507,6 +510,7 @@ public class ExperimentalStateTrackerTest extends FoundationTestCase {
     TestSummary testSummary = Mockito.mock(TestSummary.class);
     when(testSummary.getStatus()).thenReturn(BlazeTestStatus.PASSED);
     when(testSummary.getTarget()).thenReturn(bartestTarget);
+    when(testSummary.getLabel()).thenReturn(bartestLabel);
 
     if (actions >= 1) {
       stateTracker.actionStarted(new ActionStartedEvent(foobuildAction, 123456789));
diff --git a/src/test/java/com/google/devtools/build/lib/runtime/TestSummaryTest.java b/src/test/java/com/google/devtools/build/lib/runtime/TestSummaryTest.java
index 0ea18afac7..e3ff952481 100644
--- a/src/test/java/com/google/devtools/build/lib/runtime/TestSummaryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/runtime/TestSummaryTest.java
@@ -25,6 +25,7 @@ import static org.mockito.Mockito.when;
 
 import com.google.common.collect.ImmutableList;
 import com.google.devtools.build.lib.analysis.ConfiguredTarget;
+import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
 import com.google.devtools.build.lib.clock.BlazeClock;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.util.io.AnsiTerminalPrinter;
@@ -452,8 +453,11 @@ public class TestSummaryTest {
   }
 
   private ConfiguredTarget target(String path, String targetName) throws Exception {
+    BuildConfiguration configuration = Mockito.mock(BuildConfiguration.class);
+    when(configuration.checksum()).thenReturn("abcdef");
     ConfiguredTarget target = Mockito.mock(ConfiguredTarget.class);
     when(target.getLabel()).thenReturn(Label.create(path, targetName));
+    when(target.getConfiguration()).thenReturn(configuration);
     return target;
   }