test: add more tests

Author: olavloite

google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/AbstractMockServerTest.java

@@ -110,7 +110,7 @@ public abstract class AbstractMockServerTest {
           .setMetadata(SINGLE_COL_INT64_RESULTSET_METADATA)
           .build();
   public static final com.google.spanner.v1.ResultSet UPDATE_RETURNING_RESULTSET =
-      com.google.spanner.v1.ResultSet.newBuilder()
+      ResultSet.newBuilder()
           .setStats(ResultSetStats.newBuilder().setRowCountExact(1))
           .setMetadata(
               ResultSetMetadata.newBuilder()
@@ -121,6 +121,10 @@ public abstract class AbstractMockServerTest {
                                   .setName("col")
                                   .setType(Type.newBuilder().setCodeValue(TypeCode.INT64_VALUE))
                                   .build())))
+          .addRows(
+              ListValue.newBuilder()
+                  .addValues(Value.newBuilder().setStringValue("1").build())
+                  .build())
           .build();
 
   protected static final ResultSet SELECT1_RESULTSET =

google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/AutoDmlBatchMockServerTest.java

@@ -97,6 +97,8 @@ public void testDmlWithReturningAfterDml() {
       // DML with a THEN RETURN clause cannot be batched. This therefore flushes the batch and
       // executes the INSERT ... THEN RETURN statement as a separate ExecuteSqlRequest.
       try (ResultSet resultSet = connection.executeQuery(INSERT_RETURNING_STATEMENT)) {
+        assertTrue(resultSet.next());
+        assertEquals(1L, resultSet.getLong(0));
         assertFalse(resultSet.next());
       }
 
@@ -123,6 +125,8 @@ public void testDmlWithReturningAfterDml_usingExecute() {
       StatementResult result = connection.execute(INSERT_RETURNING_STATEMENT);
       assertEquals(ResultType.RESULT_SET, result.getResultType());
       try (ResultSet resultSet = result.getResultSet()) {
+        assertTrue(resultSet.next());
+        assertEquals(1L, resultSet.getLong(0));
         assertFalse(resultSet.next());
       }
 

google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/TransactionMockServerTest.java

@@ -31,6 +31,7 @@
 import com.google.cloud.spanner.SpannerException;
 import com.google.cloud.spanner.Statement;
 import com.google.cloud.spanner.connection.ITAbstractSpannerTest.ITConnection;
+import com.google.cloud.spanner.connection.StatementResult.ResultType;
 import com.google.spanner.v1.BeginTransactionRequest;
 import com.google.spanner.v1.CommitRequest;
 import com.google.spanner.v1.ExecuteBatchDmlRequest;
@@ -357,5 +358,45 @@ public long nanoTime() {
   }
 
   @Test
-  public void testTransactionTimeoutInAutoCommit() {}
+  public void testCanUseAllMethodsWithInternalRetriesDisabled() {
+    // Verify that all query/update methods work as expected when internal retries have been
+    // disabled.
+    try (Connection connection = createConnection()) {
+      connection.setAutocommit(false);
+      connection.setRetryAbortsInternally(false);
+
+      try (ResultSet result = connection.executeQuery(SELECT1_STATEMENT)) {
+        assertTrue(result.next());
+        assertEquals(1L, result.getLong(0));
+        assertFalse(result.next());
+      }
+      assertEquals(1, connection.executeUpdate(INSERT_STATEMENT));
+      try (ResultSet result = connection.executeQuery(INSERT_RETURNING_STATEMENT)) {
+        assertTrue(result.next());
+        assertEquals(1L, result.getLong(0));
+        assertFalse(result.next());
+      }
+
+      StatementResult statementResult = connection.execute(SELECT1_STATEMENT);
+      assertEquals(ResultType.RESULT_SET, statementResult.getResultType());
+      try (ResultSet result = statementResult.getResultSet()) {
+        assertTrue(result.next());
+        assertEquals(1L, result.getLong(0));
+        assertFalse(result.next());
+      }
+
+      statementResult = connection.execute(INSERT_STATEMENT);
+      assertEquals(ResultType.UPDATE_COUNT, statementResult.getResultType());
+      assertEquals(1L, statementResult.getUpdateCount().longValue());
+
+      statementResult = connection.execute(INSERT_RETURNING_STATEMENT);
+      assertEquals(ResultType.RESULT_SET, statementResult.getResultType());
+      try (ResultSet result = statementResult.getResultSet()) {
+        assertTrue(result.next());
+        assertEquals(1L, result.getLong(0));
+        assertFalse(result.next());
+      }
+      connection.commit();
+    }
+  }
 }