Skip to content

Commit 43d8c48

Browse files
snehashah16vkedia
authored andcommitted
Some tests and style fixes for Cloud Spanner
* fixing broken test - cloud/spanner/SessionPoolIntegrationTest.java * fixing java style, tests and unused symbol errors. * fixing missing import
1 parent b13a0a9 commit 43d8c48

7 files changed

Lines changed: 11 additions & 22 deletions

File tree

google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerImpl.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1771,6 +1771,9 @@ private Object writeReplace() {
17711771
case STRUCT:
17721772
builder.add(fieldName, fieldType.getArrayElementType().getStructFields(), (Iterable<Struct>) value);
17731773
break;
1774+
default:
1775+
throw new AssertionError(
1776+
"Unhandled array type code: " + fieldType.getArrayElementType());
17741777
}
17751778
break;
17761779
case STRUCT: // Not a legal top-level field type.

google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionImplTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
package com.google.cloud.spanner;
1818

1919
import static com.google.common.truth.Truth.assertThat;
20-
import static com.google.spanner.v1.Mutation.Write;
2120
import static org.junit.Assert.fail;
2221

2322
import com.google.cloud.Timestamp;
@@ -28,6 +27,7 @@
2827
import com.google.spanner.v1.BeginTransactionRequest;
2928
import com.google.spanner.v1.CommitRequest;
3029
import com.google.spanner.v1.CommitResponse;
30+
import com.google.spanner.v1.Mutation.Write;
3131
import com.google.spanner.v1.PartialResultSet;
3232
import com.google.spanner.v1.ReadRequest;
3333
import com.google.spanner.v1.ResultSetMetadata;

google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolIntegrationTest.java

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,12 @@
1919
import static com.google.common.truth.Truth.assertThat;
2020

2121
import com.google.cloud.grpc.GrpcTransportOptions.ExecutorFactory;
22-
import com.google.common.util.concurrent.ListenableFuture;
2322
import java.util.ArrayList;
2423
import java.util.List;
2524
import java.util.concurrent.CountDownLatch;
2625
import java.util.concurrent.ScheduledExecutorService;
2726
import java.util.concurrent.ScheduledThreadPoolExecutor;
2827
import java.util.concurrent.TimeUnit;
29-
import java.util.concurrent.TimeoutException;
30-
import junit.framework.Assert;
3128
import org.junit.Before;
3229
import org.junit.BeforeClass;
3330
import org.junit.ClassRule;
@@ -173,17 +170,8 @@ public void closeAfterInitialCreateDoesNotBlockIndefinitely() throws Exception {
173170
}
174171

175172
@Test
176-
public void closeWhenSessionsActiveDoesNotBlockIndefinitely() throws Exception {
173+
public void closeWhenSessionsActiveFinishes() throws Exception {
177174
Session session = pool.getReadSession();
178-
ListenableFuture<Void> future = pool.closeAsync();
179-
try {
180-
future.get(5, TimeUnit.SECONDS);
181-
Assert.fail("Closure future should not have finished");
182-
} catch (TimeoutException e) {
183-
// expected
184-
}
185-
session.close();
186-
// Now pool should close.
187-
future.get();
175+
pool.closeAsync().get();
188176
}
189177
}

google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolOptionsTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@
2020
import org.junit.rules.ExpectedException;
2121
import org.junit.runner.RunWith;
2222
import org.junit.runners.Parameterized;
23+
import org.junit.runners.Parameterized.Parameter;
24+
import org.junit.runners.Parameterized.Parameters;
2325

2426
import java.util.ArrayList;
2527
import java.util.Collection;
2628
import java.util.List;
2729

2830
import static junit.framework.TestCase.assertEquals;
29-
import static org.junit.runners.Parameterized.Parameter;
30-
import static org.junit.runners.Parameterized.Parameters;
3131

3232
/**
3333
* Unit tests for {@link com.google.cloud.spanner.SessionPoolOptions}

google-cloud-spanner/src/test/java/com/google/cloud/spanner/TimestampBoundTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616

1717
package com.google.cloud.spanner;
1818

19-
import static com.google.cloud.spanner.TimestampBound.Mode;
2019
import static com.google.common.testing.SerializableTester.reserializeAndAssert;
2120
import static com.google.common.truth.Truth.assertThat;
2221

2322
import com.google.cloud.Timestamp;
23+
import com.google.cloud.spanner.TimestampBound.Mode;
2424
import com.google.common.testing.EqualsTester;
2525
import com.google.spanner.v1.TransactionOptions;
2626
import java.util.concurrent.TimeUnit;

google-cloud-spanner/src/test/java/com/google/cloud/spanner/ValueTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -759,11 +759,11 @@ private BrokenSerializationList(List<T> delegate) {
759759
@Override protected List<T> delegate() {
760760
return delegate;
761761
}
762-
private void readObject(java.io.ObjectInputStream stream)
762+
private void readObject(java.io.ObjectInputStream unusedStream)
763763
throws IOException, ClassNotFoundException {
764764
throw new IllegalStateException("Serialization disabled");
765765
}
766-
private void writeObject(java.io.ObjectOutputStream stream)
766+
private void writeObject(java.io.ObjectOutputStream unusedStream)
767767
throws IOException {
768768
throw new IllegalStateException("Serialization disabled");
769769
}

google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITQueryTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -583,7 +583,6 @@ public void queryRealTable() {
583583
}
584584

585585
@Test
586-
@Ignore
587586
public void analyzePlan() {
588587
Statement statement = Statement.of("SELECT 1 AS column UNION ALL SELECT 2");
589588
ResultSet resultSet =
@@ -597,7 +596,6 @@ public void analyzePlan() {
597596
}
598597

599598
@Test
600-
@Ignore
601599
public void analyzeProfile() {
602600
Statement statement =
603601
Statement.of("SELECT 1 AS column UNION ALL SELECT 2 AS column ORDER BY column");

0 commit comments

Comments
 (0)