Migrate from containsAllIn to containsAtLeastElementsIn. (#5042)

cpovirk · kolea2 · commit 00380dafe877 · 2019-05-02T12:36:07.000-04:00
The two behave identically, and containsAllIn is being removed.

The new method was added in Truth 0.44, so update to that.

That requires a migration from the removed ThrowableSubject.hasMessage(...) to hasMessageThat().isEqualTo(...).

And to preserve RequireUpperBoundDeps, also update checker-compat-qual to 2.5.5.
diff --git a/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/gaxx/reframing/ReframingResponseObserverTest.java b/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/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDatabaseAdminTest.java b/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/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITTransactionTest.java b/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/google-cloud-clients/pom.xml b/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(`