2 files changed, 45 insertions, 57 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/test/TestAttempt.java b/src/main/java/com/google/devtools/build/lib/rules/test/TestAttempt.java
index dc076b7adb..0364c731ec 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/test/TestAttempt.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/test/TestAttempt.java
@@ -20,16 +20,18 @@ import com.google.devtools.build.lib.buildeventstream.BuildEventId;
 import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos;
 import com.google.devtools.build.lib.buildeventstream.GenericBuildEvent;
 import com.google.devtools.build.lib.buildeventstream.PathConverter;
+import com.google.devtools.build.lib.util.Pair;
+import com.google.devtools.build.lib.vfs.Path;
 import java.util.Collection;
 
-/**
- * This event is raised whenever a an individual test attempt is completed that is not the final
- * attempt for the given test, shard, and run.
- */
+/** This event is raised whenever a an individual test attempt is completed. */
 public class TestAttempt implements BuildEvent {
 
   private final TestRunnerAction testAction;
+  private final boolean success;
   private final int attempt;
+  private final boolean lastAttempt;
+  private final Collection<Pair<String, Path>> files;
 
   /**
    * Construct the event given the test action and attempt number.
@@ -37,9 +39,25 @@ public class TestAttempt implements BuildEvent {
    * @param testAction The test that was run.
    * @param attempt The number of the attempt for this action.
    */
-  public TestAttempt(TestRunnerAction testAction, Integer attempt) {
+  public TestAttempt(
+      TestRunnerAction testAction,
+      Integer attempt,
+      boolean success,
+      Collection<Pair<String, Path>> files,
+      boolean lastAttempt) {
     this.testAction = testAction;
     this.attempt = attempt;
+    this.success = success;
+    this.files = files;
+    this.lastAttempt = lastAttempt;
+  }
+
+  public TestAttempt(
+      TestRunnerAction testAction,
+      Integer attempt,
+      boolean success,
+      Collection<Pair<String, Path>> files) {
+    this(testAction, attempt, success, files, false);
   }
 
   @Override
@@ -53,18 +71,30 @@ public class TestAttempt implements BuildEvent {
 
   @Override
   public Collection<BuildEventId> getChildrenEvents() {
-    return ImmutableList.of(
-        BuildEventId.testResult(
-            testAction.getOwner().getLabel(),
-            testAction.getRunNumber(),
-            testAction.getShardNum(),
-            attempt + 1));
+    if (lastAttempt) {
+      return ImmutableList.of();
+    } else {
+      return ImmutableList.of(
+          BuildEventId.testResult(
+              testAction.getOwner().getLabel(),
+              testAction.getRunNumber(),
+              testAction.getShardNum(),
+              attempt + 1));
+    }
   }
 
   @Override
   public BuildEventStreamProtos.BuildEvent asStreamProto(PathConverter pathConverter) {
-    BuildEventStreamProtos.TestResult.Builder resultBuilder =
+    BuildEventStreamProtos.TestResult.Builder builder =
         BuildEventStreamProtos.TestResult.newBuilder();
-    return GenericBuildEvent.protoChaining(this).setTestResult(resultBuilder.build()).build();
+    builder.setSuccess(success);
+    for (Pair<String, Path> file : files) {
+      builder.addTestActionOutput(
+          BuildEventStreamProtos.File.newBuilder()
+              .setName(file.getFirst())
+              .setUri(pathConverter.apply(file.getSecond()))
+              .build());
+    }
+    return GenericBuildEvent.protoChaining(this).setTestResult(builder.build()).build();
   }
 }
diff --git a/src/main/java/com/google/devtools/build/lib/rules/test/TestResult.java b/src/main/java/com/google/devtools/build/lib/rules/test/TestResult.java
index ba3ddd2dcb..f0c2b6d484 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/test/TestResult.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/test/TestResult.java
@@ -14,13 +14,7 @@
 
 package com.google.devtools.build.lib.rules.test;
 
-import com.google.common.collect.ImmutableList;
 import com.google.devtools.build.lib.actions.Artifact;
-import com.google.devtools.build.lib.buildeventstream.BuildEvent;
-import com.google.devtools.build.lib.buildeventstream.BuildEventId;
-import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos;
-import com.google.devtools.build.lib.buildeventstream.GenericBuildEvent;
-import com.google.devtools.build.lib.buildeventstream.PathConverter;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
 import com.google.devtools.build.lib.concurrent.ThreadSafety.ThreadSafe;
@@ -29,8 +23,6 @@ import com.google.devtools.build.lib.vfs.Path;
 import com.google.devtools.build.lib.vfs.PathFragment;
 import com.google.devtools.build.lib.view.test.TestStatus.BlazeTestStatus;
 import com.google.devtools.build.lib.view.test.TestStatus.TestResultData;
-import java.util.Collection;
-import javax.annotation.Nullable;
 
 /**
  * This is the event passed from the various test strategies to the {@code RecordingTestListener}
@@ -38,12 +30,11 @@ import javax.annotation.Nullable;
  */
 @ThreadSafe
 @Immutable
-public class TestResult implements BuildEvent {
+public class TestResult {
 
   private final TestRunnerAction testAction;
   private final TestResultData data;
   private final boolean cached;
-  private final @Nullable Integer attempt;
 
   /**
    * Construct the TestResult for the given test / status.
@@ -52,16 +43,10 @@ public class TestResult implements BuildEvent {
    * @param data test result protobuffer.
    * @param cached true if this is a locally cached test result.
    */
-  public TestResult(
-      TestRunnerAction testAction, TestResultData data, boolean cached, @Nullable Integer attempt) {
+  public TestResult(TestRunnerAction testAction, TestResultData data, boolean cached) {
     this.testAction = Preconditions.checkNotNull(testAction);
     this.data = data;
     this.cached = cached;
-    this.attempt = attempt;
-  }
-
-  public TestResult(TestRunnerAction testAction, TestResultData data, boolean cached) {
-    this(testAction, data, cached, null);
   }
 
   public static boolean isBlazeTestStatusPassed(BlazeTestStatus status) {
@@ -145,31 +130,4 @@ public class TestResult implements BuildEvent {
   public TestResultData getData() {
     return data;
   }
-
-  @Override
-  public BuildEventId getEventId() {
-    if (attempt != null) {
-      return BuildEventId.testResult(
-          testAction.getOwner().getLabel(),
-          testAction.getRunNumber(),
-          testAction.getShardNum(),
-          attempt);
-    } else {
-      return BuildEventId.testResult(
-          testAction.getOwner().getLabel(), testAction.getRunNumber(), testAction.getShardNum());
-    }
-  }
-
-  @Override
-  public Collection<BuildEventId> getChildrenEvents() {
-    return ImmutableList.of();
-  }
-
-  @Override
-  public BuildEventStreamProtos.BuildEvent asStreamProto(PathConverter pathConverter) {
-    BuildEventStreamProtos.TestResult.Builder resultBuilder =
-        BuildEventStreamProtos.TestResult.newBuilder();
-    resultBuilder.setSuccess(data.getTestPassed());
-    return GenericBuildEvent.protoChaining(this).setTestResult(resultBuilder.build()).build();
-  }
 }