Fix PatternValidator & Add PatternValidatorTest

src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/validator/PatternValidator.java

@@ -6,6 +6,8 @@ import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
 public class PatternValidator extends ConfigValidator<Pattern> {
+    private static final Pattern EMPTY_PATTERN = Pattern.compile("");
+
     public PatternValidator(ConfigProperty property, boolean required, Pattern defaultValue) {
         super(property, required, defaultValue);
     }
@@ -15,12 +17,12 @@ public class PatternValidator extends ConfigValidator<Pattern> {
         try {
             return Pattern.compile(value);
         } catch (PatternSyntaxException e) {
-            return null;
+            return EMPTY_PATTERN;
         }
     }
 
     @Override
     boolean isValid(Pattern result) {
-        return result != null;
+        return !result.equals(EMPTY_PATTERN);
     }
 }

src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/ConfigProperty.java

@@ -9,7 +9,7 @@ public enum ConfigProperty {
     SAFE_MODE("safe-mode", "s", "Test run (no files will be changes)"),
     WINDOWS("windows", null, "Is operating system windows"),
     THREADS("threads", "t", "thread count (default: 2)"),
-    INCLUDE_PATTERN("include-pattern", "i", "Include files matching pattern"),
+    INCLUDE_PATTERN("include-pattern", "p", "Include files matching pattern"),
     MKV_TOOL_NIX("mkvtoolnix", "m", "Path to mkv tool nix installation"),
     FORCED_KEYWORDS("forcedKeywords", "fk", "Additional keywords to identify forced tracks"),
     COMMENTARY_KEYWORDS("commentary-keywords", "ck", "Additional keywords to identify commentary tracks"),

src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/validator/BooleanValidatorTest.java

@@ -29,7 +29,7 @@ class BooleanValidatorTest {
     static void before() {
         parser = new DefaultParser();
         options = new Options();
-        options.addOption(optionOf(SAFE_MODE, "s", false));
+        options.addOption(optionOf(SAFE_MODE, SAFE_MODE.abrv(), false));
     }
 
     private static Stream<Arguments> provideTestCases() {

src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/validator/MkvToolNixPathValidatorTest.java

@@ -14,16 +14,13 @@ import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
 import java.io.File;
-import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.stream.Stream;
 
 import static at.pcgamingfreaks.mkvaudiosubtitlechanger.config.ValidationResult.*;
 import static at.pcgamingfreaks.mkvaudiosubtitlechanger.config.ValidationResult.MISSING;
 import static at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty.*;
-import static at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty.WINDOWS;
 import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.CommandLineOptionsUtil.optionOf;
-import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.TestUtil.yamlList;
 import static org.junit.jupiter.api.Assertions.*;
 
 class MkvToolNixPathValidatorTest {
@@ -34,7 +31,7 @@ class MkvToolNixPathValidatorTest {
     static void before() {
         parser = new DefaultParser();
         options = new Options();
-        options.addOption(optionOf(MKV_TOOL_NIX, "m", true));
+        options.addOption(optionOf(MKV_TOOL_NIX, MKV_TOOL_NIX.abrv(), true));
     }
 
     private static Stream<Arguments> provideTestCases() {

src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/validator/PatternValidatorTest.java

@@ -0,0 +1,64 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.config.validator;
+
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.ValidationResult;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty;
+import at.pcgamingfreaks.yaml.YAML;
+import at.pcgamingfreaks.yaml.YamlInvalidContentException;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.regex.Pattern;
+import java.util.stream.Stream;
+
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.config.ValidationResult.*;
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.config.ValidationResult.INVALID;
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty.INCLUDE_PATTERN;
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.CommandLineOptionsUtil.optionOf;
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.TestUtil.argumentsOf;
+import static org.junit.jupiter.api.Assertions.*;
+
+class PatternValidatorTest {
+    private static CommandLineParser parser;
+    private static Options options;
+
+    @BeforeAll
+    static void before() {
+        parser = new DefaultParser();
+        options = new Options();
+        options.addOption(optionOf(INCLUDE_PATTERN, INCLUDE_PATTERN.abrv(), true));
+    }
+
+    private static Stream<Arguments> provideTestCases() {
+        return Stream.of(
+                argumentsOf(INCLUDE_PATTERN, false, null, "include-pattern: \"[abd]?.*\"", new String[]{}, VALID),
+                argumentsOf(INCLUDE_PATTERN, true, null, "", new String[]{"-p", "[abd]?.*"}, VALID),
+
+                argumentsOf(INCLUDE_PATTERN, false, Pattern.compile(".*"), "", new String[]{}, DEFAULT),
+                argumentsOf(INCLUDE_PATTERN, true, Pattern.compile(".*"), "", new String[]{}, DEFAULT),
+
+                argumentsOf(INCLUDE_PATTERN, true, null, "", new String[]{}, MISSING),
+                argumentsOf(INCLUDE_PATTERN, false, null, "", new String[]{}, NOT_PRESENT),
+
+                argumentsOf(INCLUDE_PATTERN, true, null, "", new String[]{"-p", "?."}, INVALID),
+                argumentsOf(INCLUDE_PATTERN, false, null, "include-pattern: \"[arst*\"", new String[]{}, INVALID),
+                argumentsOf(INCLUDE_PATTERN, true, Pattern.compile(".?"), "", new String[]{"-p", "?."}, INVALID)
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("provideTestCases")
+    void validate(ConfigProperty property, boolean required, Pattern defaultValue, String yamlArgs, String[] cmdArgs,
+                  ValidationResult expectedResult) throws ParseException, YamlInvalidContentException {
+        PatternValidator underTest = new PatternValidator(property, required, defaultValue);
+
+        ValidationResult result = underTest.validate(new YAML(yamlArgs), parser.parse(options, cmdArgs));
+
+        assertEquals(expectedResult, result);
+    }
+}