Replace old TestRunnerStatements with the new DynamicTestRunnerStatement

Author: pesse

src/main/java/org/utplsql/api/testRunner/AbstractTestRunnerStatement.java

@@ -8,6 +8,7 @@
 import org.utplsql.api.db.DynamicParameterList;
 
 import java.sql.CallableStatement;
+import java.sql.Connection;
 import java.sql.SQLException;
 
 public class DynamicTestRunnerStatement implements TestRunnerStatement {
@@ -66,16 +67,21 @@ private DynamicParameterList initParameterList() throws SQLException {
     }
 
     private void prepareStatement() throws SQLException {
-        if ( stmt == null )
-            oracleConnection.prepareCall(dynamicParameterList.getSql());
+        if ( stmt == null ) {
+            String sql =  "BEGIN " +
+                    "ut_runner.run(" +
+                    dynamicParameterList.getSql() +
+                    ");" +
+                    "END;";
+            stmt = oracleConnection.prepareCall(sql);
+        }
 
         dynamicParameterList.setParamsStartWithIndex(stmt, 1);
     }
 
     @Override
     public void execute() throws SQLException {
-
-        // Implement
+        stmt.execute();
     }
 
     @Override
@@ -90,7 +96,8 @@ public void close() throws SQLException {
         }
     }
 
-    public static DynamicTestRunnerStatement forVersion(Version version, OracleConnection connection, TestRunnerOptions options, CallableStatement statement ) throws SQLException {
-        return new DynamicTestRunnerStatement(version, connection, options, statement);
+    public static DynamicTestRunnerStatement forVersion(Version version, Connection connection, TestRunnerOptions options, CallableStatement statement ) throws SQLException {
+        OracleConnection oraConn = connection.unwrap(OracleConnection.class);
+        return new DynamicTestRunnerStatement(version, oraConn, options, statement);
     }
 }

src/main/java/org/utplsql/api/testRunner/ActualTestRunnerStatement.java

@@ -2,7 +2,6 @@
 
 import org.utplsql.api.TestRunnerOptions;
 import org.utplsql.api.Version;
-import org.utplsql.api.exception.InvalidVersionException;
 
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -28,24 +27,6 @@ private TestRunnerStatementProvider() {
      * @throws SQLException
      */
     public static TestRunnerStatement getCompatibleTestRunnerStatement(Version databaseVersion, TestRunnerOptions options, Connection conn) throws SQLException {
-        AbstractTestRunnerStatement stmt = null;
-
-        try {
-            if (databaseVersion.isLessThan(Version.V3_0_3)) {
-                stmt = new Pre303TestRunnerStatement(options, conn);
-            } else if (databaseVersion.isLessThan(Version.V3_1_2)) {
-                stmt = new Pre312TestRunnerStatement(options, conn);
-            } else if (databaseVersion.isLessThan(Version.V3_1_7)) {
-                stmt = new Pre317TestRunnerStatement(options, conn);
-            }
-
-        } catch (InvalidVersionException ignored) {
-        }
-
-        if (stmt == null) {
-            stmt = new ActualTestRunnerStatement(options, conn);
-        }
-
-        return stmt;
+        return DynamicTestRunnerStatement.forVersion(databaseVersion, conn, options, null);
     }
 }