Refactor tests to fully use JUnit 5 capabilities

Author: pesse

pom.xml

@@ -47,12 +47,6 @@
       <version>${junit.jupiter.version}</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-migrationsupport</artifactId>
-      <version>${junit.jupiter.version}</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <repositories>

src/test/java/org/utplsql/api/rules/DatabaseRule.java renamed to src/test/java/org/utplsql/api/AbstractDatabaseTest.java

@@ -1,51 +1,50 @@
-package org.utplsql.api.rules;
+package org.utplsql.api;
 
-import org.junit.rules.ExternalResource;
-import org.utplsql.api.EnvironmentVariableUtil;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * Created by Vinicius on 13/04/2017.
- */
-public class DatabaseRule extends ExternalResource {
+public abstract class AbstractDatabaseTest {
 
     private static String sUrl;
     private static String sUser;
     private static String sPass;
-
     static {
         sUrl  = EnvironmentVariableUtil.getEnvValue("DB_URL", "192.168.99.100:1521:XE");
         sUser = EnvironmentVariableUtil.getEnvValue("DB_USER", "app");
         sPass = EnvironmentVariableUtil.getEnvValue("DB_PASS", "app");
     }
 
+    private Connection conn;
+    private List<Connection> connectionList = new ArrayList<>();
 
-
-    private List<Connection> connectionList;
-
-    public DatabaseRule() {
-        connectionList = new ArrayList<>();
+    @BeforeEach
+    public void setupConnection() throws SQLException {
+        conn = newConnection();
     }
 
-    public String getUser() {
-        return sUser;
+    protected Connection getConnection() {
+        return conn;
     }
 
-    public synchronized Connection newConnection() throws SQLException {
+    protected synchronized Connection newConnection() throws SQLException {
         Connection conn = DriverManager.getConnection("jdbc:oracle:thin:@" + sUrl, sUser, sPass);
         connectionList.add(conn);
         return conn;
     }
 
-    @Override
-    protected void after() {
+    public static String getUser() {
+        return sUser;
+    }
+
+    @AfterEach
+    public void teardownConnection() {
         for (Connection conn : connectionList)
             try { conn.close(); } catch (SQLException ignored) {}
     }
-
 }

src/test/java/org/utplsql/api/CompatibilityIT.java

@@ -1,44 +1,28 @@
 package org.utplsql.api;
 
-import org.junit.Rule;
 import org.junit.jupiter.api.Test;
 import org.utplsql.api.compatibility.CompatibilityProxy;
-import org.utplsql.api.rules.DatabaseRule;
 
-import java.sql.Connection;
 import java.sql.SQLException;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.fail;
 
-public class CompatibilityIT {
+public class CompatibilityIT extends AbstractDatabaseTest {
 
-    @Rule
-    public final DatabaseRule db = new DatabaseRule();
 
     @Test
-    public void compatibleVersion() {
-        try {
-            Connection conn = db.newConnection();
-            CompatibilityProxy proxy = new CompatibilityProxy(conn);
-            proxy.failOnNotCompatible();
-            assertEquals(true, proxy.isCompatible());
-        } catch (SQLException e) {
-            fail(e);
-        }
+    public void compatibleVersion() throws SQLException {
+        CompatibilityProxy proxy = new CompatibilityProxy(getConnection());
+        proxy.failOnNotCompatible();
+        assertEquals(true, proxy.isCompatible());
     }
 
     @Test
-    public void skipCompatibilityCheck()
-    {
-        try {
-            Connection conn = db.newConnection();
-            CompatibilityProxy proxy = new CompatibilityProxy(conn, true);
-            proxy.failOnNotCompatible();
-            assertEquals(true, proxy.isCompatible());
-            assertEquals(CompatibilityProxy.UTPLSQL_API_VERSION, proxy.getDatabaseVersion().toString());
-        } catch (SQLException e) {
-            fail(e);
-        }
+    public void skipCompatibilityCheck() throws SQLException {
+        CompatibilityProxy proxy = new CompatibilityProxy(getConnection(), true);
+        proxy.failOnNotCompatible();
+        assertEquals(true, proxy.isCompatible());
+        assertEquals(CompatibilityProxy.UTPLSQL_API_VERSION, proxy.getDatabaseVersion().toString());
+
     }
 }

src/test/java/org/utplsql/api/DBHelperIT.java

@@ -1,29 +1,17 @@
 package org.utplsql.api;
 
-import org.junit.Rule;
 import org.junit.jupiter.api.Test;
-import org.utplsql.api.rules.DatabaseRule;
 
 import java.sql.SQLException;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.fail;
 
-public class DBHelperIT {
-
-    @Rule
-    public final DatabaseRule db = new DatabaseRule();
+public class DBHelperIT extends AbstractDatabaseTest {
 
     @Test
-    public void getFrameworkVersion()
-    {
-        try {
-            Version v = DBHelper.getDatabaseFrameworkVersion(db.newConnection());
-            assertEquals(true, v.isValid());
-        } catch (SQLException e)
-        {
-            fail(e);
-        }
+    public void getFrameworkVersion() throws SQLException {
+        Version v = DBHelper.getDatabaseFrameworkVersion(getConnection());
+        assertEquals(true, v.isValid());
     }
 
 }

src/test/java/org/utplsql/api/FileMapperIT.java

@@ -1,8 +1,6 @@
 package org.utplsql.api;
 
 import org.junit.jupiter.api.Test;
-import org.utplsql.api.rules.DatabaseRule;
-import org.junit.Rule;
 
 import java.sql.SQLException;
 import java.util.ArrayList;
@@ -11,10 +9,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;
 
-public class FileMapperIT {
-
-    @Rule
-    public final DatabaseRule db = new DatabaseRule();
+public class FileMapperIT extends AbstractDatabaseTest {
 
     @Test
     public void testFileMapper() throws SQLException {
@@ -34,7 +29,7 @@ public void testFileMapper() throws SQLException {
         mapperOptions.setTypeSubExpression(2);
         mapperOptions.setNameSubExpression(3);
 
-        List<FileMapping> fileMappings = FileMapper.buildFileMappingList(db.newConnection(), mapperOptions);
+        List<FileMapping> fileMappings = FileMapper.buildFileMappingList(getConnection(), mapperOptions);
 
         if (fileMappings.size() != 2)
             fail("Wrong mapping list size.");

src/test/java/org/utplsql/api/OutputBufferIT.java

@@ -3,13 +3,10 @@
 import org.junit.jupiter.api.Test;
 import org.utplsql.api.reporter.DocumentationReporter;
 import org.utplsql.api.reporter.Reporter;
-import org.utplsql.api.rules.DatabaseRule;
-import org.junit.Rule;
 
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.PrintStream;
-import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
@@ -19,34 +16,32 @@
 import static org.junit.jupiter.api.Assertions.fail;
 
 /**
- * Created by Vinicius on 13/04/2017.
+ * Integration-test for OutputBuffers
+ *
+ * @author viniciusam
+ * @author pesse
  */
-public class OutputBufferIT {
-
-    @Rule
-    public final DatabaseRule db = new DatabaseRule();
+public class OutputBufferIT extends AbstractDatabaseTest {
 
     public Reporter createReporter() throws SQLException {
-        Connection conn = db.newConnection();
-        Reporter reporter = new DocumentationReporter().init(conn);
+        Reporter reporter = new DocumentationReporter().init(newConnection());
         System.out.println("Reporter ID: " + reporter.getReporterId());
         return reporter;
     }
 
     @Test
-    public void printAvailableLines() {
+    public void printAvailableLines() throws SQLException {
         ExecutorService executorService = Executors.newFixedThreadPool(2);
 
         try {
             final Reporter reporter = createReporter();
 
             Future<Object> task1 = executorService.submit(() -> {
                 try {
-                    Connection conn = db.newConnection();
                     new TestRunner()
-                            .addPath(db.getUser())
+                            .addPath(getUser())
                             .addReporter(reporter)
-                            .run(conn);
+                            .run(getConnection());
 
                     return Boolean.TRUE;
                 } catch (SQLException e) {
@@ -58,15 +53,14 @@ public void printAvailableLines() {
                 FileOutputStream fileOutStream = null;
                 File outFile = new File("output.txt");
                 try {
-                    Connection conn = db.newConnection();
                     fileOutStream = new FileOutputStream(outFile);
 
                     List<PrintStream> printStreams = new ArrayList<>();
                     printStreams.add(System.out);
                     printStreams.add(new PrintStream(fileOutStream));
 
                     new OutputBuffer(reporter)
-                        .printAvailable(conn, printStreams);
+                            .printAvailable(newConnection(), printStreams);
 
                     return Boolean.TRUE;
                 } catch (SQLException e) {
@@ -90,30 +84,23 @@ public void printAvailableLines() {
 
             if (res2 instanceof Exception)
                 fail((Exception) res2);
-        } catch (SQLException e) {
-            fail(e.getMessage());
         } catch (InterruptedException | ExecutionException e) {
             e.printStackTrace();
         }
     }
 
     @Test
-    public void fetchAllLines() {
-        try {
-            final Reporter reporter = createReporter();
-            Connection conn = db.newConnection();
-            new TestRunner()
-                    .addPath(db.getUser())
-                    .addReporter(reporter)
-                    .run(conn);
-
-            List<String> outputLines = new OutputBuffer(reporter)
-                    .fetchAll(conn);
-
-            assertTrue(outputLines.size() > 0);
-        } catch (SQLException e) {
-            fail(e);
-        }
+    public void fetchAllLines() throws SQLException {
+        final Reporter reporter = createReporter();
+        new TestRunner()
+                .addPath(getUser())
+                .addReporter(reporter)
+                .run(getConnection());
+
+        List<String> outputLines = new OutputBuffer(reporter)
+                .fetchAll(getConnection());
+
+        assertTrue(outputLines.size() > 0);
     }
 
 }