diff options
| author | Fix3dll <serhanduzce@gmail.com> | 2022-03-08 19:20:56 +0300 |
|---|---|---|
| committer | Fix3dll <serhanduzce@gmail.com> | 2022-03-08 19:20:56 +0300 |
| commit | 1ff679176faadb95da2c90e7b87b0c2b369bae87 (patch) | |
| tree | be89495260919b89544ddbb1af68d16ec609c699 /src/test/java/me/xmrvizzy/skyblocker/skyblock | |
| parent | 9c67b6d30f14c852937387a5c727d2aff3cedbe8 (diff) | |
| parent | b380c52524bbdb7ea01fe42d5bab95f22e39a5a1 (diff) | |
| download | Skyblocker-1ff679176faadb95da2c90e7b87b0c2b369bae87.tar.gz Skyblocker-1ff679176faadb95da2c90e7b87b0c2b369bae87.tar.bz2 Skyblocker-1ff679176faadb95da2c90e7b87b0c2b369bae87.zip | |
Merge remote-tracking branch 'upstream/master'
# Conflicts:
# src/main/java/me/xmrvizzy/skyblocker/chat/ChatParser.java
# src/main/java/me/xmrvizzy/skyblocker/chat/filters/AoteFilter.java
# src/main/java/me/xmrvizzy/skyblocker/chat/filters/HealFilter.java
# src/main/java/me/xmrvizzy/skyblocker/chat/filters/ImplosionFilter.java
# src/main/java/me/xmrvizzy/skyblocker/chat/filters/MoltenWaveFilter.java
# src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
# src/test/java/me/xmrvizzy/skyblocker/chat/filters/AdFilterTest.java
Diffstat (limited to 'src/test/java/me/xmrvizzy/skyblocker/skyblock')
4 files changed, 8 insertions, 10 deletions
diff --git a/src/test/java/me/xmrvizzy/skyblocker/skyblock/dungeon/ThreeWeirdosTest.java b/src/test/java/me/xmrvizzy/skyblocker/skyblock/dungeon/ThreeWeirdosTest.java index 18c638c7..555753b6 100644 --- a/src/test/java/me/xmrvizzy/skyblocker/skyblock/dungeon/ThreeWeirdosTest.java +++ b/src/test/java/me/xmrvizzy/skyblocker/skyblock/dungeon/ThreeWeirdosTest.java @@ -1,9 +1,9 @@ package me.xmrvizzy.skyblocker.skyblock.dungeon; -import me.xmrvizzy.skyblocker.chat.ChatListenerTest; +import me.xmrvizzy.skyblocker.chat.ChatPatternListenerTest; import org.junit.jupiter.api.Test; -class ThreeWeirdosTest extends ChatListenerTest<ThreeWeirdos> { +class ThreeWeirdosTest extends ChatPatternListenerTest<ThreeWeirdos> { public ThreeWeirdosTest() { super(new ThreeWeirdos()); } diff --git a/src/test/java/me/xmrvizzy/skyblocker/skyblock/dungeon/TriviaTest.java b/src/test/java/me/xmrvizzy/skyblocker/skyblock/dungeon/TriviaTest.java index 6f7950e3..37f077fb 100644 --- a/src/test/java/me/xmrvizzy/skyblocker/skyblock/dungeon/TriviaTest.java +++ b/src/test/java/me/xmrvizzy/skyblocker/skyblock/dungeon/TriviaTest.java @@ -1,9 +1,9 @@ package me.xmrvizzy.skyblocker.skyblock.dungeon; -import me.xmrvizzy.skyblocker.chat.ChatListenerTest; +import me.xmrvizzy.skyblocker.chat.ChatPatternListenerTest; import org.junit.jupiter.api.Test; -class TriviaTest extends ChatListenerTest<Trivia> { +class TriviaTest extends ChatPatternListenerTest<Trivia> { public TriviaTest() { super(new Trivia()); } diff --git a/src/test/java/me/xmrvizzy/skyblocker/skyblock/dwarven/FetchurTest.java b/src/test/java/me/xmrvizzy/skyblocker/skyblock/dwarven/FetchurTest.java index 35b8ab58..f8e0af18 100644 --- a/src/test/java/me/xmrvizzy/skyblocker/skyblock/dwarven/FetchurTest.java +++ b/src/test/java/me/xmrvizzy/skyblocker/skyblock/dwarven/FetchurTest.java @@ -1,11 +1,9 @@ package me.xmrvizzy.skyblocker.skyblock.dwarven; -import me.xmrvizzy.skyblocker.chat.ChatListenerTest; +import me.xmrvizzy.skyblocker.chat.ChatPatternListenerTest; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; - -class FetchurTest extends ChatListenerTest<Fetchur> { +class FetchurTest extends ChatPatternListenerTest<Fetchur> { public FetchurTest() { super(new Fetchur()); } diff --git a/src/test/java/me/xmrvizzy/skyblocker/skyblock/dwarven/PuzzlerTest.java b/src/test/java/me/xmrvizzy/skyblocker/skyblock/dwarven/PuzzlerTest.java index ab2878ef..e26e306e 100644 --- a/src/test/java/me/xmrvizzy/skyblocker/skyblock/dwarven/PuzzlerTest.java +++ b/src/test/java/me/xmrvizzy/skyblocker/skyblock/dwarven/PuzzlerTest.java @@ -1,9 +1,9 @@ package me.xmrvizzy.skyblocker.skyblock.dwarven; -import me.xmrvizzy.skyblocker.chat.ChatListenerTest; +import me.xmrvizzy.skyblocker.chat.ChatPatternListenerTest; import org.junit.jupiter.api.Test; -class PuzzlerTest extends ChatListenerTest<Puzzler> { +class PuzzlerTest extends ChatPatternListenerTest<Puzzler> { public PuzzlerTest() { super(new Puzzler()); } |