Fix arity for mapping options and prevent NPE

pesse · pesse · commit b88d5c5a0785 · 2019-06-13T10:48:21.000+02:00
diff --git a/src/main/java/org/utplsql/cli/RunPicocliCommand.java b/src/main/java/org/utplsql/cli/RunPicocliCommand.java
@@ -108,6 +108,12 @@ static class Format {
 
     static class FileMappingComposite {
 
+        @ArgGroup(exclusive = true, multiplicity = "1")
+        TestOrSourcePath testOrSourcePath;
+
+        @ArgGroup(exclusive = false, multiplicity = "0..1")
+        FileMapping mapping;
+
         static class TestOrSourcePath {
             @Option(names="-source_path", required = true)
             String sourcePath;
@@ -138,14 +144,10 @@ static class FileMapping {
             Integer nameSubExpression;
         }
 
-        @ArgGroup(exclusive = true, multiplicity = "1")
-        TestOrSourcePath testOrSourcePath;
-
-        @ArgGroup(exclusive = false, multiplicity = "1")
-        FileMapping mapping;
-
-
         FileMapperConfig toFileMapperConfig() {
+            if ( mapping == null )
+                mapping = new FileMapping();
+
             Map<String, String> typeMap = new HashMap<>();
 
             if ( mapping.typeMapping != null && !mapping.typeMapping.isEmpty()) {
diff --git a/src/test/java/org/utplsql/cli/PicocliRunCommandTest.java b/src/test/java/org/utplsql/cli/PicocliRunCommandTest.java
@@ -1,5 +1,6 @@
 package org.utplsql.cli;
 
+import org.hamcrest.Matchers;
 import org.junit.jupiter.api.Test;
 import org.utplsql.cli.config.FileMapperConfig;
 import org.utplsql.cli.config.ReporterConfig;
@@ -192,6 +193,7 @@ void sourceFileMapping() throws Exception {
         assertEquals( 1, sourceMapperConfig.getTypeSubexpression());
         assertEquals( 3, sourceMapperConfig.getNameSubexpression());
     }
+
     @Test
     void testFileMapping() throws Exception {
         RunCommandConfig config = parseForConfig("run",
@@ -214,4 +216,20 @@ void testFileMapping() throws Exception {
         assertEquals( 5, testMapperConfig.getTypeSubexpression());
         assertEquals( 6, testMapperConfig.getNameSubexpression());
     }
+
+    @Test
+    void testFileMappingWithoutDetails() throws Exception {
+        RunCommandConfig config = parseForConfig("run",
+                TestHelper.getConnectionString(),
+                "-test_path=src/test/resources/plsql/test");
+
+        FileMapperConfig testMapperConfig = config.getTestMapping();
+        assertEquals( "src/test/resources/plsql/test", testMapperConfig.getPath());
+        assertNull( testMapperConfig.getOwner());
+        assertNull( testMapperConfig.getRegexExpression());
+        assertThat( testMapperConfig.getTypeMapping(), anEmptyMap());
+        assertNull( testMapperConfig.getOwnerSubexpression());
+        assertNull( testMapperConfig.getTypeSubexpression());
+        assertNull( testMapperConfig.getNameSubexpression());
+    }
 }
