From 80c02ab5b4ecd67096abc6623a93afe19c96780f Mon Sep 17 00:00:00 2001
From: Solomon Duskis <sduskis@google.com>
Date: Thu, 28 Feb 2019 20:17:07 -0500
Subject: [PATCH] Using the latest version of truth (#4597)

* Using a much newer version of truth

* Upgrading annotations in google-api-grpc
---
 google-api-grpc/pom.xml                               |  2 +-
 google-cloud-clients/google-cloud-core/pom.xml        |  5 +++++
 .../com/google/cloud/spanner/GrpcResultSetTest.java   |  5 ++++-
 .../java/com/google/cloud/spanner/ResultSetsTest.java |  7 +++++--
 google-cloud-clients/pom.xml                          | 11 ++++++++---
 5 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/google-api-grpc/pom.xml b/google-api-grpc/pom.xml
index ad2919050be3..2cff2dc517b7 100644
--- a/google-api-grpc/pom.xml
+++ b/google-api-grpc/pom.xml
@@ -93,7 +93,7 @@
     <dependency>
       <groupId>javax.annotation</groupId>
       <artifactId>javax.annotation-api</artifactId>
-      <version>1.2</version>
+      <version>1.3.2</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/google-cloud-clients/google-cloud-core/pom.xml b/google-cloud-clients/google-cloud-core/pom.xml
index b11f39571e03..7955886b154c 100644
--- a/google-cloud-clients/google-cloud-core/pom.xml
+++ b/google-cloud-clients/google-cloud-core/pom.xml
@@ -81,5 +81,10 @@
       <artifactId>guava-testlib</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.checkerframework</groupId>
+      <artifactId>checker-compat-qual</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/GrpcResultSetTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/GrpcResultSetTest.java
index 63a8e792f709..6b88e72e44c1 100644
--- a/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/GrpcResultSetTest.java
+++ b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/GrpcResultSetTest.java
@@ -762,7 +762,10 @@ public void getDoubleArray() {
     consumer.onCompleted();
 
     assertThat(resultSet.next()).isTrue();
-    assertThat(resultSet.getDoubleArray(0)).isEqualTo(doubleArray, 0.0);
+    assertThat(resultSet.getDoubleArray(0))
+        .usingTolerance(0.0)
+        .containsExactly(doubleArray)
+        .inOrder();
   }
 
   @Test
diff --git a/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/ResultSetsTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/ResultSetsTest.java
index 6bfb6c9e4308..dc6892fed26d 100644
--- a/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/ResultSetsTest.java
+++ b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/ResultSetsTest.java
@@ -192,8 +192,11 @@ public void resultSetIteration() {
     assertThat(rs.getLongArray("longArray")).isEqualTo(longArray);
     assertThat(rs.getLongList(9)).isEqualTo(Longs.asList(longArray));
     assertThat(rs.getLongList("longArray")).isEqualTo(Longs.asList(longArray));
-    assertThat(rs.getDoubleArray(10)).isEqualTo(doubleArray, 0.0);
-    assertThat(rs.getDoubleArray("doubleArray")).isEqualTo(doubleArray, 0.0);
+    assertThat(rs.getDoubleArray(10)).usingTolerance(0.0).containsAllOf(doubleArray);
+    assertThat(rs.getDoubleArray("doubleArray"))
+        .usingTolerance(0.0)
+        .containsExactly(doubleArray)
+        .inOrder();
     assertThat(rs.getDoubleList(10)).isEqualTo(Doubles.asList(doubleArray));
     assertThat(rs.getDoubleList("doubleArray")).isEqualTo(Doubles.asList(doubleArray));
     assertThat(rs.getBytesList(11)).isEqualTo(Arrays.asList(byteArray));
diff --git a/google-cloud-clients/pom.xml b/google-cloud-clients/pom.xml
index 35a6cf4d1ea8..5b2895d34d1d 100644
--- a/google-cloud-clients/pom.xml
+++ b/google-cloud-clients/pom.xml
@@ -175,7 +175,7 @@
     <dependency>
       <groupId>javax.annotation</groupId>
       <artifactId>javax.annotation-api</artifactId>
-      <version>1.2</version>
+      <version>1.3.2</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
@@ -381,7 +381,7 @@
       <dependency>
         <groupId>com.google.errorprone</groupId>
         <artifactId>error_prone_annotations</artifactId>
-        <version>2.2.0</version>
+        <version>2.3.2</version>
       </dependency>
       <dependency>
         <groupId>org.easymock</groupId>
@@ -407,7 +407,12 @@
       <dependency>
         <groupId>com.google.truth</groupId>
         <artifactId>truth</artifactId>
-        <version>0.30</version>
+        <version>0.42</version>
+      </dependency>
+      <dependency>
+        <groupId>org.checkerframework</groupId>
+        <artifactId>checker-compat-qual</artifactId>
+        <version>2.5.3</version>
       </dependency>
     </dependencies>
   </dependencyManagement>