Migrate from isSameAs to isSameInstanceAs (and isNotSameAs to isNotSameInstanceAs). (#5172)

cpovirk · sduskis · commit 6b78c52cfa63 · 2019-05-13T15:21:50.000-04:00
The new methods behave identically to the old, which are being removed.

The new methods were added to Truth in version 0.44.
diff --git a/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/MutationTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/MutationTest.java
@@ -233,7 +233,7 @@ public void serializationBasic() {
     Mutation.toProto(mutations, proto);
 
     assertThat(proto.size()).isAtLeast(1);
-    assertThat(proto.get(0)).isSameAs(existingProto);
+    assertThat(proto.get(0)).isSameInstanceAs(existingProto);
     proto.remove(0);
 
     assertThat(proto.size()).isEqualTo(5);
diff --git a/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerImplTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerImplTest.java
@@ -94,7 +94,7 @@ public void getDbclientAgainGivesSame() {
     // Get db client again
     DatabaseClient databaseClient1 = impl.getDatabaseClient(db);
 
-    assertThat(databaseClient1).isSameAs(databaseClient);
+    assertThat(databaseClient1).isSameInstanceAs(databaseClient);
   }
 
   @Test
diff --git a/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TypeTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TypeTest.java
@@ -47,7 +47,7 @@ private abstract static class ScalarTypeTester {
     void test() {
       Type t = newType();
       assertThat(t.getCode()).isEqualTo(expectedCode);
-      assertThat(newType()).isSameAs(t); // Interned.
+      assertThat(newType()).isSameInstanceAs(t); // Interned.
       // String form is deliberately the same as the corresponding type enum in the public API.
       assertThat(t.toString()).isEqualTo(expectedProtoCode.toString());
 
@@ -59,7 +59,7 @@ void test() {
       // Round trip.
       Type fromProto = Type.fromProto(proto);
       assertThat(fromProto).isEqualTo(t);
-      assertThat(fromProto).isSameAs(t);
+      assertThat(fromProto).isSameInstanceAs(t);
 
       reserializeAndAssert(t);
     }
@@ -155,7 +155,7 @@ void test() {
       assertThat(t.getCode()).isEqualTo(Type.Code.ARRAY);
       assertThat(t.getArrayElementType()).isEqualTo(elementType);
       if (expectInterned) {
-        assertThat(Type.array(newElementType())).isSameAs(t);
+        assertThat(Type.array(newElementType())).isSameInstanceAs(t);
       }
       assertThat(t.toString()).isEqualTo("ARRAY<" + elementType.toString() + ">");
 
@@ -168,7 +168,7 @@ void test() {
       assertThat(fromProto).isEqualTo(t);
 
       if (expectInterned) {
-        assertThat(fromProto).isSameAs(t);
+        assertThat(fromProto).isSameInstanceAs(t);
       }
       reserializeAndAssert(t);
     }
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
@@ -214,15 +214,15 @@ public void bytes() {
     Value v = Value.bytes(bytes);
     assertThat(v.getType()).isEqualTo(Type.bytes());
     assertThat(v.isNull()).isFalse();
-    assertThat(v.getBytes()).isSameAs(bytes);
+    assertThat(v.getBytes()).isSameInstanceAs(bytes);
     assertThat(v.toString()).isEqualTo(bytes.toString());
   }
 
   @Test
   public void bytesUnprintable() {
     ByteArray bytes = ByteArray.copyFrom(new byte[] {'a', 0, 15, -1, 'e'});
     Value v = Value.bytes(bytes);
-    assertThat(v.getBytes()).isSameAs(bytes);
+    assertThat(v.getBytes()).isSameInstanceAs(bytes);
     assertThat(v.toString()).isEqualTo(bytes.toString());
   }
 
@@ -246,7 +246,7 @@ public void timestamp() {
     assertThat(v.getType()).isEqualTo(Type.timestamp());
     assertThat(v.isNull()).isFalse();
     assertThat(v.isCommitTimestamp()).isFalse();
-    assertThat(v.getTimestamp()).isSameAs(t);
+    assertThat(v.getTimestamp()).isSameInstanceAs(t);
     assertThat(v.toString()).isEqualTo(timestamp);
   }
 
@@ -286,7 +286,7 @@ public void date() {
     Value v = Value.date(t);
     assertThat(v.getType()).isEqualTo(Type.date());
     assertThat(v.isNull()).isFalse();
-    assertThat(v.getDate()).isSameAs(t);
+    assertThat(v.getDate()).isSameInstanceAs(t);
     assertThat(v.toString()).isEqualTo(date);
   }
 

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ public void getDbclientAgainGivesSame() {`
`94`	`94`	`// Get db client again`
`95`	`95`	`DatabaseClient databaseClient1 = impl.getDatabaseClient(db);`
`96`	`96`
`97`		`- assertThat(databaseClient1).isSameAs(databaseClient);`
	`97`	`+ assertThat(databaseClient1).isSameInstanceAs(databaseClient);`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`@Test`