Migrate ThreeWeirdos to DungeonPuzzle and highlight chest (#705)

2 files changed, 10 insertions, 10 deletions

diff --git a/src/test/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/ThreeWeirdosTest.java b/src/test/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/ThreeWeirdosTest.java
index 38e795c3..5d1b2e66 100644
--- a/src/test/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/ThreeWeirdosTest.java
+++ b/src/test/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/ThreeWeirdosTest.java
@@ -3,17 +3,14 @@ package de.hysky.skyblocker.skyblock.dungeon.puzzle;
 import de.hysky.skyblocker.utils.chat.ChatPatternListenerTest;
 import org.junit.jupiter.api.Test;
 
-class ThreeWeirdosTest extends ChatPatternListenerTest<ThreeWeirdos> {
-    public ThreeWeirdosTest() {
-        super(new ThreeWeirdos());
-    }
-
+class ThreeWeirdosTest {
     @Test
-    void test1() {
-        assertGroup("[NPC] Baxter: My chest doesn't have the reward. We are all telling the truth.", 1, "Baxter");
+    void testBaxter() {
+        ChatPatternListenerTest.assertGroup(ThreeWeirdos.PATTERN.matcher("[NPC] Baxter: My chest doesn't have the reward. We are all telling the truth."), 1, "Baxter");
     }
+
     @Test
-    void test2() {
-        assertGroup("[NPC] Hope: The reward isn't in any of our chests.", 1, "Hope");
+    void testHope() {
+        ChatPatternListenerTest.assertGroup(ThreeWeirdos.PATTERN.matcher("[NPC] Hope: The reward isn't in any of our chests."), 1, "Hope");
     }
 }
\ No newline at end of file
diff --git a/src/test/java/de/hysky/skyblocker/utils/chat/ChatPatternListenerTest.java b/src/test/java/de/hysky/skyblocker/utils/chat/ChatPatternListenerTest.java
index 8b670cbb..1caff40c 100644
--- a/src/test/java/de/hysky/skyblocker/utils/chat/ChatPatternListenerTest.java
+++ b/src/test/java/de/hysky/skyblocker/utils/chat/ChatPatternListenerTest.java
@@ -21,7 +21,10 @@ public abstract class ChatPatternListenerTest<T extends ChatPatternListener> {
     }
 
     protected void assertGroup(String message, int group, String expect) {
-        Matcher matcher = matcher(message);
+        assertGroup(matcher(message), group, expect);
+    }
+
+    public static void assertGroup(Matcher matcher, int group, String expect) {
         assertTrue(matcher.matches());
         assertEquals(expect, matcher.group(group));
     }