Skip to content

Commit f391bbb

Browse files
sduskissduskis
authored
---
yaml --- r: 25981 b: refs/heads/pubsub-ordering-keys c: 80c02ab h: refs/heads/master i: 25979: f049ea4
1 parent cd882ad commit f391bbb

6 files changed

Lines changed: 24 additions & 8 deletions

File tree

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ refs/tags/v0.72.0: a7703f2593ba312c0b2dde6fdfd4f5c764bb55ac
155155
refs/tags/v0.73.0: 21241ea8be9439cc5764c4944cdce21d34ce4f9e
156156
refs/tags/v0.74.0: 9d1f733dbbf790de7b494418523b69c4a9a57638
157157
refs/heads/ignoretest: 23c412ae07af3d0ab1caa2d44d5bc5c0ccb8b31d
158-
refs/heads/pubsub-ordering-keys: 07e03b54df93dcbf8109cffc9ea179c41ef75560
158+
refs/heads/pubsub-ordering-keys: 80c02ab5b4ecd67096abc6623a93afe19c96780f
159159
"refs/heads/update_mvn_badge": ae2d773814db0f71197ccf5a8612ee1d8056f8de
160160
refs/tags/v0.75.0: c3673089ae09a897c1b4cf7dfe167fe4f8ab32fb
161161
refs/tags/v0.76.0: 395b016826d3ddf9cb8b34919636df15a4dbd032

‎branches/pubsub-ordering-keys/google-api-grpc/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
<dependency>
9494
<groupId>javax.annotation</groupId>
9595
<artifactId>javax.annotation-api</artifactId>
96-
<version>1.2</version>
96+
<version>1.3.2</version>
9797
<scope>compile</scope>
9898
</dependency>
9999
</dependencies>

‎branches/pubsub-ordering-keys/google-cloud-clients/google-cloud-core/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,5 +81,10 @@
8181
<artifactId>guava-testlib</artifactId>
8282
<scope>test</scope>
8383
</dependency>
84+
<dependency>
85+
<groupId>org.checkerframework</groupId>
86+
<artifactId>checker-compat-qual</artifactId>
87+
<scope>test</scope>
88+
</dependency>
8489
</dependencies>
8590
</project>

‎branches/pubsub-ordering-keys/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/GrpcResultSetTest.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -762,7 +762,10 @@ public void getDoubleArray() {
762762
consumer.onCompleted();
763763

764764
assertThat(resultSet.next()).isTrue();
765-
assertThat(resultSet.getDoubleArray(0)).isEqualTo(doubleArray, 0.0);
765+
assertThat(resultSet.getDoubleArray(0))
766+
.usingTolerance(0.0)
767+
.containsExactly(doubleArray)
768+
.inOrder();
766769
}
767770

768771
@Test

‎branches/pubsub-ordering-keys/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/ResultSetsTest.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,11 @@ public void resultSetIteration() {
192192
assertThat(rs.getLongArray("longArray")).isEqualTo(longArray);
193193
assertThat(rs.getLongList(9)).isEqualTo(Longs.asList(longArray));
194194
assertThat(rs.getLongList("longArray")).isEqualTo(Longs.asList(longArray));
195-
assertThat(rs.getDoubleArray(10)).isEqualTo(doubleArray, 0.0);
196-
assertThat(rs.getDoubleArray("doubleArray")).isEqualTo(doubleArray, 0.0);
195+
assertThat(rs.getDoubleArray(10)).usingTolerance(0.0).containsAllOf(doubleArray);
196+
assertThat(rs.getDoubleArray("doubleArray"))
197+
.usingTolerance(0.0)
198+
.containsExactly(doubleArray)
199+
.inOrder();
197200
assertThat(rs.getDoubleList(10)).isEqualTo(Doubles.asList(doubleArray));
198201
assertThat(rs.getDoubleList("doubleArray")).isEqualTo(Doubles.asList(doubleArray));
199202
assertThat(rs.getBytesList(11)).isEqualTo(Arrays.asList(byteArray));

‎branches/pubsub-ordering-keys/google-cloud-clients/pom.xml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@
175175
<dependency>
176176
<groupId>javax.annotation</groupId>
177177
<artifactId>javax.annotation-api</artifactId>
178-
<version>1.2</version>
178+
<version>1.3.2</version>
179179
<scope>compile</scope>
180180
</dependency>
181181
</dependencies>
@@ -381,7 +381,7 @@
381381
<dependency>
382382
<groupId>com.google.errorprone</groupId>
383383
<artifactId>error_prone_annotations</artifactId>
384-
<version>2.2.0</version>
384+
<version>2.3.2</version>
385385
</dependency>
386386
<dependency>
387387
<groupId>org.easymock</groupId>
@@ -407,7 +407,12 @@
407407
<dependency>
408408
<groupId>com.google.truth</groupId>
409409
<artifactId>truth</artifactId>
410-
<version>0.30</version>
410+
<version>0.42</version>
411+
</dependency>
412+
<dependency>
413+
<groupId>org.checkerframework</groupId>
414+
<artifactId>checker-compat-qual</artifactId>
415+
<version>2.5.3</version>
411416
</dependency>
412417
</dependencies>
413418
</dependencyManagement>

0 commit comments

Comments
 (0)