Adding TestFileMappings

pesse · pesse · commit a7b8266a59f3 · 2019-10-21T12:33:21.000+02:00
diff --git a/src/main/java/org/utplsql/api/testRunner/DynamicTestRunnerStatement.java b/src/main/java/org/utplsql/api/testRunner/DynamicTestRunnerStatement.java
@@ -55,12 +55,16 @@ private DynamicParameterList initParameterList() throws SQLException {
         Object[] sourceMappings = (options.sourceMappingOptions!=null)
                 ?FileMapper.buildFileMappingList(oracleConnection, options.sourceMappingOptions).toArray()
                 :null;
+        Object[] testMappings = (options.testMappingOptions!=null)
+                ?FileMapper.buildFileMappingList(oracleConnection, options.testMappingOptions).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)
+                .addIfNotEmpty("a_test_file_mappings", testMappings, 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
@@ -10,8 +10,6 @@
 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;
@@ -22,8 +20,7 @@ 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")};
+        Object[] expectedFileMapping = new Object[]{new FileMapping("someFile", "owner", "object", "PACKAGE")};
 
         // Mock some internals. This is not pretty, but a first step
         OracleConnection oracleConnection = mock(OracleConnection.class);
@@ -42,7 +39,7 @@ void explore() throws SQLException {
         when(fileMapperStatement.getArray(1))
                 .thenReturn(fileMapperArray);
         when(fileMapperArray.getArray())
-                .thenReturn(expectedSourceFileMapping);
+                .thenReturn(expectedFileMapping);
 
         // Act
         TestRunnerOptions options = TestRunnerStatementProviderIT.getCompletelyFilledOptions();
@@ -85,7 +82,10 @@ void explore() throws SQLException {
 
         assertThat(testRunnerStatement.getSql(), containsString("a_source_file_mappings => ?"));
         verify(callableStatement).setArray(5, null);
-        verify(oracleConnection).createOracleArray(CustomTypes.UT_FILE_MAPPINGS, expectedSourceFileMapping);
+
+        assertThat(testRunnerStatement.getSql(), containsString("a_test_file_mappings => ?"));
+        verify(callableStatement).setArray(6, null);
+        verify(oracleConnection, times(2)).createOracleArray(CustomTypes.UT_FILE_MAPPINGS, expectedFileMapping);
 
 
     }
