FileMappings are more complicated to pass around

pesse · pesse · commit 5ff0ee29915f · 2019-10-21T09:45:21.000+02:00
Needed some ugly mocking, probably something to refactor in future
diff --git a/src/main/java/org/utplsql/api/db/DynamicParameterList.java b/src/main/java/org/utplsql/api/db/DynamicParameterList.java
@@ -210,7 +210,8 @@ public void setParam(CallableStatement statement, int index) throws SQLException
                 statement.setNull(index, Types.ARRAY, customTypeName);
             } else {
                 statement.setArray(
-                        index, oraConnection.createOracleArray(customTypeName, value)
+                        index,
+                        oraConnection.createOracleArray(customTypeName, value)
                 );
             }
         }
diff --git a/src/main/java/org/utplsql/api/testRunner/DynamicTestRunnerStatement.java b/src/main/java/org/utplsql/api/testRunner/DynamicTestRunnerStatement.java
@@ -2,13 +2,15 @@
 
 import oracle.jdbc.OracleConnection;
 import org.utplsql.api.CustomTypes;
+import org.utplsql.api.FileMapping;
 import org.utplsql.api.TestRunnerOptions;
 import org.utplsql.api.Version;
 import org.utplsql.api.db.DynamicParameterList;
 
 import java.sql.CallableStatement;
 import java.sql.Connection;
 import java.sql.SQLException;
+import java.util.List;
 
 public class DynamicTestRunnerStatement implements TestRunnerStatement {
 
@@ -49,11 +51,16 @@ private DynamicParameterList initParameterList() throws SQLException {
                         "); " +
                         "END;";
          */
+
+        Object[] sourceMappings = (options.sourceMappingOptions!=null)
+                ?FileMapper.buildFileMappingList(oracleConnection, options.sourceMappingOptions).toArray()
+                :null;
         return DynamicParameterList.builder()
                 .addIfNotEmpty("a_paths", options.pathList.toArray(), CustomTypes.UT_VARCHAR2_LIST, oracleConnection)
                 .addIfNotEmpty("a_reporters", options.reporterList.toArray(), CustomTypes.UT_REPORTERS, oracleConnection)
                 .addIfNotEmpty("a_color_console", options.colorConsole)
                 .addIfNotEmpty("a_coverage_schemes", options.coverageSchemes.toArray(), CustomTypes.UT_VARCHAR2_LIST, oracleConnection)
+                .addIfNotEmpty("a_source_file_mappings", sourceMappings, CustomTypes.UT_FILE_MAPPINGS, oracleConnection)
                 .build();
     }
 
diff --git a/src/test/java/org/utplsql/api/testRunner/DynamicTestRunnerStatementTest.java b/src/test/java/org/utplsql/api/testRunner/DynamicTestRunnerStatementTest.java
@@ -3,26 +3,48 @@
 import oracle.jdbc.OracleConnection;
 import org.junit.jupiter.api.Test;
 import org.utplsql.api.CustomTypes;
+import org.utplsql.api.FileMapping;
 import org.utplsql.api.TestRunnerOptions;
 import org.utplsql.api.Version;
 
+import java.sql.Array;
 import java.sql.CallableStatement;
 import java.sql.SQLException;
+import java.util.List;
 import java.util.concurrent.Callable;
 
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.*;
 
 public class DynamicTestRunnerStatementTest {
 
     @Test
     void explore() throws SQLException {
+        // Expectation objects
+        Object[] expectedSourceFileMapping = new Object[]{new FileMapping("source", "owner", "source", "PACKAGE")};
+        Object[] expectedTestFileMapping = new Object[]{new FileMapping("test", "owner", "test", "PACKAGE")};
 
+        // Mock some internals. This is not pretty, but a first step
         OracleConnection oracleConnection = mock(OracleConnection.class);
+        when(oracleConnection.unwrap(OracleConnection.class))
+                .thenReturn(oracleConnection);
         CallableStatement callableStatement = mock(CallableStatement.class);
 
+        // FileMapper mocks
+        CallableStatement fileMapperStatement = mock(CallableStatement.class);
+        when(
+                oracleConnection.prepareCall(argThat(
+                        a -> a.startsWith("BEGIN ? := ut_file_mapper.build_file_mappings("))
+                ))
+                .thenReturn(fileMapperStatement);
+        Array fileMapperArray = mock(Array.class);
+        when(fileMapperStatement.getArray(1))
+                .thenReturn(fileMapperArray);
+        when(fileMapperArray.getArray())
+                .thenReturn(expectedSourceFileMapping);
+
+        // Act
         TestRunnerOptions options = TestRunnerStatementProviderIT.getCompletelyFilledOptions();
 
         DynamicTestRunnerStatement testRunnerStatement = DynamicTestRunnerStatement
@@ -61,6 +83,10 @@ void explore() throws SQLException {
         verify(callableStatement).setArray(4, null);
         verify(oracleConnection).createOracleArray(CustomTypes.UT_VARCHAR2_LIST, options.coverageSchemes.toArray());
 
+        assertThat(testRunnerStatement.getSql(), containsString("a_source_file_mappings => ?"));
+        verify(callableStatement).setArray(5, null);
+        verify(oracleConnection).createOracleArray(CustomTypes.UT_FILE_MAPPINGS, expectedSourceFileMapping);
+
 
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -210,7 +210,8 @@ public void setParam(CallableStatement statement, int index) throws SQLException`
`210`	`210`	`statement.setNull(index, Types.ARRAY, customTypeName);`
`211`	`211`	`} else {`
`212`	`212`	`statement.setArray(`
`213`		`- index, oraConnection.createOracleArray(customTypeName, value)`
	`213`	`+ index,`
	`214`	`+ oraConnection.createOracleArray(customTypeName, value)`
`214`	`215`	`);`
`215`	`216`	`}`
`216`	`217`	`}`