fixe robolectricBinderTransportTest.clientReportsAuthzErrorToServer() test

Author: AgraVator

binder/src/test/java/io/grpc/binder/internal/RobolectricBinderTransportTest.java

@@ -388,7 +388,7 @@ public void clientReportsAuthzErrorToServer() throws Exception {
             .build();
     runIfNotNull(client.start(mockClientTransportListener));
     verify(mockClientTransportListener, timeout(TIMEOUT_MS))
-        .transportShutdown(statusCaptor.capture());
+        .transportShutdown(statusCaptor.capture(), any(DisconnectError.class));
     assertThat(statusCaptor.getValue().getCode()).isEqualTo(Status.Code.PERMISSION_DENIED);
 
     // Client doesn't tell the server in this case by design -- we don't even want to start it!

okhttp/src/test/java/io/grpc/okhttp/OkHttpClientTransportTest.java

@@ -1836,15 +1836,11 @@ public void unreachableServer() throws Exception {
     ManagedClientTransport.Listener listener = mock(ManagedClientTransport.Listener.class);
     clientTransport.start(listener);
     ArgumentCaptor<Status> statusCaptor = ArgumentCaptor.forClass(Status.class);
-    ArgumentCaptor<DisconnectError> errorCaptor = ArgumentCaptor.forClass(DisconnectError.class);
-
     verify(listener, timeout(TIME_OUT_MS)).transportShutdown(statusCaptor.capture(),
-        errorCaptor.capture());
+        eq(new GoAwayDisconnectError(GrpcUtil.Http2Error.INTERNAL_ERROR)));
     Status status = statusCaptor.getValue();
-    DisconnectError error = errorCaptor.getValue();
     assertEquals(Status.UNAVAILABLE.getCode(), status.getCode());
     assertTrue(status.getCause().toString(), status.getCause() instanceof IOException);
-    assertEquals(new GoAwayDisconnectError(GrpcUtil.Http2Error.INTERNAL_ERROR), error);
 
     MockStreamListener streamListener = new MockStreamListener();
     clientTransport.newStream(method, new Metadata(), CallOptions.DEFAULT, tracers)
@@ -1872,13 +1868,10 @@ public void customSocketFactory() throws Exception {
     ManagedClientTransport.Listener listener = mock(ManagedClientTransport.Listener.class);
     clientTransport.start(listener);
     ArgumentCaptor<Status> statusCaptor = ArgumentCaptor.forClass(Status.class);
-    ArgumentCaptor<DisconnectError> errorCaptor = ArgumentCaptor.forClass(DisconnectError.class);
     verify(listener, timeout(TIME_OUT_MS)).transportShutdown(statusCaptor.capture(),
-        errorCaptor.capture());
+        eq(new GoAwayDisconnectError(GrpcUtil.Http2Error.INTERNAL_ERROR)));
     Status status = statusCaptor.getValue();
-    DisconnectError error = errorCaptor.getValue();
     assertEquals(Status.UNAVAILABLE.getCode(), status.getCode());
-    assertEquals(new GoAwayDisconnectError(GrpcUtil.Http2Error.INTERNAL_ERROR), error);
     assertSame(exception, status.getCause());
   }
 
@@ -1968,11 +1961,9 @@ public void proxy_500() throws Exception {
     assertEquals(-1, sock.getInputStream().read());
 
     ArgumentCaptor<Status> statusCaptor = ArgumentCaptor.forClass(Status.class);
-    ArgumentCaptor<DisconnectError> errorCaptor = ArgumentCaptor.forClass(DisconnectError.class);
     verify(transportListener, timeout(TIME_OUT_MS)).transportShutdown(statusCaptor.capture(),
-        errorCaptor.capture());
+        eq(new GoAwayDisconnectError(GrpcUtil.Http2Error.INTERNAL_ERROR)));
     Status status = statusCaptor.getValue();
-    DisconnectError error = errorCaptor.getValue();
     assertTrue("Status didn't contain error code: " + statusCaptor.getValue(),
         status.getDescription().contains("500"));
     assertTrue("Status didn't contain error description: " + statusCaptor.getValue(),
@@ -1981,7 +1972,6 @@ public void proxy_500() throws Exception {
         status.getDescription().contains(errorText));
     assertEquals("Not UNAVAILABLE: " + statusCaptor.getValue(),
         Status.UNAVAILABLE.getCode(), status.getCode());
-    assertEquals(new GoAwayDisconnectError(GrpcUtil.Http2Error.INTERNAL_ERROR), error);
     sock.close();
     verify(transportListener, timeout(TIME_OUT_MS)).transportTerminated();
   }
@@ -2009,16 +1999,13 @@ public void proxy_immediateServerClose() throws Exception {
     sock.close();
 
     ArgumentCaptor<Status> statusCaptor = ArgumentCaptor.forClass(Status.class);
-    ArgumentCaptor<DisconnectError> errorCaptor = ArgumentCaptor.forClass(DisconnectError.class);
     verify(transportListener, timeout(TIME_OUT_MS)).transportShutdown(statusCaptor.capture(),
-        errorCaptor.capture());
+        eq(new GoAwayDisconnectError(GrpcUtil.Http2Error.INTERNAL_ERROR)));
     Status status = statusCaptor.getValue();
-    DisconnectError error = errorCaptor.getValue();
     assertTrue("Status didn't contain proxy: " + statusCaptor.getValue(),
         status.getDescription().contains("proxy"));
     assertEquals("Not UNAVAILABLE: " + statusCaptor.getValue(),
         Status.UNAVAILABLE.getCode(), status.getCode());
-    assertEquals(new GoAwayDisconnectError(GrpcUtil.Http2Error.INTERNAL_ERROR), error);
     verify(transportListener, timeout(TIME_OUT_MS)).transportTerminated();
   }