Add custom mapping to TestRunner

viniciusam · viniciusam · commit 507f6757cdfe · 2017-07-23T14:32:46.000-03:00
diff --git a/src/main/java/io/github/utplsql/api/FileMapper.java b/src/main/java/io/github/utplsql/api/FileMapper.java
@@ -43,7 +43,7 @@ public static Array buildFileMappingArray(
         int paramIdx = 0;
         callableStatement.registerOutParameter(++paramIdx, OracleTypes.ARRAY, CustomTypes.UT_FILE_MAPPINGS);
 
-        callableStatement.setString(++paramIdx, mapperOptions.getOwner());
+        callableStatement.setString(++paramIdx, mapperOptions.getObjectOwner());
         callableStatement.setArray(
                 ++paramIdx, oraConn.createOracleArray(CustomTypes.UT_VARCHAR2_LIST, filePaths.toArray()));
         callableStatement.setArray(
diff --git a/src/main/java/io/github/utplsql/api/FileMapperOptions.java b/src/main/java/io/github/utplsql/api/FileMapperOptions.java
@@ -5,23 +5,23 @@
 
 public class FileMapperOptions {
 
-    private String owner;
+    private String objectOwner;
     private List<KeyValuePair> typeMappings;
     private String regexPattern;
     private int ownerSubExpression;
     private int typeSubExpression;
     private int nameSubExpression;
 
-    public FileMapperOptions(List<String> filePaths) {
+    public FileMapperOptions() {
         this.typeMappings = new ArrayList<>();
     }
 
-    public String getOwner() {
-        return owner;
+    public String getObjectOwner() {
+        return objectOwner;
     }
 
-    public void setOwner(String owner) {
-        this.owner = owner;
+    public void setObjectOwner(String owner) {
+        this.objectOwner = owner;
     }
 
     public List<KeyValuePair> getTypeMappings() {
diff --git a/src/main/java/io/github/utplsql/api/TestRunner.java b/src/main/java/io/github/utplsql/api/TestRunner.java
@@ -5,7 +5,10 @@
 import io.github.utplsql.api.reporter.Reporter;
 import oracle.jdbc.OracleConnection;
 
-import java.sql.*;
+import java.sql.CallableStatement;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.Types;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -108,12 +111,12 @@ public void run(Connection conn) throws SomeTestsFailedException, SQLException {
         String failOnErrors = Boolean.toString(this.failOnErrors);
 
         String sourceFilesParam = "a_source_files";
-        if (this.sourceMappingOptions != null && !this.sourceFiles.isEmpty())
-            sourceFilesParam = "a_source_file_mappings";
-
         String testFilesParam = "a_test_files";
-        if (this.testMappingOptions != null && !this.testFiles.isEmpty())
-            sourceFilesParam = "a_test_file_mappings";
+
+        if (this.sourceMappingOptions != null || this.testMappingOptions != null) {
+            sourceFilesParam = "a_source_file_mappings";
+            testFilesParam = "a_test_file_mappings";
+        }
 
         OracleConnection oraConn = conn.unwrap(OracleConnection.class);
         CallableStatement callableStatement = null;
@@ -147,30 +150,40 @@ public void run(Connection conn) throws SomeTestsFailedException, SQLException {
                         ++paramIdx, oraConn.createOracleArray(CustomTypes.UT_VARCHAR2_LIST, this.coverageSchemes.toArray()));
             }
 
-            if (this.sourceFiles.isEmpty()) {
-                callableStatement.setNull(++paramIdx, Types.ARRAY, CustomTypes.UT_VARCHAR2_LIST);
-            } else if (this.sourceMappingOptions != null) {
-                Array sourceMappings = FileMapper.buildFileMappingArray(
-                        conn, this.sourceFiles, this.sourceMappingOptions);
-
-                callableStatement.setArray(
-                        ++paramIdx, oraConn.createOracleArray(CustomTypes.UT_FILE_MAPPINGS, sourceMappings));
-            } else {
-                callableStatement.setArray(
-                        ++paramIdx, oraConn.createOracleArray(CustomTypes.UT_VARCHAR2_LIST, this.sourceFiles.toArray()));
-            }
-
-            if (this.testFiles.isEmpty()) {
-                callableStatement.setNull(++paramIdx, Types.ARRAY, CustomTypes.UT_VARCHAR2_LIST);
-            } else if (this.testMappingOptions != null) {
-                Array sourceMappings = FileMapper.buildFileMappingArray(
-                        conn, this.testFiles, this.testMappingOptions);
-
-                callableStatement.setArray(
-                        ++paramIdx, oraConn.createOracleArray(CustomTypes.UT_FILE_MAPPINGS, sourceMappings));
+            if (this.sourceMappingOptions != null || this.testMappingOptions != null) {
+                if (this.sourceMappingOptions != null) {
+                    List<FileMapping> sourceMappings = FileMapper.buildFileMappingList(
+                            conn, this.sourceFiles, this.sourceMappingOptions);
+
+                    callableStatement.setArray(
+                            ++paramIdx, oraConn.createOracleArray(CustomTypes.UT_FILE_MAPPINGS, sourceMappings.toArray()));
+                } else {
+                    callableStatement.setNull(++paramIdx, Types.ARRAY, CustomTypes.UT_FILE_MAPPINGS);
+                }
+
+                if (this.testMappingOptions != null) {
+                    List<FileMapping> sourceMappings = FileMapper.buildFileMappingList(
+                            conn, this.testFiles, this.testMappingOptions);
+
+                    callableStatement.setArray(
+                            ++paramIdx, oraConn.createOracleArray(CustomTypes.UT_FILE_MAPPINGS, sourceMappings.toArray()));
+                } else {
+                    callableStatement.setNull(++paramIdx, Types.ARRAY, CustomTypes.UT_FILE_MAPPINGS);
+                }
             } else {
-                callableStatement.setArray(
-                        ++paramIdx, oraConn.createOracleArray(CustomTypes.UT_VARCHAR2_LIST, this.testFiles.toArray()));
+                if (this.sourceFiles.isEmpty()) {
+                    callableStatement.setNull(++paramIdx, Types.ARRAY, CustomTypes.UT_VARCHAR2_LIST);
+                } else {
+                    callableStatement.setArray(
+                            ++paramIdx, oraConn.createOracleArray(CustomTypes.UT_VARCHAR2_LIST, this.sourceFiles.toArray()));
+                }
+
+                if (this.testFiles.isEmpty()) {
+                    callableStatement.setNull(++paramIdx, Types.ARRAY, CustomTypes.UT_VARCHAR2_LIST);
+                } else {
+                    callableStatement.setArray(
+                            ++paramIdx, oraConn.createOracleArray(CustomTypes.UT_VARCHAR2_LIST, this.testFiles.toArray()));
+                }
             }
 
             if (this.includeObjects.isEmpty()) {
diff --git a/src/test/java/io/github/utplsql/api/FileMapperTest.java b/src/test/java/io/github/utplsql/api/FileMapperTest.java
@@ -24,8 +24,8 @@ public void testFileMapper() throws SQLException {
                 "sources/app/procedures/award_bonus.sql",
                 "sources/app/functions/betwnstr.sql");
 
-        FileMapperOptions mapperOptions = new FileMapperOptions(filePaths);
-        mapperOptions.setOwner("APP");
+        FileMapperOptions mapperOptions = new FileMapperOptions();
+        mapperOptions.setObjectOwner("APP");
         mapperOptions.setTypeMappings(typeMappings);
         mapperOptions.setRegexPattern("\\w+[\\\\\\/](\\w+)[\\\\\\/](\\w+)[\\\\\\/](\\w+)[.](\\w{3})");
         mapperOptions.setOwnerSubExpression(1);
