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.getMessage()).contains("Invalid character");
+    assertThat(e).hasMessageThat().isEqualTo("Invalid character");
   }
 
   @Test
@@ -273,7 +273,7 @@ public void shortBinaryKeyName() {
   public void invalidSuffixBinaryKeyName() {
     IllegalArgumentException e = assertThrows(IllegalArgumentException.class,
         () -> Metadata.Key.of("nonbinary", FISH_MARSHALLER));
-    assertThat(e.getMessage()).contains("Binary header is named");
+    assertThat(e).hasMessageThat().isEqualTo("Binary header is named nonbinary. It must end with -bin");
   }
 
   @Test

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

@@ -41,22 +41,22 @@ public void failsOnNullName() {
     List<MethodDescriptor<?, ?>> methods = Collections.emptyList();
     NullPointerException e = assertThrows(NullPointerException.class,
         () -> new ServiceDescriptor(null, methods));
-    assertThat(e.getMessage()).contains("name");
+    assertThat(e).hasMessageThat().isEqualTo("name");
   }
 
   @Test
   public void failsOnNullMethods() {
     NullPointerException e = assertThrows(NullPointerException.class,
         () -> new ServiceDescriptor("name", (Collection<MethodDescriptor<?, ?>>) null));
-    assertThat(e.getMessage()).contains("methods");
+    assertThat(e).hasMessageThat().isEqualTo("methods");
   }
 
   @Test
   public void failsOnNullMethod() {
     List<MethodDescriptor<?, ?>> methods = Collections.singletonList(null);
     NullPointerException e = assertThrows(NullPointerException.class,
         () -> new ServiceDescriptor("name", methods));
-    assertThat(e.getMessage()).contains("method");
+    assertThat(e).hasMessageThat().isEqualTo("method");
   }
 
   @Test
@@ -71,7 +71,7 @@ public void failsOnNonMatchingNames() {
 
     IllegalArgumentException e = assertThrows(IllegalArgumentException.class,
         () -> new ServiceDescriptor("name", descriptors));
-    assertThat(e.getMessage()).contains("service names");
+    assertThat(e).hasMessageThat().isEqualTo("service names wrongservice != name");
   }
 
   @Test
@@ -92,7 +92,7 @@ public void failsOnNonDuplicateNames() {
 
     IllegalArgumentException e = assertThrows(IllegalArgumentException.class,
         () -> new ServiceDescriptor("name", descriptors));
-    assertThat(e.getMessage()).contains("duplicate");
+    assertThat(e).hasMessageThat().isEqualTo("duplicate name name/method");
   }
 
   @Test