---

cpovirk · kolea2 · commit 3147fdf0b992 · 2019-05-02T12:36:07.000-04:00
yaml --- r: 31901 b: refs/heads/autosynth-datastore c: 00380da h: refs/heads/master i: 31899: e2c9388
diff --git a/[refs] b/[refs]
@@ -127,7 +127,7 @@ refs/heads/autosynth-bigquerystorage: a345f72d7a6358e9fea9dcdae94ec85a27da3088
 refs/heads/autosynth-bigtable: 2a6af7e2959fd79c99b8ca5d773f29a6434b546d
 refs/heads/autosynth-bigtable-admin: 6379a2bc712f2736c83de0e009b4d26da4fa82ca
 refs/heads/autosynth-containeranalysis: 18d210f81f17cf74864d0db2c29e834302f74f2a
-refs/heads/autosynth-datastore: 75a5beb0966ac49eff3844ded49953640fff872e
+refs/heads/autosynth-datastore: 00380dafe87787f2a3bdbdaf820b68d7a442bdf8
 refs/heads/autosynth-dialogflow: 841930a680ebe370c9fc6ae824465f6bc51a5a46
 refs/heads/autosynth-errorreporting: 3f176c20b55dfaaa8fc32f28d82b31784b93e636
 refs/heads/autosynth-firestore: 983c75e4fb1076502c8cac73ef0538bdb10884f3
diff --git a/branches/autosynth-datastore/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/gaxx/reframing/ReframingResponseObserverTest.java b/branches/autosynth-datastore/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/gaxx/reframing/ReframingResponseObserverTest.java
@@ -335,7 +335,7 @@ public void push(String response) {
     innerCallable.call("request", middleware);
 
     Truth.assertThat(outerObserver.getFinalError()).isInstanceOf(IllegalStateException.class);
-    Truth.assertThat(outerObserver.getFinalError()).hasMessage("fake error");
+    Truth.assertThat(outerObserver.getFinalError()).hasMessageThat().isEqualTo("fake error");
     Truth.assertThat(outerObserver.popNextResponse()).isEqualTo("a");
     Truth.assertThat(outerObserver.popNextResponse()).isNull();
   }
@@ -365,7 +365,7 @@ public String pop() {
     StreamControllerStash<String> lastCall = innerCallable.popLastCall();
 
     Truth.assertThat(outerObserver.getFinalError()).isInstanceOf(IllegalStateException.class);
-    Truth.assertThat(outerObserver.getFinalError()).hasMessage("fake error");
+    Truth.assertThat(outerObserver.getFinalError()).hasMessageThat().isEqualTo("fake error");
     Truth.assertThat(outerObserver.popNextResponse()).isEqualTo("a");
     Truth.assertThat(outerObserver.popNextResponse()).isNull();
     Truth.assertThat(popCount.get()).isEqualTo(2);
diff --git a/branches/autosynth-datastore/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDatabaseAdminTest.java b/branches/autosynth-datastore/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDatabaseAdminTest.java
@@ -171,6 +171,6 @@ public void listPagination() throws Exception {
       dbIdsGot.add(db.getId().getDatabase());
       page = page.getNextPage();
     }
-    assertThat(dbIdsGot).containsAllIn(dbIds);
+    assertThat(dbIdsGot).containsAtLeastElementsIn(dbIds);
   }
 }
diff --git a/branches/autosynth-datastore/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITTransactionTest.java b/branches/autosynth-datastore/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITTransactionTest.java
@@ -138,7 +138,7 @@ public void run() {
     for (int i = 0; i < numThreads; ++i) {
       expectedResults.add(i + 1L);
     }
-    assertThat(results).containsAllIn(expectedResults);
+    assertThat(results).containsAtLeastElementsIn(expectedResults);
     assertThat(Sets.newHashSet(commitTimestamps)).hasSize(numThreads);
 
     assertThat(
diff --git a/branches/autosynth-datastore/google-cloud-clients/pom.xml b/branches/autosynth-datastore/google-cloud-clients/pom.xml
@@ -408,12 +408,12 @@
       <dependency>
         <groupId>com.google.truth</groupId>
         <artifactId>truth</artifactId>
-        <version>0.42</version>
+        <version>0.44</version>
       </dependency>
       <dependency>
         <groupId>org.checkerframework</groupId>
         <artifactId>checker-compat-qual</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.5</version>
       </dependency>
     </dependencies>
   </dependencyManagement>

Original file line number	Diff line number	Diff line change
`@@ -171,6 +171,6 @@ public void listPagination() throws Exception {`
`171`	`171`	`dbIdsGot.add(db.getId().getDatabase());`
`172`	`172`	`page = page.getNextPage();`
`173`	`173`	`}`
`174`		`- assertThat(dbIdsGot).containsAllIn(dbIds);`
	`174`	`+ assertThat(dbIdsGot).containsAtLeastElementsIn(dbIds);`
`175`	`175`	`}`
`176`	`176`	`}`
Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ public void run() {`
`138`	`138`	`for (int i = 0; i < numThreads; ++i) {`
`139`	`139`	`expectedResults.add(i + 1L);`
`140`	`140`	`}`
`141`		`- assertThat(results).containsAllIn(expectedResults);`
	`141`	`+ assertThat(results).containsAtLeastElementsIn(expectedResults);`
`142`	`142`	`assertThat(Sets.newHashSet(commitTimestamps)).hasSize(numThreads);`
`143`	`143`
`144`	`144`	`assertThat(`