Skip to content

Commit 2bdadba

Browse files
test: parameterize tests for http and grpc transports (#1360)
* Revert "test: Creating multi db rule to run tests multiple times against different named databases. (#1270)" This reverts commit 780c9f4. * test: run on both grpc and http transports * merge aggregation ITs with abstract test * cleanup * fix test cleanups * test * fix tests * fix again * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
1 parent 45df7f5 commit 2bdadba

File tree

7 files changed

+465
-420
lines changed

7 files changed

+465
-420
lines changed

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,20 +50,20 @@ If you are using Maven without the BOM, add this to your dependencies:
5050
If you are using Gradle 5.x or later, add this to your dependencies:
5151

5252
```Groovy
53-
implementation platform('com.google.cloud:libraries-bom:26.33.0')
53+
implementation platform('com.google.cloud:libraries-bom:26.34.0')
5454
5555
implementation 'com.google.cloud:google-cloud-datastore'
5656
```
5757
If you are using Gradle without BOM, add this to your dependencies:
5858

5959
```Groovy
60-
implementation 'com.google.cloud:google-cloud-datastore:2.18.4'
60+
implementation 'com.google.cloud:google-cloud-datastore:2.18.5'
6161
```
6262

6363
If you are using SBT, add this to your dependencies:
6464

6565
```Scala
66-
libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.18.4"
66+
libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.18.5"
6767
```
6868
<!-- {x-version-update-end} -->
6969

@@ -380,7 +380,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
380380
[kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-datastore/java11.html
381381
[stability-image]: https://img.shields.io/badge/stability-stable-green
382382
[maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-datastore.svg
383-
[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.18.4
383+
[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-datastore/2.18.5
384384
[authentication]: https://github.com/googleapis/google-cloud-java#authentication
385385
[auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
386386
[predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles

google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
1818

1919
import com.google.api.core.InternalApi;
2020
import com.google.api.gax.retrying.RetrySettings;
21+
import com.google.cloud.TransportOptions;
2122
import com.google.cloud.datastore.Datastore;
2223
import com.google.cloud.datastore.DatastoreOptions;
2324
import com.google.cloud.datastore.Key;
2425
import com.google.cloud.datastore.Query;
2526
import com.google.cloud.datastore.QueryResults;
2627
import com.google.cloud.datastore.StructuredQuery;
27-
import com.google.cloud.grpc.GrpcTransportOptions;
2828
import com.google.cloud.http.HttpTransportOptions;
2929
import java.util.UUID;
3030
import org.threeten.bp.Duration;
@@ -75,12 +75,19 @@ public void deleteNamespace() {
7575

7676
/** Creates a {@code RemoteStorageHelper} object. */
7777
public static RemoteDatastoreHelper create() {
78-
return create("");
78+
return create("", DatastoreOptions.getDefaultGrpcTransportOptions());
7979
}
8080

81-
/** Creates a {@code RemoteStorageHelper} object. */
8281
public static RemoteDatastoreHelper create(String databaseId) {
83-
GrpcTransportOptions transportOptions = DatastoreOptions.getDefaultGrpcTransportOptions();
82+
return create(databaseId, DatastoreOptions.getDefaultGrpcTransportOptions());
83+
}
84+
85+
public static RemoteDatastoreHelper create(TransportOptions transportOptions) {
86+
return create("", transportOptions);
87+
}
88+
89+
/** Creates a {@code RemoteStorageHelper} object. */
90+
public static RemoteDatastoreHelper create(String databaseId, TransportOptions transportOptions) {
8491
DatastoreOptions datastoreOption =
8592
DatastoreOptions.newBuilder()
8693
.setDatabaseId(databaseId)

0 commit comments

Comments
 (0)