diff options
| author |  ulfjack <ulfjack@google.com> | 2018-06-07 08:38:21 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-06-07 08:39:31 -0700 |
| commit | 81eda1d392b8845a7ba42f66cab7298477031c8a (patch) | |
| tree | 6afd3adb6534978bbc089b12c300c2c7c9547082 /src/test/java/com/google/devtools/build/lib/exec/StandaloneTestStrategyTest.java | |
| parent | d59570358b8fbbd6595c20d3169369df4a7989bb (diff) | |
Simplify TestAttempt interface
By always requiring a TestResultData instace, we simplify the callers, which
already have to do all the work anyway.
PiperOrigin-RevId: 199639965
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/exec/StandaloneTestStrategyTest.java')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/exec/StandaloneTestStrategyTest.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/exec/StandaloneTestStrategyTest.java b/src/test/java/com/google/devtools/build/lib/exec/StandaloneTestStrategyTest.java index 7c89da42ef..1aa181856b 100644 --- a/src/test/java/com/google/devtools/build/lib/exec/StandaloneTestStrategyTest.java +++ b/src/test/java/com/google/devtools/build/lib/exec/StandaloneTestStrategyTest.java @@ -37,6 +37,7 @@ import com.google.devtools.build.lib.analysis.test.TestProvider; import com.google.devtools.build.lib.analysis.test.TestResult; import com.google.devtools.build.lib.analysis.test.TestRunnerAction; import com.google.devtools.build.lib.analysis.util.BuildViewTestCase; +import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos.TestStatus; import com.google.devtools.build.lib.clock.BlazeClock; import com.google.devtools.build.lib.events.StoredEventHandler; import com.google.devtools.build.lib.exec.TestStrategy.TestOutputFormat; @@ -252,10 +253,10 @@ public final class StandaloneTestStrategyTest extends BuildViewTestCase { TestAttempt failedAttempt = attempts.get(0); assertThat(failedAttempt.getExecutionInfo().getStrategy()).isEqualTo("test"); assertThat(failedAttempt.getExecutionInfo().getHostname()).isEqualTo(""); - assertThat(failedAttempt.getStatus()).isEqualTo(BlazeTestStatus.FAILED); + assertThat(failedAttempt.getStatus()).isEqualTo(TestStatus.FAILED); assertThat(failedAttempt.getExecutionInfo().getCachedRemotely()).isFalse(); TestAttempt okAttempt = attempts.get(1); - assertThat(okAttempt.getStatus()).isEqualTo(BlazeTestStatus.PASSED); + assertThat(okAttempt.getStatus()).isEqualTo(TestStatus.PASSED); assertThat(okAttempt.getExecutionInfo().getStrategy()).isEqualTo("test"); assertThat(okAttempt.getExecutionInfo().getHostname()).isEqualTo(""); } @@ -333,7 +334,7 @@ public final class StandaloneTestStrategyTest extends BuildViewTestCase { .filter(TestAttempt.class::isInstance) .map(TestAttempt.class::cast) .collect(MoreCollectors.onlyElement()); - assertThat(attempt.getStatus()).isEqualTo(BlazeTestStatus.PASSED); + assertThat(attempt.getStatus()).isEqualTo(TestStatus.PASSED); assertThat(attempt.getExecutionInfo().getStrategy()).isEqualTo("remote"); assertThat(attempt.getExecutionInfo().getHostname()).isEqualTo("a-remote-host"); } |