Skip to content

spanner: Options: Fix null dereference, expand test coverage #3706

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
pongad merged 3 commits into from
Sep 26, 2018
Merged

spanner: Options: Fix null dereference, expand test coverage #3706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2692330
spanner: Fix null pointer deref in Options.equals()
nsujir Sep 20, 2018
c9d7b63
spanner: Expand test coverage for Options
nsujir Sep 20, 2018
a9ca5a5
Fix codacy warnings
nsujir Sep 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 6 additions & 19 deletions ...le-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Options.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,10 +110,6 @@ static final class FlowControlOption extends InternalOption implements ReadAndQu
this.prefetchChunks = prefetchChunks;
}

int prefetchChunks() {
return prefetchChunks;
}

@Override
void appendToOptions(Options options) {
options.prefetchChunks = prefetchChunks;
Expand Down Expand Up @@ -202,10 +198,13 @@ public boolean equals(Object o) {
}

Options that = (Options) o;
return (!hasLimit() && !that.hasLimit() || Objects.equals(limit(), that.limit()))
return (!hasLimit() && !that.hasLimit()
|| hasLimit() && that.hasLimit() && Objects.equals(limit(), that.limit()))
&& (!hasPrefetchChunks() && !that.hasPrefetchChunks()
|| Objects.equals(prefetchChunks(), that.prefetchChunks()))
&& (!hasPageSize() && !that.hasPageSize() || Objects.equals(pageSize(), that.pageSize()))
|| hasPrefetchChunks() && that.hasPrefetchChunks()
&& Objects.equals(prefetchChunks(), that.prefetchChunks()))
&& (!hasPageSize() && !that.hasPageSize()
|| hasPageSize() && that.hasPageSize() && Objects.equals(pageSize(), that.pageSize()))
&& Objects.equals(pageToken(), that.pageToken())
&& Objects.equals(filter(), that.filter());
}
Expand Down Expand Up @@ -266,10 +265,6 @@ static class LimitOption extends InternalOption implements ReadOption {
this.limit = limit;
}

long limit() {
return limit;
}

@Override
void appendToOptions(Options options) {
options.limit = limit;
Expand All @@ -283,10 +278,6 @@ static class PageSizeOption extends InternalOption implements ListOption {
this.pageSize = pageSize;
}

int pageSize() {
return pageSize;
}

@Override
void appendToOptions(Options options) {
options.pageSize = pageSize;
Expand All @@ -300,10 +291,6 @@ static class PageTokenOption extends InternalOption implements ListOption {
this.pageToken = pageToken;
}

String pageToken() {
return pageToken;
}

@Override
void appendToOptions(Options options) {
options.pageToken = pageToken;
Expand Down
130 changes: 130 additions & 0 deletions ...loud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/OptionsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,5 +67,135 @@ public void allOptionsAbsent() {
Options options = Options.fromReadOptions();
assertThat(options.hasLimit()).isFalse();
assertThat(options.hasPrefetchChunks()).isFalse();
assertThat(options.hasFilter()).isFalse();
assertThat(options.hasPageToken()).isFalse();
assertThat(options.toString()).isEqualTo("");
assertThat(options.equals(options)).isTrue();
assertThat(options.equals(null)).isFalse();
assertThat(options.equals(this)).isFalse();

assertThat(options.hashCode()).isEqualTo(31);
}

@Test
public void listOptTest() {
int pageSize = 3;
String pageToken = "ptok";
String filter = "env";
Options opts = Options
.fromListOptions(
Options.pageSize(pageSize), Options.pageToken(pageToken), Options.filter(filter));

assertThat(opts.toString()).isEqualTo("pageSize: " + Integer.toString(pageSize)
+ " pageToken: " + pageToken + " filter: " + filter + " ");

assertThat(opts.hasPageSize()).isTrue();
assertThat(opts.hasPageToken()).isTrue();
assertThat(opts.hasFilter()).isTrue();

assertThat(opts.pageSize()).isEqualTo(pageSize);
assertThat(opts.pageToken()).isEqualTo(pageToken);
assertThat(opts.filter()).isEqualTo(filter);
assertThat(opts.hashCode()).isEqualTo(108027089);
}

@Test
public void listEquality() {
Options o1;
Options o2;
Options o3;

o1 = Options.fromListOptions();
o2 = Options.fromListOptions();
assertThat(o1.equals(o2)).isTrue();

o2 = Options.fromListOptions(Options.pageSize(1));
assertThat(o1.equals(o2)).isFalse();
assertThat(o2.equals(o1)).isFalse();

o3 = Options.fromListOptions(Options.pageSize(1));
assertThat(o2.equals(o3)).isTrue();

o3 = Options.fromListOptions(Options.pageSize(2));
assertThat(o2.equals(o3)).isFalse();

o2 = Options.fromListOptions(Options.pageToken("t1"));
assertThat(o1.equals(o2)).isFalse();

o3 = Options.fromListOptions(Options.pageToken("t1"));
assertThat(o2.equals(o3)).isTrue();

o3 = Options.fromListOptions(Options.pageToken("t2"));
assertThat(o2.equals(o3)).isFalse();

o2 = Options.fromListOptions(Options.filter("f1"));
assertThat(o1.equals(o2)).isFalse();

o3 = Options.fromListOptions(Options.filter("f1"));
assertThat(o2.equals(o3)).isTrue();

o3 = Options.fromListOptions(Options.filter("f2"));
assertThat(o2.equals(o3)).isFalse();
}

@Test
public void readOptTest() {
int limit = 3;
Options opts = Options.fromReadOptions(Options.limit(limit));

assertThat(opts.toString()).isEqualTo("limit: " + Integer.toString(limit) + " ");
assertThat(opts.hashCode()).isEqualTo(964);
}

@Test
public void readEquality() {
Options o1;
Options o2;
Options o3;

o1 = Options.fromReadOptions();
o2 = Options.fromReadOptions();
assertThat(o1.equals(o2)).isTrue();

o2 = Options.fromReadOptions(Options.limit(1));
assertThat(o1.equals(o2)).isFalse();
assertThat(o2.equals(o1)).isFalse();

o3 = Options.fromReadOptions(Options.limit(1));
assertThat(o2.equals(o3)).isTrue();

o3 = Options.fromReadOptions(Options.limit(2));
assertThat(o2.equals(o3)).isFalse();
}

@Test
public void queryOptTest() {
int chunks = 3;
Options opts = Options.fromQueryOptions(Options.prefetchChunks(chunks));
assertThat(opts.toString())
.isEqualTo("prefetchChunks: " + Integer.toString(chunks) + " ");
assertThat(opts.prefetchChunks()).isEqualTo(chunks);
assertThat(opts.hashCode()).isEqualTo(964);
}

@Test
public void queryEquality() {
Options o1;
Options o2;
Options o3;

o1 = Options.fromQueryOptions();
o2 = Options.fromQueryOptions();
assertThat(o1.equals(o2)).isTrue();

o2 = Options.fromReadOptions(Options.prefetchChunks(1));
assertThat(o1.equals(o2)).isFalse();
assertThat(o2.equals(o1)).isFalse();

o3 = Options.fromReadOptions(Options.prefetchChunks(1));
assertThat(o2.equals(o3)).isTrue();

o3 = Options.fromReadOptions(Options.prefetchChunks(2));
assertThat(o2.equals(o3)).isFalse();
}
}