From 19865173d8593e71bfd3b4e41e20dd1ca3c74bbb Mon Sep 17 00:00:00 2001 From: Owain van Brakel Date: Sun, 14 Jul 2019 13:47:26 +0200 Subject: [PATCH] Fix tests --- .../plugins/attackstyles/AttackStylesPlugin.java | 4 ++-- .../client/plugins/cerberus/CerberusPlugin.java | 2 +- .../plugins/chatcommands/ChatCommandsPlugin.java | 2 +- .../chatnotifications/ChatNotificationsPlugin.java | 2 +- .../runelite/client/plugins/cooking/CookingPlugin.java | 4 ++-- .../runelite/client/plugins/emojis/EmojiPlugin.java | 4 ++-- .../runelite/client/plugins/examine/ExaminePlugin.java | 4 ++-- .../plugins/idlenotifier/IdleNotifierPlugin.java | 10 +++++----- .../client/plugins/itemcharges/ItemChargePlugin.java | 2 +- .../client/plugins/motherlode/MotherlodePlugin.java | 6 +++--- .../client/plugins/screenshot/ScreenshotPlugin.java | 6 +++--- .../runelite/client/plugins/slayer/SlayerPlugin.java | 6 +++--- .../client/plugins/smelting/SmeltingPlugin.java | 2 +- .../runelite/client/plugins/timers/TimersPlugin.java | 2 +- .../client/plugins/timestamp/TimestampPlugin.java | 2 +- .../client/plugins/wintertodt/WintertodtPlugin.java | 2 +- .../net/runelite/client/plugins/PluginManagerTest.java | 4 ---- 17 files changed, 30 insertions(+), 34 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesPlugin.java index 05dc67eab2..66a6b3abd5 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesPlugin.java @@ -220,7 +220,7 @@ public class AttackStylesPlugin extends Plugin } } - private void onVarbitChanged(VarbitChanged event) + void onVarbitChanged(VarbitChanged event) { if (attackStyleVarbit == -1 || attackStyleVarbit != client.getVar(VarPlayer.ATTACK_STYLE)) { @@ -247,7 +247,7 @@ public class AttackStylesPlugin extends Plugin } } - private void onConfigChanged(ConfigChanged event) + void onConfigChanged(ConfigChanged event) { if (event.getGroup().equals("attackIndicator")) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cerberus/CerberusPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/cerberus/CerberusPlugin.java index 8b9f979f1c..073616f72f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cerberus/CerberusPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cerberus/CerberusPlugin.java @@ -106,7 +106,7 @@ public class CerberusPlugin extends Plugin ghosts.remove(event.getNpc()); } - private void onGameTick(GameTick gameTick) + void onGameTick(GameTick gameTick) { if (ghosts.isEmpty()) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java index 841cea3fd1..a17596f99c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java @@ -223,7 +223,7 @@ public class ChatCommandsPlugin extends Plugin return personalBest == null ? 0 : personalBest; } - private void onChatMessage(ChatMessage chatMessage) + void onChatMessage(ChatMessage chatMessage) { if (chatMessage.getType() != ChatMessageType.TRADE && chatMessage.getType() != ChatMessageType.GAMEMESSAGE diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPlugin.java index 0ae10ecabd..178c441245 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPlugin.java @@ -162,7 +162,7 @@ public class ChatNotificationsPlugin extends Plugin } } - private void onChatMessage(ChatMessage chatMessage) + void onChatMessage(ChatMessage chatMessage) { MessageNode messageNode = chatMessage.getMessageNode(); boolean update = false; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingPlugin.java index b6a236888f..6ab9ecf5ee 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingPlugin.java @@ -140,7 +140,7 @@ public class CookingPlugin extends Plugin } } - private void onSpotAnimationChanged(SpotAnimationChanged graphicChanged) + void onSpotAnimationChanged(SpotAnimationChanged graphicChanged) { Player player = client.getLocalPlayer(); @@ -169,7 +169,7 @@ public class CookingPlugin extends Plugin } } - private void onChatMessage(ChatMessage event) + void onChatMessage(ChatMessage event) { if (event.getType() != ChatMessageType.SPAM) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/emojis/EmojiPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/emojis/EmojiPlugin.java index 6f30275145..1124dbb9aa 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/emojis/EmojiPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/emojis/EmojiPlugin.java @@ -89,7 +89,7 @@ public class EmojiPlugin extends Plugin eventBus.subscribe(OverheadTextChanged.class, this, this::onOverheadTextChanged); } - private void onGameStateChanged(GameStateChanged gameStateChanged) + void onGameStateChanged(GameStateChanged gameStateChanged) { if (gameStateChanged.getGameState() == GameState.LOGGED_IN) { @@ -129,7 +129,7 @@ public class EmojiPlugin extends Plugin client.setModIcons(newModIcons); } - private void onChatMessage(ChatMessage chatMessage) + void onChatMessage(ChatMessage chatMessage) { if (client.getGameState() != GameState.LOGGED_IN || modIconsStart == -1) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java index c49a51d568..8583cbe11a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java @@ -123,7 +123,7 @@ public class ExaminePlugin extends Plugin pending.clear(); } - private void onMenuOptionClicked(MenuOptionClicked event) + void onMenuOptionClicked(MenuOptionClicked event) { if (!event.getOption().equals("Examine")) { @@ -180,7 +180,7 @@ public class ExaminePlugin extends Plugin pending.push(pendingExamine); } - private void onChatMessage(ChatMessage event) + void onChatMessage(ChatMessage event) { ExamineType type; switch (event.getType()) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java index 32b36b72e0..57f2bbab2f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java @@ -167,7 +167,7 @@ public class IdleNotifierPlugin extends Plugin return configManager.getConfig(IdleNotifierConfig.class); } - private void onAnimationChanged(AnimationChanged event) + void onAnimationChanged(AnimationChanged event) { if (client.getGameState() != GameState.LOGGED_IN) { @@ -402,7 +402,7 @@ public class IdleNotifierPlugin extends Plugin itemQuantitiesPrevious = itemQuantities; } - private void onInteractingChanged(InteractingChanged event) + void onInteractingChanged(InteractingChanged event) { final Actor source = event.getSource(); if (source != client.getLocalPlayer()) @@ -452,7 +452,7 @@ public class IdleNotifierPlugin extends Plugin } } - private void onGameStateChanged(GameStateChanged gameStateChanged) + void onGameStateChanged(GameStateChanged gameStateChanged) { lastInteracting = null; @@ -484,7 +484,7 @@ public class IdleNotifierPlugin extends Plugin } } - private void onHitsplatApplied(HitsplatApplied event) + void onHitsplatApplied(HitsplatApplied event) { if (event.getActor() != client.getLocalPlayer()) { @@ -515,7 +515,7 @@ public class IdleNotifierPlugin extends Plugin } } - private void onGameTick(GameTick event) + void onGameTick(GameTick event) { skullNotifier(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargePlugin.java index fbdcd0e43a..e217d000ad 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargePlugin.java @@ -312,7 +312,7 @@ public class ItemChargePlugin extends Plugin } } - private void onChatMessage(ChatMessage event) + void onChatMessage(ChatMessage event) { String message = event.getMessage(); Matcher dodgyCheckMatcher = DODGY_CHECK_PATTERN.matcher(message); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodePlugin.java index e7676dec74..880a74c8fe 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodePlugin.java @@ -293,7 +293,7 @@ public class MotherlodePlugin extends Plugin eventBus.subscribe(OverheadTextChanged.class, this, this::onOverheadTextChanged); } - private void onVarbitChanged(VarbitChanged event) + void onVarbitChanged(VarbitChanged event) { if (inMlm) { @@ -621,7 +621,7 @@ public class MotherlodePlugin extends Plugin rocks.remove(gameObject); } - private void onGameStateChanged(GameStateChanged event) + void onGameStateChanged(GameStateChanged event) { if (event.getGameState() == GameState.LOADING) { @@ -638,7 +638,7 @@ public class MotherlodePlugin extends Plugin } } - private void onItemContainerChanged(ItemContainerChanged event) + void onItemContainerChanged(ItemContainerChanged event) { final ItemContainer container = event.getItemContainer(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java index c932e4772b..6e7dce0237 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java @@ -308,7 +308,7 @@ public class ScreenshotPlugin extends Plugin } } - private void onGameTick(GameTick event) + void onGameTick(GameTick event) { if (this.screenshotFriendDeath) { @@ -407,7 +407,7 @@ public class ScreenshotPlugin extends Plugin } } - private void onChatMessage(ChatMessage event) + void onChatMessage(ChatMessage event) { if (event.getType() != ChatMessageType.GAMEMESSAGE && event.getType() != ChatMessageType.SPAM && event.getType() != ChatMessageType.TRADE) { @@ -520,7 +520,7 @@ public class ScreenshotPlugin extends Plugin } } - private void onWidgetLoaded(WidgetLoaded event) + void onWidgetLoaded(WidgetLoaded event) { String fileName; int groupId = event.getGroupId(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java index 1cbfc23116..485ab55986 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java @@ -436,7 +436,7 @@ public class SlayerPlugin extends Plugin } } - private void onVarbitChanged(VarbitChanged event) + void onVarbitChanged(VarbitChanged event) { if (client.getVar(Varbits.SLAYER_REWARD_POINTS) == cachedPoints) { @@ -543,7 +543,7 @@ public class SlayerPlugin extends Plugin private static final int FORCED_WAIT = 2; private int forcedWait = -1; - private void onGameTick(GameTick tick) + void onGameTick(GameTick tick) { loginTick = false; @@ -624,7 +624,7 @@ public class SlayerPlugin extends Plugin } } - private void onChatMessage(ChatMessage event) + void onChatMessage(ChatMessage event) { if (event.getType() != ChatMessageType.GAMEMESSAGE && event.getType() != ChatMessageType.SPAM) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/smelting/SmeltingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/smelting/SmeltingPlugin.java index f76f4df431..a549677479 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/smelting/SmeltingPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/smelting/SmeltingPlugin.java @@ -101,7 +101,7 @@ public class SmeltingPlugin extends Plugin eventBus.subscribe(GameTick.class, this, this::onGameTick); } - private void onChatMessage(ChatMessage event) + void onChatMessage(ChatMessage event) { if (event.getType() != ChatMessageType.SPAM) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java index fe4cddd1e2..6291672cf7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java @@ -483,7 +483,7 @@ public class TimersPlugin extends Plugin } } - private void onChatMessage(ChatMessage event) + void onChatMessage(ChatMessage event) { if (event.getType() != ChatMessageType.SPAM && event.getType() != ChatMessageType.GAMEMESSAGE) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timestamp/TimestampPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/timestamp/TimestampPlugin.java index be05bd32cc..4cd5d88456 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timestamp/TimestampPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timestamp/TimestampPlugin.java @@ -90,7 +90,7 @@ public class TimestampPlugin extends Plugin formatter = null; } - private void onConfigChanged(ConfigChanged event) + void onConfigChanged(ConfigChanged event) { if (event.getGroup().equals("timestamp") && event.getKey().equals("format")) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtPlugin.java index 6bdfe862c7..b3b66ecea7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtPlugin.java @@ -204,7 +204,7 @@ public class WintertodtPlugin extends Plugin checkActionTimeout(); } - private void onVarbitChanged(VarbitChanged varbitChanged) + void onVarbitChanged(VarbitChanged varbitChanged) { int timerValue = client.getVar(Varbits.WINTERTODT_TIMER); if (timerValue != previousTimerValue) diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/PluginManagerTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/PluginManagerTest.java index c0b81a9665..a7ce76d6bb 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/PluginManagerTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/PluginManagerTest.java @@ -129,10 +129,6 @@ public class PluginManagerTest pluginManager.loadCorePlugins(); plugins = pluginManager.getPlugins(); - // Check that the plugins register with the eventbus without errors - EventBus eventBus = new EventBus(); - plugins.forEach(eventBus::register); - expected = pluginClasses.stream() .map(cl -> (PluginDescriptor) cl.getAnnotation(PluginDescriptor.class)) .filter(Objects::nonNull)