---

cpovirk · kolea2 · commit c530395dc609 · 2019-05-02T12:36:07.000-04:00
yaml --- r: 35295 b: refs/heads/pubsub-ordering-keys c: 00380da h: refs/heads/master i: 35293: 98f9ed0 35291: eaccc4f 35287: af7e470 35279: 3dd18e4 35263: f921105
diff --git a/[refs] b/[refs]
@@ -155,7 +155,7 @@ refs/tags/v0.72.0: a7703f2593ba312c0b2dde6fdfd4f5c764bb55ac
 refs/tags/v0.73.0: 21241ea8be9439cc5764c4944cdce21d34ce4f9e
 refs/tags/v0.74.0: 9d1f733dbbf790de7b494418523b69c4a9a57638
 refs/heads/ignoretest: 23c412ae07af3d0ab1caa2d44d5bc5c0ccb8b31d
-refs/heads/pubsub-ordering-keys: 75a5beb0966ac49eff3844ded49953640fff872e
+refs/heads/pubsub-ordering-keys: 00380dafe87787f2a3bdbdaf820b68d7a442bdf8
 refs/tags/v0.75.0: c3673089ae09a897c1b4cf7dfe167fe4f8ab32fb
 refs/tags/v0.76.0: 395b016826d3ddf9cb8b34919636df15a4dbd032
 refs/tags/v0.77.0: 28a85a77883ccf5d48f297fd0ef3b3dca6ce01f0
diff --git a/branches/pubsub-ordering-keys/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/gaxx/reframing/ReframingResponseObserverTest.java b/branches/pubsub-ordering-keys/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/pubsub-ordering-keys/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDatabaseAdminTest.java b/branches/pubsub-ordering-keys/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/pubsub-ordering-keys/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITTransactionTest.java b/branches/pubsub-ordering-keys/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/pubsub-ordering-keys/google-cloud-clients/pom.xml b/branches/pubsub-ordering-keys/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(`