From f88fcd0bd5c3bce43c5227e7ea8e7aec1f968473 Mon Sep 17 00:00:00 2001 From: RatzzFatzz Date: Tue, 16 Dec 2025 16:35:02 +0100 Subject: [PATCH] Fix tests for windows build --- .../model/InputConfig.java | 4 ---- .../util/SetUtils.java | 13 ------------ .../ValidationExecutionStrategyTest.java | 6 +++--- .../util/SetUtilsTest.java | 20 ------------------- 4 files changed, 3 insertions(+), 40 deletions(-) delete mode 100644 src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/SetUtils.java delete mode 100644 src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/SetUtilsTest.java diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/InputConfig.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/InputConfig.java index afa4ef4..44dd923 100644 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/InputConfig.java +++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/InputConfig.java @@ -85,10 +85,6 @@ public class InputConfig implements CommandLine.IVersionProvider { System.setProperty("DEFAULT_MKV_TOOL_NIX", SystemUtils.IS_OS_WINDOWS ? "C:\\Program Files\\MKVToolNix" : "/usr/bin/"); } - public String getNormalizedLibraryPath() { - return this.getLibraryPath().getAbsolutePath().replace("\\", "/"); - } - @Override public String toString() { return new StringJoiner(", ", InputConfig.class.getSimpleName() + "[", "]") diff --git a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/SetUtils.java b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/SetUtils.java deleted file mode 100644 index f2db625..0000000 --- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/SetUtils.java +++ /dev/null @@ -1,13 +0,0 @@ -package at.pcgamingfreaks.mkvaudiosubtitlechanger.util; - -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -public class SetUtils { - public static Set retainOf(List list1, List list2) { - Set set = new HashSet<>(list1); - set.retainAll(list2); - return set; - } -} diff --git a/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/validation/ValidationExecutionStrategyTest.java b/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/validation/ValidationExecutionStrategyTest.java index 2582aa8..571b3d4 100644 --- a/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/validation/ValidationExecutionStrategyTest.java +++ b/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/validation/ValidationExecutionStrategyTest.java @@ -24,8 +24,8 @@ class ValidationExecutionStrategyTest { .setExecutionStrategy(new ValidationExecutionStrategy()) .parseArgs("-a", "ger:ger", "-l", TEST_FILE, "-m", TEST_MKVTOOLNIX_DIR); - assertEquals(TEST_FILE, underTest.getConfig().getLibraryPath().getPath()); - assertEquals(TEST_MKVTOOLNIX_DIR, underTest.getConfig().getMkvToolNix().getPath()); + assertEquals(TEST_FILE, underTest.getConfig().getLibraryPath().getPath().replace("\\", "/")); + assertEquals(TEST_MKVTOOLNIX_DIR, underTest.getConfig().getMkvToolNix().getPath().replace("\\", "/")); } private static Stream validateFailure() { @@ -56,6 +56,6 @@ class ValidationExecutionStrategyTest { .execute(args); printWriter.flush(); - assertEquals(expectedMessage, writer.toString().split("\n")[0]); + assertEquals(expectedMessage, writer.toString().split("[\r\n]")[0]); } } \ No newline at end of file diff --git a/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/SetUtilsTest.java b/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/SetUtilsTest.java deleted file mode 100644 index a8c18c3..0000000 --- a/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/SetUtilsTest.java +++ /dev/null @@ -1,20 +0,0 @@ -package at.pcgamingfreaks.mkvaudiosubtitlechanger.util; - -import org.junit.jupiter.api.Test; - -import java.util.List; -import java.util.Set; - -import static org.junit.jupiter.api.Assertions.*; - -class SetUtilsTest { - - @Test - void retainOf() { - List list1 = List.of(1, 2, 3, 4, 5); - List list2 = List.of(2, 4, 6, 8, 10); - Set expected = Set.of(2, 4); - - assertEquals(expected, SetUtils.retainOf(list1, list2)); - } -} \ No newline at end of file