From 52d24b0e5ec9b035d7ca3732cfd5c37b756e49a9 Mon Sep 17 00:00:00 2001 From: Tom Andersen Date: Mon, 26 Sep 2022 12:34:51 -0400 Subject: [PATCH 1/3] Add tests to verify multiDb functionality --- .../cloud/firestore/FirestoreOptionsTest.java | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 google-cloud-firestore/src/test/java/com/google/cloud/firestore/FirestoreOptionsTest.java diff --git a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/FirestoreOptionsTest.java b/google-cloud-firestore/src/test/java/com/google/cloud/firestore/FirestoreOptionsTest.java new file mode 100644 index 0000000000..544eb22a14 --- /dev/null +++ b/google-cloud-firestore/src/test/java/com/google/cloud/firestore/FirestoreOptionsTest.java @@ -0,0 +1,33 @@ +package com.google.cloud.firestore; + +import com.google.cloud.firestore.spi.v1.FirestoreRpc; +import org.junit.Test; + +import static com.google.common.truth.Truth.assertThat; +import static org.mockito.Mockito.mock; + +public class FirestoreOptionsTest { + + @Test + public void instantiateWithProjectId() { + FirestoreOptions firestoreOptions = FirestoreOptions.newBuilder() + .setProjectId("test-project") + .build(); + FirestoreImpl firestore = new FirestoreImpl(firestoreOptions, mock(FirestoreRpc.class)); + + DocumentReference document = firestore.document("coll/doc1"); + assertThat(document.getName()).isEqualTo("projects/test-project/databases/(default)/documents/coll/doc1"); + } + + @Test + public void instantiateWithProjectIdAndDatabaseId() { + FirestoreOptions firestoreOptions = FirestoreOptions.newBuilder() + .setProjectId("test-project") + .setDatabaseId("test-database") + .build(); + FirestoreImpl firestore = new FirestoreImpl(firestoreOptions, mock(FirestoreRpc.class)); + + DocumentReference document = firestore.document("coll/doc1"); + assertThat(document.getName()).isEqualTo("projects/test-project/databases/test-database/documents/coll/doc1"); + } +} From bb07f0ab5aee762ae2ec2b050a3cfccbe2d3e850 Mon Sep 17 00:00:00 2001 From: Owl Bot Date: Mon, 26 Sep 2022 16:40:39 +0000 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=A6=89=20Updates=20from=20OwlBot=20po?= =?UTF-8?q?st-processor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --- .../cloud/firestore/FirestoreOptionsTest.java | 46 ++++++++++--------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/FirestoreOptionsTest.java b/google-cloud-firestore/src/test/java/com/google/cloud/firestore/FirestoreOptionsTest.java index 544eb22a14..e7dd8f077f 100644 --- a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/FirestoreOptionsTest.java +++ b/google-cloud-firestore/src/test/java/com/google/cloud/firestore/FirestoreOptionsTest.java @@ -1,33 +1,35 @@ package com.google.cloud.firestore; -import com.google.cloud.firestore.spi.v1.FirestoreRpc; -import org.junit.Test; - import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.mock; +import com.google.cloud.firestore.spi.v1.FirestoreRpc; +import org.junit.Test; + public class FirestoreOptionsTest { - @Test - public void instantiateWithProjectId() { - FirestoreOptions firestoreOptions = FirestoreOptions.newBuilder() - .setProjectId("test-project") - .build(); - FirestoreImpl firestore = new FirestoreImpl(firestoreOptions, mock(FirestoreRpc.class)); + @Test + public void instantiateWithProjectId() { + FirestoreOptions firestoreOptions = + FirestoreOptions.newBuilder().setProjectId("test-project").build(); + FirestoreImpl firestore = new FirestoreImpl(firestoreOptions, mock(FirestoreRpc.class)); - DocumentReference document = firestore.document("coll/doc1"); - assertThat(document.getName()).isEqualTo("projects/test-project/databases/(default)/documents/coll/doc1"); - } + DocumentReference document = firestore.document("coll/doc1"); + assertThat(document.getName()) + .isEqualTo("projects/test-project/databases/(default)/documents/coll/doc1"); + } - @Test - public void instantiateWithProjectIdAndDatabaseId() { - FirestoreOptions firestoreOptions = FirestoreOptions.newBuilder() - .setProjectId("test-project") - .setDatabaseId("test-database") - .build(); - FirestoreImpl firestore = new FirestoreImpl(firestoreOptions, mock(FirestoreRpc.class)); + @Test + public void instantiateWithProjectIdAndDatabaseId() { + FirestoreOptions firestoreOptions = + FirestoreOptions.newBuilder() + .setProjectId("test-project") + .setDatabaseId("test-database") + .build(); + FirestoreImpl firestore = new FirestoreImpl(firestoreOptions, mock(FirestoreRpc.class)); - DocumentReference document = firestore.document("coll/doc1"); - assertThat(document.getName()).isEqualTo("projects/test-project/databases/test-database/documents/coll/doc1"); - } + DocumentReference document = firestore.document("coll/doc1"); + assertThat(document.getName()) + .isEqualTo("projects/test-project/databases/test-database/documents/coll/doc1"); + } } From 903d9e909c7a4f14256cc494c0b9eaae1eec51ae Mon Sep 17 00:00:00 2001 From: Tom Andersen Date: Mon, 26 Sep 2022 12:49:31 -0400 Subject: [PATCH 3/3] Add copyright --- .../cloud/firestore/FirestoreOptionsTest.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/FirestoreOptionsTest.java b/google-cloud-firestore/src/test/java/com/google/cloud/firestore/FirestoreOptionsTest.java index 544eb22a14..fce9f89bd6 100644 --- a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/FirestoreOptionsTest.java +++ b/google-cloud-firestore/src/test/java/com/google/cloud/firestore/FirestoreOptionsTest.java @@ -1,3 +1,19 @@ +/* + * Copyright 2022 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.google.cloud.firestore; import com.google.cloud.firestore.spi.v1.FirestoreRpc;