Split unit test and integration test execution

mp911de · mp911de · commit c8f1ae70e6a7 · 2019-10-22T10:46:17.000+02:00
[resolves #185]
diff --git a/pom.xml b/pom.xml
@@ -257,16 +257,36 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.1</version>
+                <version>3.0.0-M3</version>
                 <configuration>
                     <runOrder>random</runOrder>
+                    <excludes>
+                        <exclude>**/*IntegrationTests.java</exclude>
+                    </excludes>
                     <includes>
-                        <include>**/*TestKit.java</include>
+                        <include>**/*Tests.java</include>
                         <include>**/*Test.java</include>
                     </includes>
-                    <systemPropertyVariables>
-                        <io.netty.leakDetectionLevel>paranoid</io.netty.leakDetectionLevel>
-                    </systemPropertyVariables>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <version>3.0.0-M3</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>integration-test</goal>
+                            <goal>verify</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <runOrder>random</runOrder>
+                    <includes>
+                        <include>**/*TestKit.java</include>
+                        <include>**/*IntegrationTests.java</include>
+                    </includes>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/src/test/java/io/r2dbc/postgresql/AbstractCodecIntegrationTests.java b/src/test/java/io/r2dbc/postgresql/AbstractCodecIntegrationTests.java
@@ -56,7 +56,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-abstract class AbstractCodecIntegrationTest {
+abstract class AbstractCodecIntegrationTests {
 
     @RegisterExtension
     static final PostgresqlServerExtension SERVER = new PostgresqlServerExtension();
diff --git a/src/test/java/io/r2dbc/postgresql/CodecBinaryFormatIntegrationTests.java b/src/test/java/io/r2dbc/postgresql/CodecBinaryFormatIntegrationTests.java
@@ -18,7 +18,7 @@
 
 import io.r2dbc.postgresql.util.PostgresqlServerExtension;
 
-final class CodecBinaryFormatIntegrationTest extends AbstractCodecIntegrationTest {
+final class CodecBinaryFormatIntegrationTests extends AbstractCodecIntegrationTests {
 
     @Override
     protected PostgresqlConnectionConfiguration getConfiguration(PostgresqlServerExtension server) {
diff --git a/src/test/java/io/r2dbc/postgresql/CodecExtensionIntegrationTests.java b/src/test/java/io/r2dbc/postgresql/CodecExtensionIntegrationTests.java
@@ -37,7 +37,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class CodecExtensionIntegrationTest {
+public class CodecExtensionIntegrationTests {
 
     @RegisterExtension
     static final PostgresqlServerExtension SERVER = new PostgresqlServerExtension();
diff --git a/src/test/java/io/r2dbc/postgresql/CodecTextFormatIntegrationTests.java b/src/test/java/io/r2dbc/postgresql/CodecTextFormatIntegrationTests.java
@@ -18,7 +18,7 @@
 
 import io.r2dbc.postgresql.util.PostgresqlServerExtension;
 
-final class CodecTextFormatIntegrationTest extends AbstractCodecIntegrationTest {
+final class CodecTextFormatIntegrationTests extends AbstractCodecIntegrationTests {
 
     @Override
     protected PostgresqlConnectionConfiguration getConfiguration(PostgresqlServerExtension server) {
diff --git a/src/test/java/io/r2dbc/postgresql/JsonIntegrationTests.java b/src/test/java/io/r2dbc/postgresql/JsonIntegrationTests.java
@@ -25,7 +25,7 @@
 import org.springframework.jdbc.core.JdbcOperations;
 import reactor.test.StepVerifier;
 
-class JsonIntegrationTest {
+class JsonIntegrationTests {
 
     @RegisterExtension
     static final PostgresqlServerExtension SERVER = new PostgresqlServerExtension();
diff --git a/src/test/java/io/r2dbc/postgresql/PostgresNotificationIntegrationTests.java b/src/test/java/io/r2dbc/postgresql/PostgresNotificationIntegrationTests.java
@@ -30,7 +30,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-final class PostgresNotificationIntegrationTest {
+final class PostgresNotificationIntegrationTests {
 
     @RegisterExtension
     static final PostgresqlServerExtension SERVER = new PostgresqlServerExtension();
diff --git a/src/test/java/io/r2dbc/postgresql/PostgresqlAuthenticationFailureIntegrationTests.java b/src/test/java/io/r2dbc/postgresql/PostgresqlAuthenticationFailureIntegrationTests.java
@@ -34,7 +34,7 @@
 import static io.r2dbc.spi.ConnectionFactoryOptions.USER;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
-final class PostgresqlAuthenticationFailureTest {
+final class PostgresqlAuthenticationFailureIntegrationTests {
 
     @RegisterExtension
     static final PostgresqlServerExtension SERVER = new PostgresqlServerExtension();
diff --git a/src/test/java/io/r2dbc/postgresql/PostgresqlConnectionRuntimeOptionsIntegrationTests.java b/src/test/java/io/r2dbc/postgresql/PostgresqlConnectionRuntimeOptionsIntegrationTests.java
@@ -8,7 +8,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-final class PostgresqlConnectionRuntimeOptionsTest {
+final class PostgresqlConnectionRuntimeOptionsIntegrationTests {
 
     @RegisterExtension
     static final PostgresqlServerExtension SERVER = new PostgresqlServerExtension();
diff --git a/src/test/java/io/r2dbc/postgresql/client/ReactorNettyClientIntegrationTests.java b/src/test/java/io/r2dbc/postgresql/client/ReactorNettyClientIntegrationTests.java
@@ -63,7 +63,7 @@
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
 import static org.assertj.core.api.Assertions.fail;
 
-final class ReactorNettyClientTest {
+final class ReactorNettyClientIntegrationTests {
 
     @RegisterExtension
     static final PostgresqlServerExtension SERVER = new PostgresqlServerExtension();
@@ -148,6 +148,7 @@ void shouldCancelExchangeOnCloseInFlight() throws Exception {
 
     @AfterEach
     void closeClient() {
+        SERVER.getJdbcOperations().execute("DROP TABLE IF EXISTS test");
         this.client.close()
             .block();
     }
@@ -276,7 +277,7 @@ void timeoutTest() {
             .username("test")
             .password("test")
             .database(SERVER.getDatabase())
-            .applicationName(ReactorNettyClientTest.class.getName())
+            .applicationName(ReactorNettyClientIntegrationTests.class.getName())
             .connectTimeout(Duration.ofMillis(200))
             .build());
 
@@ -304,7 +305,7 @@ public boolean verify(String s, SSLSession sslSession) {
 
     @Nested
     @TestInstance(TestInstance.Lifecycle.PER_CLASS)
-    final class ScramTest {
+    final class ScramIntegrationTests {
 
         @Test
         void scramAuthentication() {
@@ -330,14 +331,14 @@ private PostgresqlConnectionFactory createConnectionFactory(String username, Str
                 .username(username)
                 .password(password)
                 .database(SERVER.getDatabase())
-                .applicationName(ReactorNettyClientTest.class.getName())
+                .applicationName(ReactorNettyClientIntegrationTests.class.getName())
                 .build());
         }
     }
 
     @Nested
     @TestInstance(TestInstance.Lifecycle.PER_CLASS)
-    final class SslTest {
+    final class SslIntegrationTests {
 
         @Test
         void exchangeSslWithClientCert() {
diff --git a/src/test/java/io/r2dbc/postgresql/codec/CodecIntegrationTests.java b/src/test/java/io/r2dbc/postgresql/codec/CodecIntegrationTests.java
@@ -53,7 +53,7 @@
 import static io.r2dbc.postgresql.util.TestByteBufAllocator.TEST;
 import static org.assertj.core.api.Assertions.assertThat;
 
-final class CodecIntegrationTest {
+final class CodecIntegrationTests {
 
     @RegisterExtension
     static final PostgresqlServerExtension SERVER = new PostgresqlServerExtension();
@@ -326,7 +326,7 @@ private <T> void testCodec(Class<T> javaType, T value, BiConsumer<T, T> equality
                 .assertNext(r2dbc -> equality.accept(r2dbc, value))
                 .verifyComplete();
         } finally {
-            //SERVER.getJdbcOperations().execute("DROP TABLE test");
+            SERVER.getJdbcOperations().execute("DROP TABLE test");
         }
     }
 
diff --git a/src/test/java/io/r2dbc/postgresql/util/PostgresqlServerExtension.java b/src/test/java/io/r2dbc/postgresql/util/PostgresqlServerExtension.java
@@ -35,7 +35,6 @@
 import java.net.URL;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Supplier;
 
 import static org.testcontainers.utility.MountableFile.forHostPath;
@@ -46,21 +45,28 @@
  */
 public final class PostgresqlServerExtension implements BeforeAllCallback, AfterAllCallback {
 
-    private volatile PostgreSQLContainer<?> containerInstance = null;
+    private static PostgreSQLContainer<?> containerInstance = null;
 
     private final Supplier<PostgreSQLContainer<?>> container = () -> {
-        if (this.containerInstance != null) {
-            return this.containerInstance;
+
+        if (PostgresqlServerExtension.containerInstance != null) {
+            return PostgresqlServerExtension.containerInstance;
         }
-        return this.containerInstance = container();
+
+        PostgresqlServerExtension.containerInstance = container();
+
+        Runtime.getRuntime().addShutdownHook(new Thread(() -> {
+            containerInstance.stop();
+            containerInstance = null;
+        }, "PostgresqlServerExtension-Shutdown"));
+
+        return PostgresqlServerExtension.containerInstance;
     };
 
     private final DatabaseContainer postgres = new TestContainer(this.container.get());
 
     private final boolean useTestContainer = this.postgres instanceof TestContainer;
 
-    private final AtomicInteger nestingCounter = new AtomicInteger(0);
-
     private HikariDataSource dataSource;
 
     private JdbcOperations jdbcOperations;
@@ -69,43 +75,42 @@ public PostgresqlServerExtension() {
     }
 
     @Override
+    @SuppressWarnings("rawtypes")
     public void afterAll(ExtensionContext context) {
-        int nesting = this.nestingCounter.decrementAndGet();
-        if (nesting == 0) {
-            if (this.dataSource != null) {
-                this.dataSource.close();
-            }
-            if (this.useTestContainer) {
-                this.container.get().stop();
-            }
+
+        if (this.dataSource != null) {
+            this.dataSource.close();
         }
     }
 
     @Override
+    @SuppressWarnings("rawtypes")
     public void beforeAll(ExtensionContext context) {
         initialize();
     }
 
     public void initialize() {
-        int nesting = this.nestingCounter.incrementAndGet();
-        if (nesting == 1) {
-            if (this.useTestContainer) {
-                this.container.get().start();
-            }
 
-            HikariDataSource dataSource = new HikariDataSource();
-            dataSource.setUsername(getUsername());
-            dataSource.setPassword(getPassword());
-            dataSource.setJdbcUrl(String.format("jdbc:postgresql://%s:%d/%s", getHost(), getPort(), getDatabase()));
+        if (this.useTestContainer) {
+            this.container.get().start();
+        }
 
-            HikariDataSource hikariDataSource = new HikariDataSource();
-            hikariDataSource.setUsername(getUsername());
-            hikariDataSource.setPassword(getPassword());
-            hikariDataSource.setJdbcUrl(String.format("jdbc:postgresql://%s:%d/%s", getHost(), getPort(), getDatabase()));
+        initializeConnectors();
+    }
 
-            this.dataSource = hikariDataSource;
-            this.jdbcOperations = new JdbcTemplate(this.dataSource);
-        }
+    private void initializeConnectors() {
+        HikariDataSource dataSource = new HikariDataSource();
+        dataSource.setUsername(getUsername());
+        dataSource.setPassword(getPassword());
+        dataSource.setJdbcUrl(String.format("jdbc:postgresql://%s:%d/%s", getHost(), getPort(), getDatabase()));
+
+        HikariDataSource hikariDataSource = new HikariDataSource();
+        hikariDataSource.setUsername(getUsername());
+        hikariDataSource.setPassword(getPassword());
+        hikariDataSource.setJdbcUrl(String.format("jdbc:postgresql://%s:%d/%s", getHost(), getPort(), getDatabase()));
+
+        this.dataSource = hikariDataSource;
+        this.jdbcOperations = new JdbcTemplate(this.dataSource);
     }
 
     public String getClientCrt() {
@@ -129,7 +134,7 @@ public String getDatabase() {
     }
 
     public DataSource getDataSource() {
-        return dataSource;
+        return this.dataSource;
     }
 
     @Nullable
diff --git a/src/test/resources/META-INF/services/io.r2dbc.postgresql.extension.Extension b/src/test/resources/META-INF/services/io.r2dbc.postgresql.extension.Extension
@@ -1 +1 @@
-io.r2dbc.postgresql.CodecExtensionIntegrationTest$JsonCodecRegistrar
+io.r2dbc.postgresql.CodecExtensionIntegrationTests$JsonCodecRegistrar
