diff --git a/pom.xml b/pom.xml index a43200b..c18c910 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ at.pcgamingfreaks.mkvaudiosubtitlechanger.Main - 1.18.30 + 1.18.36 @@ -273,45 +273,50 @@ + com.intellij forms_rt 7.0.3 + org.projectlombok lombok ${lombok-version} provided + info.picocli picocli - 4.7.5 + 4.7.6 + org.hibernate.validator hibernate-validator - 8.0.1.Final + 8.0.2.Final - - org.glassfish - jakarta.el - 5.0.0-M1 - - - + jakarta.el jakarta.el-api 5.0.1 + + org.glassfish + jakarta.el + 5.0.0-M1 + + + jakarta.validation jakarta.validation-api @@ -319,74 +324,88 @@ + org.apache.logging.log4j log4j-api - 2.22.0 + 2.24.3 + org.apache.logging.log4j log4j-core - 2.22.0 + 2.24.3 + org.apache.logging.log4j - log4j-slf4j-impl - 2.22.0 + log4j-slf4j2-impl + 2.24.3 + + com.fasterxml.jackson.dataformat jackson-dataformat-yaml - 2.16.0 + 2.18.2 + + com.fasterxml.jackson.core jackson-databind - 2.16.0 + 2.18.2 + commons-cli commons-cli - 1.6.0 + 1.9.0 + org.apache.commons commons-lang3 - 3.13.0 + 3.17.0 + me.tongfei progressbar - 0.10.0 + 0.10.1 + org.junit.jupiter junit-jupiter-api - 5.10.1 + 5.11.4 test + org.junit.jupiter junit-jupiter-engine - 5.10.1 + 5.11.4 test - + org.mockito - mockito-all - 2.0.2-beta + mockito-core + 5.15.2 test + org.junit.jupiter junit-jupiter-params - 5.10.1 + 5.11.4 test + at.pcgamingfreaks @@ -397,7 +416,7 @@ net.harawata appdirs - 1.2.2 + 1.3.0 diff --git a/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/AttributeConfigTest.java b/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/AttributeConfigTest.java index c9eacb6..5c31c2f 100644 --- a/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/AttributeConfigTest.java +++ b/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/AttributeConfigTest.java @@ -2,13 +2,7 @@ package at.pcgamingfreaks.mkvaudiosubtitlechanger.config; import at.pcgamingfreaks.mkvaudiosubtitlechanger.Main; import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.AttributeConfig; -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.api.BeforeEach; + import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; @@ -19,8 +13,6 @@ import java.util.ArrayList; import java.util.List; import java.util.stream.Stream; -import static at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty.*; -import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.CommandLineOptionsUtil.optionOf; import static org.junit.jupiter.api.Assertions.*; class AttributeConfigTest { diff --git a/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/BooleanConfigParameterTest.java b/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/BooleanConfigParameterTest.java index 8b22f21..8bf61c9 100644 --- a/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/BooleanConfigParameterTest.java +++ b/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/BooleanConfigParameterTest.java @@ -1,10 +1,6 @@ package at.pcgamingfreaks.mkvaudiosubtitlechanger.config; import at.pcgamingfreaks.mkvaudiosubtitlechanger.Main; -import org.apache.commons.cli.CommandLineParser; -import org.apache.commons.cli.DefaultParser; -import org.apache.commons.cli.Options; -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; @@ -13,11 +9,8 @@ import picocli.CommandLine; import java.util.function.Function; import java.util.stream.Stream; -import static at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty.*; -import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.CommandLineOptionsUtil.optionOf; import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.TestUtil.args; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertIterableEquals; class BooleanConfigParameterTest { diff --git a/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/IntegerConfigParameterTest.java b/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/IntegerConfigParameterTest.java index 67a71ad..44b22eb 100644 --- a/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/IntegerConfigParameterTest.java +++ b/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/IntegerConfigParameterTest.java @@ -1,28 +1,18 @@ package at.pcgamingfreaks.mkvaudiosubtitlechanger.config; import at.pcgamingfreaks.mkvaudiosubtitlechanger.Main; -import org.apache.commons.cli.CommandLineParser; -import org.apache.commons.cli.DefaultParser; -import org.apache.commons.cli.Options; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import picocli.CommandLine; -import java.io.ByteArrayOutputStream; -import java.io.PrintStream; import java.io.PrintWriter; import java.io.StringWriter; import java.util.function.Function; import java.util.stream.Stream; -import static at.pcgamingfreaks.mkvaudiosubtitlechanger.config.ValidationResult.*; -import static at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty.THREADS; -import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.CommandLineOptionsUtil.optionOf; import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.TestUtil.args; -import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.TestUtil.argumentsOf; import static org.junit.jupiter.api.Assertions.*; class IntegerConfigParameterTest { diff --git a/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/PatternConfigParameterTest.java b/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/PatternConfigParameterTest.java index ec010c1..739f4d6 100644 --- a/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/PatternConfigParameterTest.java +++ b/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/PatternConfigParameterTest.java @@ -1,10 +1,6 @@ package at.pcgamingfreaks.mkvaudiosubtitlechanger.config; import at.pcgamingfreaks.mkvaudiosubtitlechanger.Main; -import org.apache.commons.cli.CommandLineParser; -import org.apache.commons.cli.DefaultParser; -import org.apache.commons.cli.Options; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; @@ -15,11 +11,9 @@ import java.util.function.Function; import java.util.regex.Pattern; import java.util.stream.Stream; -import static at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty.INCLUDE_PATTERN; -import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.CommandLineOptionsUtil.optionOf; import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.TestUtil.args; -import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.TestUtil.argumentsOf; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; class PatternConfigParameterTest { diff --git a/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/SetConfigParameterTest.java b/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/SetConfigParameterTest.java index b12c0a0..62988f7 100644 --- a/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/SetConfigParameterTest.java +++ b/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/SetConfigParameterTest.java @@ -11,9 +11,7 @@ import java.util.Set; import java.util.function.Function; import java.util.stream.Stream; -import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.CommandLineOptionsUtil.optionOf; import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.TestUtil.args; -import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.TestUtil.argumentsOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows;