Skip to content

fix: remove the need for any env var in all tests #235

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
skuruppu merged 1 commit into from
May 21, 2020
Merged

fix: remove the need for any env var in all tests #235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,11 @@ public void queryOptions() {

// Create a SpannerOptions with and without default query options.
SpannerOptions optionsWithQueryOptions =
new SpannerOptions.Builder(SpannerOptions.getDefaultInstance()) {
new SpannerOptions.Builder(
SpannerOptions.newBuilder()
.setProjectId("some-project")
.setCredentials(NoCredentials.getInstance())
.build()) {
@Override
QueryOptions getEnvironmentQueryOptions() {
// Override and return default instance to prevent environment variables from
Expand All @@ -112,7 +116,11 @@ QueryOptions getEnvironmentQueryOptions() {
}
}.setDefaultQueryOptions(db, queryOptions).build();
SpannerOptions optionsWithoutQueryOptions =
new SpannerOptions.Builder(SpannerOptions.getDefaultInstance()) {
new SpannerOptions.Builder(
SpannerOptions.newBuilder()
.setProjectId("some-project")
.setCredentials(NoCredentials.getInstance())
.build()) {
@Override
QueryOptions getEnvironmentQueryOptions() {
// Override and return default instance to prevent environment variables from
Expand Down
29 changes: 25 additions & 4 deletions google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerOptionsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,19 +389,36 @@ public void testDoNotCacheClosedSpannerInstance() {
public void testSetClientLibToken() {
final String jdbcToken = "sp-jdbc";
final String hibernateToken = "sp-hib";
SpannerOptions options = SpannerOptions.newBuilder().setClientLibToken(jdbcToken).build();
SpannerOptions options =
SpannerOptions.newBuilder()
.setProjectId("some-project")
.setCredentials(NoCredentials.getInstance())
.setClientLibToken(jdbcToken)
.build();
assertThat(options.getClientLibToken()).isEqualTo(jdbcToken);

options = SpannerOptions.newBuilder().setClientLibToken(hibernateToken).build();
options =
SpannerOptions.newBuilder()
.setProjectId("some-project")
.setCredentials(NoCredentials.getInstance())
.setClientLibToken(hibernateToken)
.build();
assertThat(options.getClientLibToken()).isEqualTo(hibernateToken);

options = SpannerOptions.newBuilder().build();
options =
SpannerOptions.newBuilder()
.setProjectId("some-project")
.setCredentials(NoCredentials.getInstance())
.build();
assertThat(options.getClientLibToken()).isEqualTo(ServiceOptions.getGoogApiClientLibName());
}

@Test(expected = IllegalArgumentException.class)
public void testSetInvalidClientLibToken() {
SpannerOptions.newBuilder().setClientLibToken("foo");
SpannerOptions.newBuilder()
.setProjectId("some-project")
.setCredentials(NoCredentials.getInstance())
.setClientLibToken("foo");
}

@Test
Expand Down Expand Up @@ -443,6 +460,8 @@ public String getOptimizerVersion() {
.setDefaultQueryOptions(
DatabaseId.of("p", "i", "d"),
QueryOptions.newBuilder().setOptimizerVersion("1").build())
.setProjectId("p")
.setCredentials(NoCredentials.getInstance())
.build();
assertThat(options.getDefaultQueryOptions(DatabaseId.of("p", "i", "d")))
.isEqualTo(QueryOptions.newBuilder().setOptimizerVersion("1").build());
Expand All @@ -464,6 +483,8 @@ public String getOptimizerVersion() {
.setDefaultQueryOptions(
DatabaseId.of("p", "i", "d"),
QueryOptions.newBuilder().setOptimizerVersion("1").build())
.setProjectId("p")
.setCredentials(NoCredentials.getInstance())
.build();
assertThat(options.getDefaultQueryOptions(DatabaseId.of("p", "i", "d")))
.isEqualTo(QueryOptions.newBuilder().setOptimizerVersion("2").build());
Expand Down
8 changes: 7 additions & 1 deletion google-cloud-spanner/src/test/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpcTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,7 @@ && getNumberOfThreadsWithName(SPANNER_THREAD_NAME, false)
public void testCallCredentialsProviderPreferenceAboveCredentials() {
SpannerOptions options =
SpannerOptions.newBuilder()
.setProjectId("some-project")
.setCredentials(STATIC_CREDENTIALS)
.setCallCredentialsProvider(
new CallCredentialsProvider() {
Expand All @@ -302,6 +303,7 @@ public CallCredentials getCallCredentials() {
public void testCallCredentialsProviderReturnsNull() {
SpannerOptions options =
SpannerOptions.newBuilder()
.setProjectId("some-project")
.setCredentials(STATIC_CREDENTIALS)
.setCallCredentialsProvider(
new CallCredentialsProvider() {
Expand All @@ -319,7 +321,11 @@ public CallCredentials getCallCredentials() {

@Test
public void testNoCallCredentials() {
SpannerOptions options = SpannerOptions.newBuilder().setCredentials(STATIC_CREDENTIALS).build();
SpannerOptions options =
SpannerOptions.newBuilder()
.setProjectId("some-project")
.setCredentials(STATIC_CREDENTIALS)
.build();
GapicSpannerRpc rpc = new GapicSpannerRpc(options);
assertThat(rpc.newCallContext(optionsMap, "/some/resource").getCallOptions().getCredentials())
.isNull();
Expand Down