Skip to content

Expand test coverage for GrpcResultSet and runWithRetries() #3702

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 7 commits into from
Sep 27, 2018
Merged

Expand test coverage for GrpcResultSet and runWithRetries() #3702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
07b735d
Expand test coverage for GrpcResultSet and runWithRetries()
nsujir Sep 17, 2018
98ab6ce
Fix codacy warnings
nsujir Sep 19, 2018
5930789
Use recommended Truth assertions
nsujir Sep 19, 2018
d6a2599
Use isEqualTo() for getDateList()
nsujir Sep 19, 2018
0cd0fe6
Use isEqualTo() for getDoubleArray()
nsujir Sep 19, 2018
5bf5004
Fix review comments: assert resultset.next(), missed getDouble check,…
nsujir Sep 24, 2018
856a6d4
Use .isEqualTo()
nsujir Sep 26, 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
154 changes: 154 additions & 0 deletions ...lients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/GrpcResultSetTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -665,4 +665,158 @@ private void verifySerialization(
Struct copy = reserialize(row);
assertThat(row).isEqualTo(copy);
}

@Test

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

public void getBoolean() {
consumer.onPartialResultSet(
PartialResultSet.newBuilder()
.setMetadata(makeMetadata(Type.struct(Type.StructField.of("f", Type.bool()))))
.addValues(Value.bool(true).toProto())
.addValues(Value.bool(false).toProto())
.build());
consumer.onCompleted();
assertThat(resultSet.next()).isTrue();
assertThat(resultSet.getBoolean(0)).isTrue();
assertThat(resultSet.next()).isTrue();
assertThat(resultSet.getBoolean(0)).isFalse();
}

@Test
public void getDouble() {
consumer.onPartialResultSet(
PartialResultSet.newBuilder()
.setMetadata(makeMetadata(Type.struct(Type.StructField.of("f", Type.float64()))))
.addValues(Value.float64(Double.MIN_VALUE).toProto())
.addValues(Value.float64(Double.MAX_VALUE).toProto())
.build());
consumer.onCompleted();

assertThat(resultSet.next()).isTrue();
assertThat(resultSet.getDouble(0)).isWithin(0.0).of(Double.MIN_VALUE);
assertThat(resultSet.next()).isTrue();
assertThat(resultSet.getDouble(0)).isWithin(0.0).of(Double.MAX_VALUE);

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

}

@Test
public void getLong() {
consumer.onPartialResultSet(
PartialResultSet.newBuilder()
.setMetadata(makeMetadata(Type.struct(Type.StructField.of("f", Type.int64()))))
.addValues(Value.int64(Long.MIN_VALUE).toProto())
.addValues(Value.int64(Long.MAX_VALUE).toProto())
.build());
consumer.onCompleted();

assertThat(resultSet.next()).isTrue();
assertThat(resultSet.getLong(0)).isEqualTo(Long.MIN_VALUE);
assertThat(resultSet.next()).isTrue();
assertThat(resultSet.getLong(0)).isEqualTo(Long.MAX_VALUE);
}

@Test
public void getDate() {
consumer.onPartialResultSet(
PartialResultSet.newBuilder()
.setMetadata(makeMetadata(Type.struct(Type.StructField.of("f", Type.date()))))
.addValues(Value.date(Date.fromYearMonthDay(2018, 5, 29)).toProto())
.build());
consumer.onCompleted();

assertThat(resultSet.next()).isTrue();
assertThat(resultSet.getDate(0))
.isEqualTo(Date.fromYearMonthDay(2018, 5, 29));
}

@Test
public void getTimestamp() {
consumer.onPartialResultSet(
PartialResultSet.newBuilder()
.setMetadata(makeMetadata(Type.struct(Type.StructField.of("f", Type.timestamp()))))
.addValues(Value.timestamp(Timestamp.parseTimestamp("0001-01-01T00:00:00Z")).toProto())
.build());
consumer.onCompleted();

assertThat(resultSet.next()).isTrue();
assertThat(resultSet.getTimestamp(0))
.isEqualTo(Timestamp.parseTimestamp("0001-01-01T00:00:00Z"));
}

@Test
public void getBooleanArray() {
boolean[] boolArray = {true, true, false};
consumer.onPartialResultSet(
PartialResultSet.newBuilder()
.setMetadata(makeMetadata(Type.struct(Type.StructField.of("f", Type.array(Type.bool())))))
.addValues(Value.boolArray(boolArray).toProto())
.build());
consumer.onCompleted();
assertThat(resultSet.next()).isTrue();
assertThat(resultSet.getBooleanArray(0)).isEqualTo(boolArray);
}

@Test
public void getLongArray() {
long[] longArray = {111, 333, 444, 0, -1, -2234, Long.MAX_VALUE, Long.MIN_VALUE};

consumer.onPartialResultSet(
PartialResultSet.newBuilder()
.setMetadata(makeMetadata(Type.struct(Type.StructField.of("f", Type.array(Type.int64())))))
.addValues(Value.int64Array(longArray).toProto())
.build());
consumer.onCompleted();
assertThat(resultSet.next()).isTrue();
assertThat(resultSet.getLongArray(0)).isEqualTo(longArray);
}

@Test
public void getDoubleArray() {
double[] doubleArray = {Double.MAX_VALUE, Double.MIN_VALUE, 111, 333, 444, 0, -1, -2234};

consumer.onPartialResultSet(
PartialResultSet.newBuilder()
.setMetadata(makeMetadata(Type.struct(
Type.StructField.of("f", Type.array(Type.float64())))))
.addValues(Value.float64Array(doubleArray).toProto())
.build());
consumer.onCompleted();

assertThat(resultSet.next()).isTrue();
assertThat(resultSet.getDoubleArray(0)).isEqualTo(doubleArray, 0.0);
}

@Test
public void getTimestampList() {
List<Timestamp> timestampList = new ArrayList<>();
timestampList.add(Timestamp.parseTimestamp("0001-01-01T00:00:00Z"));
timestampList.add(Timestamp.parseTimestamp("0002-02-02T02:00:00Z"));

consumer.onPartialResultSet(
PartialResultSet.newBuilder()
.setMetadata(makeMetadata(Type.struct(
Type.StructField.of("f", Type.array(Type.timestamp())))))
.addValues(Value.timestampArray(timestampList).toProto())
.build());
consumer.onCompleted();

assertThat(resultSet.next()).isTrue();
assertThat(resultSet.getTimestampList(0)).isEqualTo(timestampList);
}

@Test
public void getDateList() {
List<Date> dateList = new ArrayList<>();
dateList.add(Date.fromYearMonthDay(1999, 8, 23));
dateList.add(Date.fromYearMonthDay(1986, 3, 17));

consumer.onPartialResultSet(
PartialResultSet.newBuilder()
.setMetadata(makeMetadata(Type.struct(
Type.StructField.of("f", Type.array(Type.date())))))
.addValues(Value.dateArray(dateList).toProto())
.build());
consumer.onCompleted();

assertThat(resultSet.next()).isTrue();
assertThat(resultSet.getDateList(0)).isEqualTo(dateList);
}
}
17 changes: 17 additions & 0 deletions ...-clients/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 @@ -23,6 +23,7 @@
import com.google.cloud.spanner.spi.v1.SpannerRpc;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.Callable;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand Down Expand Up @@ -116,4 +117,20 @@ public void getDbclientAfterCloseThrows() {
assertThat(e.getMessage()).contains("Cloud Spanner client has been closed");
}
}

@Test
public void exceptionIsTranslated() {
try {
SpannerImpl.runWithRetries(
new Callable<Object>() {
@Override
public Void call() throws Exception {
throw new Exception("Should be translated to SpannerException");
}
});
} catch (SpannerException e) {
assertThat(e.getErrorCode()).isEqualTo(ErrorCode.INTERNAL);
assertThat(e.getMessage().contains("Unexpected exception thrown"));
}
}
}