Skip to content

Commit aa24666

Browse files
cpovirksduskis
authored andcommitted
---
yaml --- r: 31935 b: refs/heads/autosynth-datastore c: 6b78c52 h: refs/heads/master i: 31933: 8bd6b85 31931: 961b6cf 31927: cada8aa 31919: 98f9261 31903: 38a29bd 31871: 4a369d7
1 parent f3d12a5 commit aa24666

5 files changed

Lines changed: 11 additions & 11 deletions

File tree

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ refs/heads/autosynth-bigquerystorage: a345f72d7a6358e9fea9dcdae94ec85a27da3088
127127
refs/heads/autosynth-bigtable: 2a6af7e2959fd79c99b8ca5d773f29a6434b546d
128128
refs/heads/autosynth-bigtable-admin: 6379a2bc712f2736c83de0e009b4d26da4fa82ca
129129
refs/heads/autosynth-containeranalysis: 18d210f81f17cf74864d0db2c29e834302f74f2a
130-
refs/heads/autosynth-datastore: 1b29001e39672994368e51ce6fae44a5528613fa
130+
refs/heads/autosynth-datastore: 6b78c52cfa63334e3846e348752f8345d78f0aa8
131131
refs/heads/autosynth-dialogflow: 841930a680ebe370c9fc6ae824465f6bc51a5a46
132132
refs/heads/autosynth-errorreporting: 3f176c20b55dfaaa8fc32f28d82b31784b93e636
133133
refs/heads/autosynth-firestore: 983c75e4fb1076502c8cac73ef0538bdb10884f3

branches/autosynth-datastore/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/MutationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ public void serializationBasic() {
233233
Mutation.toProto(mutations, proto);
234234

235235
assertThat(proto.size()).isAtLeast(1);
236-
assertThat(proto.get(0)).isSameAs(existingProto);
236+
assertThat(proto.get(0)).isSameInstanceAs(existingProto);
237237
proto.remove(0);
238238

239239
assertThat(proto.size()).isEqualTo(5);

branches/autosynth-datastore/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerImplTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public void getDbclientAgainGivesSame() {
9494
// Get db client again
9595
DatabaseClient databaseClient1 = impl.getDatabaseClient(db);
9696

97-
assertThat(databaseClient1).isSameAs(databaseClient);
97+
assertThat(databaseClient1).isSameInstanceAs(databaseClient);
9898
}
9999

100100
@Test

branches/autosynth-datastore/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TypeTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ private abstract static class ScalarTypeTester {
4747
void test() {
4848
Type t = newType();
4949
assertThat(t.getCode()).isEqualTo(expectedCode);
50-
assertThat(newType()).isSameAs(t); // Interned.
50+
assertThat(newType()).isSameInstanceAs(t); // Interned.
5151
// String form is deliberately the same as the corresponding type enum in the public API.
5252
assertThat(t.toString()).isEqualTo(expectedProtoCode.toString());
5353

@@ -59,7 +59,7 @@ void test() {
5959
// Round trip.
6060
Type fromProto = Type.fromProto(proto);
6161
assertThat(fromProto).isEqualTo(t);
62-
assertThat(fromProto).isSameAs(t);
62+
assertThat(fromProto).isSameInstanceAs(t);
6363

6464
reserializeAndAssert(t);
6565
}
@@ -155,7 +155,7 @@ void test() {
155155
assertThat(t.getCode()).isEqualTo(Type.Code.ARRAY);
156156
assertThat(t.getArrayElementType()).isEqualTo(elementType);
157157
if (expectInterned) {
158-
assertThat(Type.array(newElementType())).isSameAs(t);
158+
assertThat(Type.array(newElementType())).isSameInstanceAs(t);
159159
}
160160
assertThat(t.toString()).isEqualTo("ARRAY<" + elementType.toString() + ">");
161161

@@ -168,7 +168,7 @@ void test() {
168168
assertThat(fromProto).isEqualTo(t);
169169

170170
if (expectInterned) {
171-
assertThat(fromProto).isSameAs(t);
171+
assertThat(fromProto).isSameInstanceAs(t);
172172
}
173173
reserializeAndAssert(t);
174174
}

branches/autosynth-datastore/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/ValueTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -214,15 +214,15 @@ public void bytes() {
214214
Value v = Value.bytes(bytes);
215215
assertThat(v.getType()).isEqualTo(Type.bytes());
216216
assertThat(v.isNull()).isFalse();
217-
assertThat(v.getBytes()).isSameAs(bytes);
217+
assertThat(v.getBytes()).isSameInstanceAs(bytes);
218218
assertThat(v.toString()).isEqualTo(bytes.toString());
219219
}
220220

221221
@Test
222222
public void bytesUnprintable() {
223223
ByteArray bytes = ByteArray.copyFrom(new byte[] {'a', 0, 15, -1, 'e'});
224224
Value v = Value.bytes(bytes);
225-
assertThat(v.getBytes()).isSameAs(bytes);
225+
assertThat(v.getBytes()).isSameInstanceAs(bytes);
226226
assertThat(v.toString()).isEqualTo(bytes.toString());
227227
}
228228

@@ -246,7 +246,7 @@ public void timestamp() {
246246
assertThat(v.getType()).isEqualTo(Type.timestamp());
247247
assertThat(v.isNull()).isFalse();
248248
assertThat(v.isCommitTimestamp()).isFalse();
249-
assertThat(v.getTimestamp()).isSameAs(t);
249+
assertThat(v.getTimestamp()).isSameInstanceAs(t);
250250
assertThat(v.toString()).isEqualTo(timestamp);
251251
}
252252

@@ -286,7 +286,7 @@ public void date() {
286286
Value v = Value.date(t);
287287
assertThat(v.getType()).isEqualTo(Type.date());
288288
assertThat(v.isNull()).isFalse();
289-
assertThat(v.getDate()).isSameAs(t);
289+
assertThat(v.getDate()).isSameInstanceAs(t);
290290
assertThat(v.toString()).isEqualTo(date);
291291
}
292292

0 commit comments

Comments
 (0)