Refactor/15 remove testcontainer (#19)

* #11: Removed exasol-testconatiner compile dependency

Author: jakobbraun

doc/changes/changes_0.4.0.md

@@ -6,19 +6,25 @@ Code name:
 
 * #15: Add API for host port proxy
 
+## Refactoring:
+
+* #11: Removed exasol-testconatiner compile dependency
+
 ## Dependency Updates
 
 ### Compile Dependency Updates
 
+* Added `com.exasol:bucketfs-java:1.0.0`
 * Updated `com.exasol:error-reporting-java:0.2.0` to `0.4.0`
-* Updated `com.exasol:exasol-testcontainers:3.3.1` to `3.5.1`
+* Removed `com.exasol:exasol-testcontainers:3.3.1`
 * Updated `com.exasol:test-db-builder-java:2.0.0` to `3.1.1`
 
 ### Test Dependency Updates
 
+* Added `com.exasol:exasol-testcontainers:3.5.2`
 * Updated `org.junit.jupiter:junit-jupiter-engine:5.6.2` to `5.7.1`
 * Updated `org.junit.jupiter:junit-jupiter-params:5.6.2` to `5.7.1`
-* Updated `org.junit.platform:junit-platform-runner:1.6.2` to `1.7.1`
+* Removed `org.junit.platform:junit-platform-runner:1.6.2`
 * Updated `org.mockito:mockito-core:3.6.0` to `3.8.0`
 * Updated `org.testcontainers:junit-jupiter:1.14.3` to `1.15.2`
 

pom.xml

@@ -93,12 +93,10 @@
             <classifier>runtime</classifier>
             <scope>test</scope>
         </dependency>
-        <!-- This is a compile dependency for accessing Bucket from testcontainers.
-        It is planned to move it out there: -->
         <dependency>
             <groupId>com.exasol</groupId>
-            <artifactId>exasol-testcontainers</artifactId>
-            <version>3.5.1</version>
+            <artifactId>bucketfs-java</artifactId>
+            <version>1.0.0</version>
         </dependency>
         <!-- test dependencies -->
         <dependency>
@@ -107,12 +105,6 @@
             <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.platform</groupId>
-            <artifactId>junit-platform-runner</artifactId>
-            <version>${junit.platform.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-params</artifactId>
@@ -132,6 +124,12 @@
             <scope>test</scope>
         </dependency>
         <!--Integration test dependencies-->
+        <dependency>
+            <groupId>com.exasol</groupId>
+            <artifactId>exasol-testcontainers</artifactId>
+            <version>3.5.2</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>junit-jupiter</artifactId>

src/test/java/com/exasol/udfdebugging/modules/TestSetup.java

@@ -0,0 +1,58 @@
+package com.exasol.udfdebugging.modules;
+
+import java.io.Closeable;
+import java.sql.*;
+import java.util.stream.Stream;
+
+import com.exasol.bucketfs.Bucket;
+import com.exasol.containers.ExasolContainer;
+import com.exasol.dbbuilder.dialects.exasol.*;
+import com.exasol.dbbuilder.dialects.exasol.udf.UdfScript;
+import com.exasol.udfdebugging.ExposedServiceAddress;
+import com.exasol.udfdebugging.LocalServiceExposer;
+
+/**
+ * This class contains common integration test setup.
+ */
+public class TestSetup implements Closeable, AutoCloseable {
+    private static final String SCHEMA_NAME = "TEST";
+    private static final String UDF_NAME = "HELLO_WORLD";
+
+    private final ExasolContainer<? extends ExasolContainer<?>> exasol = new ExasolContainer<>().withReuse(true);
+
+    public TestSetup() {
+        this.exasol.start();
+    }
+
+    public LocalServiceExposer getHostPortProxy() {
+        return port -> new ExposedServiceAddress(this.exasol.getHostIp(), port);
+    }
+
+    public Bucket getDefaultBucket() {
+        return this.exasol.getDefaultBucket();
+    }
+
+    public ExasolContainer<? extends ExasolContainer<?>> getExasolContainer() {
+        return this.exasol;
+    }
+
+    public void runJavaUdf(final Stream<String> jvmOptions) throws SQLException {
+        try (final Connection connection = this.exasol.createConnection();
+                final Statement statement = connection.createStatement()) {
+            final ExasolObjectFactory exasolObjectFactory = new ExasolObjectFactory(connection,
+                    ExasolObjectConfiguration.builder().withJvmOptions(jvmOptions.toArray(String[]::new)).build());
+            final ExasolSchema schema = exasolObjectFactory.createSchema(SCHEMA_NAME);
+            schema.createUdfBuilder(UDF_NAME).inputType(UdfScript.InputType.SCALAR).language(UdfScript.Language.JAVA)
+                    .content("class HELLO_WORLD {\n"
+                            + " static String run(ExaMetadata exa, ExaIterator ctx) throws Exception {\n"
+                            + " \treturn \"\";\n" + " }\n" + "}")
+                    .returns("VARCHAR(2000)").build();
+            statement.executeQuery("SELECT " + SCHEMA_NAME + "." + UDF_NAME + "()").close();
+        }
+    }
+
+    @Override
+    public void close() {
+        this.exasol.stop();
+    }
+}

src/test/java/com/exasol/udfdebugging/modules/coverage/CoverageModuleIT.java

@@ -4,47 +4,24 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.io.*;
-import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.jacoco.core.data.ExecutionDataReader;
 import org.junit.jupiter.api.Test;
-import org.testcontainers.junit.jupiter.Container;
-import org.testcontainers.junit.jupiter.Testcontainers;
 
-import com.exasol.containers.ExasolContainer;
-import com.exasol.dbbuilder.dialects.exasol.*;
-import com.exasol.dbbuilder.dialects.exasol.udf.UdfScript;
 import com.exasol.errorreporting.ExaError;
-import com.exasol.udfdebugging.ExposedServiceAddress;
-import com.exasol.udfdebugging.LocalServiceExposer;
+import com.exasol.udfdebugging.modules.TestSetup;
 
-@Testcontainers
 class CoverageModuleIT {
-    @Container
-    private static final ExasolContainer<? extends ExasolContainer<?>> EXASOL = new ExasolContainer<>().withReuse(true);
-    private static final String SCHEMA_NAME = "TEST";
-    private static final String UDF_NAME = "HELLO_WORLD";
-
-    private static LocalServiceExposer getHostPortProxy() {
-        return port -> new ExposedServiceAddress(EXASOL.getHostIp(), port);
-    }
 
     @Test
-    void testCoverageReportIsWritten() throws SQLException, IOException, InterruptedException {
+    void testCoverageReportIsWritten() throws SQLException, IOException {
         deleteExecutionFile();
-        final Connection connection = EXASOL.createConnection();
-        final CoverageModule coverageModule = new CoverageModule(getHostPortProxy(), EXASOL.getDefaultBucket());
-        final ExasolObjectFactory exasolObjectFactory = new ExasolObjectFactory(connection, ExasolObjectConfiguration
-                .builder().withJvmOptions(coverageModule.getJvmOptions().toArray(String[]::new)).build());
-        final ExasolSchema schema = exasolObjectFactory.createSchema(SCHEMA_NAME);
-        schema.createUdfBuilder(UDF_NAME).inputType(UdfScript.InputType.SCALAR).language(UdfScript.Language.JAVA)
-                .content("class HELLO_WORLD {\n"
-                        + " static String run(ExaMetadata exa, ExaIterator ctx) throws Exception {\n"
-                        + " \treturn \"hello world\";\n" + " }\n" + "}")
-                .returns("VARCHAR(2000)").build();
-        connection.createStatement().executeQuery("SELECT " + SCHEMA_NAME + "." + UDF_NAME + "()");
+        final TestSetup udfSetup = new TestSetup();
+        final CoverageModule coverageModule = new CoverageModule(udfSetup.getHostPortProxy(),
+                udfSetup.getDefaultBucket());
+        udfSetup.runJavaUdf(coverageModule.getJvmOptions());
         assertThat(countReportedJacocoSessions(), equalTo(1));
     }