CR

Author: panchenko

api/src/test/java/io/grpc/MetadataTest.java

@@ -120,7 +120,7 @@ public Fish parseStream(InputStream stream) {
   public void noPseudoHeaders() {
     IllegalArgumentException e = assertThrows(IllegalArgumentException.class,
         () -> Metadata.Key.of(":test-bin", FISH_MARSHALLER));
-    assertThat(e).hasMessageThat().isEqualTo("Invalid character");
+    assertThat(e).hasMessageThat().isEqualTo("Invalid character ':' in key name ':test-bin'");
   }
 
   @Test
@@ -273,7 +273,8 @@ public void shortBinaryKeyName() {
   public void invalidSuffixBinaryKeyName() {
     IllegalArgumentException e = assertThrows(IllegalArgumentException.class,
         () -> Metadata.Key.of("nonbinary", FISH_MARSHALLER));
-    assertThat(e).hasMessageThat().isEqualTo("Binary header is named nonbinary. It must end with -bin");
+    assertThat(e).hasMessageThat()
+        .isEqualTo("Binary header is named nonbinary. It must end with -bin");
   }
 
   @Test

core/src/test/java/io/grpc/internal/DnsNameResolverTest.java

@@ -916,7 +916,7 @@ public void maybeChooseServiceConfig_failsOnMisspelling() {
     Random random = new Random();
     VerifyException e = assertThrows(VerifyException.class,
         () -> DnsNameResolver.maybeChooseServiceConfig(bad, random, "host"));
-    assertThat(e).hasMessageThat().contains("Bad key");
+    assertThat(e).hasMessageThat().isEqualTo("Bad key: parcentage=1.0");
   }
 
   @Test
@@ -1162,7 +1162,7 @@ public void parseTxtResults_badTypeFails() {
 
     ClassCastException e = assertThrows(ClassCastException.class,
         () -> DnsNameResolver.parseTxtResults(txtRecords));
-    assertThat(e).hasMessageThat().contains("wrong type");
+    assertThat(e).hasMessageThat().isEqualTo("wrong type {}");
   }
 
   @Test
@@ -1173,7 +1173,7 @@ public void parseTxtResults_badInnerTypeFails() {
 
     ClassCastException e = assertThrows(ClassCastException.class,
         () -> DnsNameResolver.parseTxtResults(txtRecords));
-    assertThat(e).hasMessageThat().contains("not object");
+    assertThat(e).hasMessageThat().isEqualTo("value bogus for idx 0 in [bogus] is not object");
   }
 
   @Test

core/src/test/java/io/grpc/internal/GrpcUtilTest.java

@@ -227,15 +227,16 @@ public void checkAuthority_succeedsOnIpV6() {
   public void checkAuthority_failsOnInvalidAuthority() {
     IllegalArgumentException e = assertThrows(IllegalArgumentException.class,
         () -> GrpcUtil.checkAuthority("[ : : 1]"));
-    assertThat(e).hasMessageThat().contains("Invalid authority");
+    assertThat(e).hasMessageThat().isEqualTo("Invalid authority: [ : : 1]");
   }
 
 
   @Test
   public void checkAuthority_userInfoNotAllowed() {
     IllegalArgumentException e = assertThrows(IllegalArgumentException.class,
         () -> GrpcUtil.checkAuthority("foo@valid"));
-    assertThat(e).hasMessageThat().contains("Userinfo");
+    assertThat(e).hasMessageThat()
+        .isEqualTo("Userinfo must not be present on authority: 'foo@valid'");
   }
 
   @Test

core/src/test/java/io/grpc/internal/ManagedChannelImplBuilderTest.java

@@ -424,7 +424,7 @@ public void checkAuthority_validAuthorityAllowed() {
   public void checkAuthority_invalidAuthorityFailed() {
     IllegalArgumentException e = assertThrows(IllegalArgumentException.class,
         () -> builder.checkAuthority(DUMMY_AUTHORITY_INVALID));
-    assertThat(e).hasMessageThat().contains("Invalid authority");
+    assertThat(e).hasMessageThat().isEqualTo("Invalid authority: [ : : 1]");
   }
 
   @Test
@@ -450,7 +450,7 @@ public void disableCheckAuthority_invalidAuthorityFailed() {
     builder.disableCheckAuthority().enableCheckAuthority();
     IllegalArgumentException e = assertThrows(IllegalArgumentException.class,
         () -> builder.checkAuthority(DUMMY_AUTHORITY_INVALID));
-    assertThat(e).hasMessageThat().contains("Invalid authority");
+    assertThat(e).hasMessageThat().isEqualTo("Invalid authority: [ : : 1]");
   }
 
   @Test

core/src/test/java/io/grpc/internal/MessageFramerTest.java

@@ -466,6 +466,7 @@ static class BytesWritableBufferAllocator implements WritableBufferAllocator {
 
     @Override
     public WritableBuffer allocate(int capacityHint) {
+      System.out.println("allocate " + capacityHint);
       allocCount++;
       return new ByteWritableBuffer(Math.min(maxSize, Math.max(capacityHint, minSize)));
     }