---

cpovirk · kolea2 · commit 59329b15d9f6 · 2019-05-02T12:36:07.000-04:00
yaml --- r: 29041 b: refs/heads/autosynth-logging c: 00380da h: refs/heads/master i: 29039: 8469892
diff --git a/[refs] b/[refs]
@@ -104,7 +104,7 @@ refs/tags/v0.61.0: e4b526656bb1bf5eefd0ee578b7405147821225e
 refs/tags/v0.62.0: bbede7385d48ba08f487bdd29ec10668ace96396
 refs/heads/0.60.0-alpha: 10939381ffe0b8da32db4fe3087c86e3aa7f3e55
 refs/heads/autosynth-dlp: 49572edd157e407b5d979154c583b984e144c79f
-refs/heads/autosynth-logging: 75a5beb0966ac49eff3844ded49953640fff872e
+refs/heads/autosynth-logging: 00380dafe87787f2a3bdbdaf820b68d7a442bdf8
 refs/heads/dupes: 3478c5d81fd242d0e985656645a679420a2060c2
 refs/tags/v0.63.0: 94f19b71d40f46b36120e7b9d78a1a3d41bfcbd6
 refs/tags/v0.64.0: 456e8fbd129deced3ca025f239a2d8a82bde1d0a
diff --git a/branches/autosynth-logging/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/gaxx/reframing/ReframingResponseObserverTest.java b/branches/autosynth-logging/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-logging/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDatabaseAdminTest.java b/branches/autosynth-logging/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-logging/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITTransactionTest.java b/branches/autosynth-logging/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-logging/google-cloud-clients/pom.xml b/branches/autosynth-logging/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(`