Migrate from assertThat(foo).named("foo") to assertWithMessage("foo").that(foo). (#5176)

cpovirk · sduskis · commit 14d2eec96e61 · 2019-05-13T08:37:52.000-04:00
named(...) is being removed.

This CL may slightly modify the failure messages produced, but all the old information will still be present.
diff --git a/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/AbstractStructReaderTypesTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/AbstractStructReaderTypesTest.java
@@ -18,6 +18,7 @@
 
 import static com.google.cloud.spanner.Type.StructField;
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
 import static org.junit.Assert.fail;
 import static org.junit.runners.Parameterized.Parameter;
 
@@ -352,17 +353,17 @@ public void getterForIncorrectType() throws Exception {
         getterByIndex(method.getName(), columnIndex);
         fail("Expected ISE for " + method);
       } catch (IllegalStateException e) {
-        assertThat(e.getMessage()).named("Exception for " + method).contains("was " + type);
-        assertThat(e.getMessage())
-            .named("Exception for " + method)
+        assertWithMessage("Exception for " + method).that(e.getMessage()).contains("was " + type);
+        assertWithMessage("Exception for " + method)
+            .that(e.getMessage())
             .contains("Column " + columnIndex);
       }
       try {
         getterByName(method.getName(), "F1");
         fail("Expected ISE for " + method);
       } catch (IllegalStateException e) {
-        assertThat(e.getMessage()).named("Exception for " + method).contains("was " + type);
-        assertThat(e.getMessage()).named("Exception for " + method).contains("Column F1");
+        assertWithMessage("Exception for " + method).that(e.getMessage()).contains("was " + type);
+        assertWithMessage("Exception for " + method).that(e.getMessage()).contains("Column F1");
       }
     }
   }
diff --git a/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TimestampBoundTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TimestampBoundTest.java
@@ -18,6 +18,7 @@
 
 import static com.google.common.testing.SerializableTester.reserializeAndAssert;
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
 
 import com.google.cloud.Timestamp;
 import com.google.cloud.spanner.TimestampBound.Mode;
@@ -110,8 +111,8 @@ public void stalenessSourceUnits() {
     long num = 7;
     for (TimeUnit units : TimeUnit.values()) {
       TimestampBound bound = TimestampBound.ofExactStaleness(num, units);
-      assertThat(bound.getExactStaleness(TimeUnit.NANOSECONDS))
-          .named(units.toString())
+      assertWithMessage(units.toString())
+          .that(bound.getExactStaleness(TimeUnit.NANOSECONDS))
           .isEqualTo(units.toNanos(num));
     }
   }
diff --git a/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/ValueBinderTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/ValueBinderTest.java
@@ -17,6 +17,7 @@
 package com.google.cloud.spanner;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
 
 import com.google.cloud.ByteArray;
 import com.google.cloud.Date;
@@ -54,7 +55,7 @@ public void reflection() throws InvocationTargetException, IllegalAccessExceptio
         continue;
       }
       Method binderMethod = findBinderMethod(method);
-      assertThat(binderMethod).named("Binder for " + method.toString()).isNotNull();
+      assertWithMessage("Binder for " + method.toString()).that(binderMethod).isNotNull();
 
       if (method.getName().toLowerCase().contains("struct")) {
         // Struct / Array-of-struct binding methods.
diff --git a/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/ValueTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/ValueTest.java
@@ -18,6 +18,7 @@
 
 import static com.google.common.testing.SerializableTester.reserializeAndAssert;
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
 
 import com.google.cloud.ByteArray;
 import com.google.cloud.Date;
@@ -359,8 +360,8 @@ public void boolArrayFromPlainIterable() {
       }
       String name = "boolArray() of length " + i;
       Value v = Value.boolArray(plainIterable(data));
-      assertThat(v.isNull()).named(name).isFalse();
-      assertThat(v.getBoolArray()).named(name).containsExactly((Object[]) data).inOrder();
+      assertWithMessage(name).that(v.isNull()).isFalse();
+      assertWithMessage(name).that(v.getBoolArray()).containsExactly((Object[]) data).inOrder();
     }
   }
 
diff --git a/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITReadTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITReadTest.java
@@ -19,6 +19,7 @@
 import static com.google.cloud.spanner.SpannerMatchers.isSpannerException;
 import static com.google.cloud.spanner.Type.StructField;
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
 
 import com.google.cloud.spanner.Database;
 import com.google.cloud.spanner.DatabaseClient;
@@ -426,7 +427,7 @@ private void checkReadRange(Source source, KeySet keySet, long limit, int[] expe
       rows.put(resultSet.getString(0), resultSet.getString(1));
     }
 
-    assertThat(rows).named("read of " + keySet).isEqualTo(expected);
+    assertWithMessage("read of " + keySet).that(rows).isEqualTo(expected);
   }
 
   private void checkRange(Source source, KeyRange range, int... expectedRows) {

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`
`19`	`19`	`import static com.google.common.testing.SerializableTester.reserializeAndAssert;`
`20`	`20`	`import static com.google.common.truth.Truth.assertThat;`
	`21`	`+import static com.google.common.truth.Truth.assertWithMessage;`
`21`	`22`
`22`	`23`	`import com.google.cloud.ByteArray;`
`23`	`24`	`import com.google.cloud.Date;`
`@@ -359,8 +360,8 @@ public void boolArrayFromPlainIterable() {`
`359`	`360`	`}`
`360`	`361`	`String name = "boolArray() of length " + i;`
`361`	`362`	`Value v = Value.boolArray(plainIterable(data));`
`362`		`- assertThat(v.isNull()).named(name).isFalse();`
`363`		`- assertThat(v.getBoolArray()).named(name).containsExactly((Object[]) data).inOrder();`
	`363`	`+ assertWithMessage(name).that(v.isNull()).isFalse();`
	`364`	`+ assertWithMessage(name).that(v.getBoolArray()).containsExactly((Object[]) data).inOrder();`
`364`	`365`	`}`
`365`	`366`	`}`
`366`	`367`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`	`import static com.google.cloud.spanner.SpannerMatchers.isSpannerException;`
`20`	`20`	`import static com.google.cloud.spanner.Type.StructField;`
`21`	`21`	`import static com.google.common.truth.Truth.assertThat;`
	`22`	`+import static com.google.common.truth.Truth.assertWithMessage;`
`22`	`23`
`23`	`24`	`import com.google.cloud.spanner.Database;`
`24`	`25`	`import com.google.cloud.spanner.DatabaseClient;`
`@@ -426,7 +427,7 @@ private void checkReadRange(Source source, KeySet keySet, long limit, int[] expe`
`426`	`427`	`rows.put(resultSet.getString(0), resultSet.getString(1));`
`427`	`428`	`}`
`428`	`429`
`429`		`- assertThat(rows).named("read of " + keySet).isEqualTo(expected);`
	`430`	`+ assertWithMessage("read of " + keySet).that(rows).isEqualTo(expected);`
`430`	`431`	`}`
`431`	`432`
`432`	`433`	`private void checkRange(Source source, KeyRange range, int... expectedRows) {`