diff options
| author |  olaola <olaola@google.com> | 2018-02-08 09:38:53 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-02-08 09:40:36 -0800 |
| commit | 995d62e379493b04e8eb8966fa8e4da26bcb619d (patch) | |
| tree | a4797fe49eb37219db007e51d966ef4aa4bebada /src/test/java/com/google | |
| parent | 13962bf49cc756b49d9f114baf454f428a18acac (diff) | |
User-friendlier representation of a missing digest.
I moved it into DigestUtil preemptively in case we switch to binary instead of hex representation.
TESTED=manually
RELNOTES: None
PiperOrigin-RevId: 185007558
Diffstat (limited to 'src/test/java/com/google')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/remote/GrpcRemoteExecutionClientTest.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/remote/GrpcRemoteExecutionClientTest.java b/src/test/java/com/google/devtools/build/lib/remote/GrpcRemoteExecutionClientTest.java index 7167f2f48a..25229f6d19 100644 --- a/src/test/java/com/google/devtools/build/lib/remote/GrpcRemoteExecutionClientTest.java +++ b/src/test/java/com/google/devtools/build/lib/remote/GrpcRemoteExecutionClientTest.java @@ -342,7 +342,7 @@ public class GrpcRemoteExecutionClientTest { return new StreamObserver<WriteRequest>() { @Override public void onNext(WriteRequest request) { - assertThat(request.getResourceName()).contains(digest.getHash()); + assertThat(request.getResourceName()).contains(DIGEST_UTIL.toString(digest)); assertThat(request.getFinishWrite()).isTrue(); assertThat(request.getData().toByteArray()).isEqualTo(data); responseObserver.onNext( @@ -774,7 +774,8 @@ public class GrpcRemoteExecutionClientTest { new ByteStreamImplBase() { @Override public void read(ReadRequest request, StreamObserver<ReadResponse> responseObserver) { - assertThat(request.getResourceName().contains(stdOutDigest.getHash())).isTrue(); + assertThat(request.getResourceName().contains(DIGEST_UTIL.toString(stdOutDigest))) + .isTrue(); responseObserver.onError(Status.NOT_FOUND.asRuntimeException()); } }); @@ -785,7 +786,7 @@ public class GrpcRemoteExecutionClientTest { } catch (SpawnExecException expected) { assertThat(expected.getSpawnResult().status()) .isEqualTo(SpawnResult.Status.REMOTE_CACHE_FAILED); - assertThat(expected).hasMessageThat().contains(stdOutDigest.getHash()); + assertThat(expected).hasMessageThat().contains(DIGEST_UTIL.toString(stdOutDigest)); // Ensure we also got back the stack trace. assertThat(expected).hasMessageThat() .contains("GrpcRemoteExecutionClientTest.passCacheMissErrorWithStackTrace"); @@ -833,7 +834,8 @@ public class GrpcRemoteExecutionClientTest { new ByteStreamImplBase() { @Override public void read(ReadRequest request, StreamObserver<ReadResponse> responseObserver) { - assertThat(request.getResourceName().contains(stdOutDigest.getHash())).isTrue(); + assertThat(request.getResourceName().contains(DIGEST_UTIL.toString(stdOutDigest))) + .isTrue(); responseObserver.onError(Status.NOT_FOUND.asRuntimeException()); } }); @@ -844,7 +846,7 @@ public class GrpcRemoteExecutionClientTest { } catch (SpawnExecException expected) { assertThat(expected.getSpawnResult().status()) .isEqualTo(SpawnResult.Status.REMOTE_CACHE_FAILED); - assertThat(expected).hasMessageThat().contains(stdOutDigest.getHash()); + assertThat(expected).hasMessageThat().contains(DIGEST_UTIL.toString(stdOutDigest)); // Ensure we also got back the stack trace. assertThat(expected) .hasMessageThat() |