build: execute integration tests in parallel (#592)

* build: execute integration tests in parallel

* chore: run linter

Author: olavloite

pom.xml

@@ -141,7 +141,7 @@
       <groupId>com.google.api.grpc</groupId>
       <artifactId>proto-google-cloud-spanner-v1</artifactId>
     </dependency>
-    
+
     <!-- Test dependencies -->
     <dependency>
       <groupId>com.google.cloud</groupId>
@@ -219,18 +219,41 @@
         <artifactId>maven-failsafe-plugin</artifactId>
         <configuration>
           <systemPropertyVariables>
-            <spanner.testenv.config.class>com.google.cloud.spanner.GceTestEnvConfig</spanner.testenv.config.class>
-            <spanner.testenv.instance>projects/gcloud-devel/instances/spanner-testing</spanner.testenv.instance>
+            <spanner.testenv.config.class>
+              com.google.cloud.spanner.GceTestEnvConfig
+            </spanner.testenv.config.class>
+            <spanner.testenv.instance>
+              projects/gcloud-devel/instances/spanner-testing
+            </spanner.testenv.instance>
           </systemPropertyVariables>
-          <groups>com.google.cloud.spanner.IntegrationTest</groups>
-          <excludedGroups>com.google.cloud.spanner.FlakyTest</excludedGroups>
           <forkedProcessTimeoutInSeconds>2400</forkedProcessTimeoutInSeconds>
         </configuration>
         <executions>
           <execution>
+            <id>default</id>
+            <goals>
+              <goal>integration-test</goal>
+            </goals>
+            <configuration>
+              <groups>com.google.cloud.spanner.IntegrationTest</groups>
+              <excludedGroups>
+                com.google.cloud.spanner.FlakyTest,com.google.cloud.spanner.ParallelIntegrationTest
+              </excludedGroups>
+            </configuration>
+          </execution>
+          <execution>
+            <id>parallel-integration-test</id>
             <goals>
               <goal>integration-test</goal>
             </goals>
+            <configuration>
+              <groups>com.google.cloud.spanner.ParallelIntegrationTest</groups>
+              <excludedGroups>
+                com.google.cloud.spanner.FlakyTest,com.google.cloud.spanner.IntegrationTest
+              </excludedGroups>
+              <forkCount>8</forkCount>
+              <reuseForks>true</reuseForks>
+            </configuration>
           </execution>
         </executions>
       </plugin>
@@ -318,7 +341,7 @@
       </plugins>
     </pluginManagement>
   </build>
-  
+
   <profiles>
     <profile>
       <id>shade</id>
@@ -361,7 +384,7 @@
       </build>
     </profile>
   </profiles>
-  
+
   <reporting>
     <plugins>
       <plugin>

src/test/java/com/google/cloud/spanner/jdbc/ITAbstractJdbcTest.java

@@ -27,15 +27,13 @@
 import com.google.cloud.spanner.testing.EmulatorSpannerHelper;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
-import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.concurrent.ExecutionException;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -90,7 +88,7 @@ protected static Database getDatabase() {
   }
 
   @BeforeClass
-  public static void setup() throws IOException, InterruptedException, ExecutionException {
+  public static void setup() {
     database = env.getTestHelper().createTestDatabase();
   }
 

src/test/java/com/google/cloud/spanner/jdbc/it/ITJdbcConnectTest.java

@@ -20,7 +20,7 @@
 
 import com.google.auth.oauth2.AccessToken;
 import com.google.auth.oauth2.GoogleCredentials;
-import com.google.cloud.spanner.IntegrationTest;
+import com.google.cloud.spanner.ParallelIntegrationTest;
 import com.google.cloud.spanner.SpannerOptions;
 import com.google.cloud.spanner.jdbc.CloudSpannerJdbcConnection;
 import com.google.cloud.spanner.jdbc.ITAbstractJdbcTest;
@@ -49,7 +49,7 @@
  *
  * This class tests all three possibilities.
  */
-@Category(IntegrationTest.class)
+@Category(ParallelIntegrationTest.class)
 @RunWith(JUnit4.class)
 public class ITJdbcConnectTest extends ITAbstractJdbcTest {
 

src/test/java/com/google/cloud/spanner/jdbc/it/ITJdbcDatabaseMetaDataTest.java

@@ -23,7 +23,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assume.assumeFalse;
 
-import com.google.cloud.spanner.IntegrationTest;
+import com.google.cloud.spanner.ParallelIntegrationTest;
 import com.google.cloud.spanner.jdbc.ITAbstractJdbcTest;
 import com.google.cloud.spanner.testing.EmulatorSpannerHelper;
 import java.sql.Connection;
@@ -40,7 +40,7 @@
 import org.junit.runners.JUnit4;
 
 /** Integration tests for {@link DatabaseMetaData} implementation for Spanner. */
-@Category(IntegrationTest.class)
+@Category(ParallelIntegrationTest.class)
 @RunWith(JUnit4.class)
 public class ITJdbcDatabaseMetaDataTest extends ITAbstractJdbcTest {
   private static final String DEFAULT_CATALOG = "";

src/test/java/com/google/cloud/spanner/jdbc/it/ITJdbcDdlTest.java

@@ -16,7 +16,7 @@
 
 package com.google.cloud.spanner.jdbc.it;
 
-import com.google.cloud.spanner.IntegrationTest;
+import com.google.cloud.spanner.ParallelIntegrationTest;
 import com.google.cloud.spanner.connection.SqlScriptVerifier;
 import com.google.cloud.spanner.jdbc.ITAbstractJdbcTest;
 import com.google.cloud.spanner.jdbc.JdbcSqlScriptVerifier;
@@ -26,7 +26,7 @@
 import org.junit.runners.JUnit4;
 
 /** Execute DDL statements using JDBC. */
-@Category(IntegrationTest.class)
+@Category(ParallelIntegrationTest.class)
 @RunWith(JUnit4.class)
 public class ITJdbcDdlTest extends ITAbstractJdbcTest {
 

src/test/java/com/google/cloud/spanner/jdbc/it/ITJdbcPreparedStatementTest.java

@@ -27,7 +27,7 @@
 import static org.junit.Assume.assumeFalse;
 
 import com.google.cloud.ByteArray;
-import com.google.cloud.spanner.IntegrationTest;
+import com.google.cloud.spanner.ParallelIntegrationTest;
 import com.google.cloud.spanner.Value;
 import com.google.cloud.spanner.jdbc.ITAbstractJdbcTest;
 import com.google.cloud.spanner.jdbc.JsonType;
@@ -64,7 +64,7 @@
 import org.junit.runners.MethodSorters;
 
 /** Integration tests for JDBC {@link PreparedStatement}s. */
-@Category(IntegrationTest.class)
+@Category(ParallelIntegrationTest.class)
 @RunWith(JUnit4.class)
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class ITJdbcPreparedStatementTest extends ITAbstractJdbcTest {

src/test/java/com/google/cloud/spanner/jdbc/it/ITJdbcQueryOptionsTest.java

@@ -23,7 +23,7 @@
 import static org.junit.Assert.fail;
 import static org.junit.Assume.assumeFalse;
 
-import com.google.cloud.spanner.IntegrationTest;
+import com.google.cloud.spanner.ParallelIntegrationTest;
 import com.google.cloud.spanner.SpannerOptions;
 import com.google.cloud.spanner.connection.SpannerPool;
 import com.google.cloud.spanner.jdbc.ITAbstractJdbcTest;
@@ -53,7 +53,7 @@
  *
  * This class tests all three possibilities.
  */
-@Category(IntegrationTest.class)
+@Category(ParallelIntegrationTest.class)
 @RunWith(JUnit4.class)
 public class ITJdbcQueryOptionsTest extends ITAbstractJdbcTest {
   private String connectionUriSuffix;

src/test/java/com/google/cloud/spanner/jdbc/it/ITJdbcReadOnlyTest.java

@@ -16,8 +16,8 @@
 
 package com.google.cloud.spanner.jdbc.it;
 
-import com.google.cloud.spanner.IntegrationTest;
 import com.google.cloud.spanner.Mutation;
+import com.google.cloud.spanner.ParallelIntegrationTest;
 import com.google.cloud.spanner.connection.ConnectionOptions;
 import com.google.cloud.spanner.connection.SqlScriptVerifier;
 import com.google.cloud.spanner.jdbc.CloudSpannerJdbcConnection;
@@ -37,7 +37,7 @@
 import org.junit.runners.JUnit4;
 
 /** This test class runs a SQL script for testing a connection in read-only mode. */
-@Category(IntegrationTest.class)
+@Category(ParallelIntegrationTest.class)
 @RunWith(JUnit4.class)
 public class ITJdbcReadOnlyTest extends ITAbstractJdbcTest {
   private static final long TEST_ROWS_COUNT = 1000L;

src/test/java/com/google/cloud/spanner/jdbc/it/ITJdbcReadWriteAutocommitTest.java

@@ -20,8 +20,8 @@
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
 
-import com.google.cloud.spanner.IntegrationTest;
 import com.google.cloud.spanner.Mutation;
+import com.google.cloud.spanner.ParallelIntegrationTest;
 import com.google.cloud.spanner.connection.SqlScriptVerifier;
 import com.google.cloud.spanner.jdbc.CloudSpannerJdbcConnection;
 import com.google.cloud.spanner.jdbc.ITAbstractJdbcTest;
@@ -33,7 +33,7 @@
 import org.junit.runners.JUnit4;
 import org.junit.runners.MethodSorters;
 
-@Category(IntegrationTest.class)
+@Category(ParallelIntegrationTest.class)
 @RunWith(JUnit4.class)
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class ITJdbcReadWriteAutocommitTest extends ITAbstractJdbcTest {

src/test/java/com/google/cloud/spanner/jdbc/it/ITJdbcSimpleStatementsTest.java

@@ -23,7 +23,7 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import com.google.cloud.spanner.IntegrationTest;
+import com.google.cloud.spanner.ParallelIntegrationTest;
 import com.google.cloud.spanner.Struct;
 import com.google.cloud.spanner.Value;
 import com.google.cloud.spanner.jdbc.ITAbstractJdbcTest;
@@ -41,7 +41,7 @@
 
 /** Test executing simple statements through JDBC. */
 @RunWith(JUnit4.class)
-@Category(IntegrationTest.class)
+@Category(ParallelIntegrationTest.class)
 public class ITJdbcSimpleStatementsTest extends ITAbstractJdbcTest {
   @Test
   public void testSelect1() throws SQLException {