Fix tests

This commit is contained in:
Owain van Brakel
2019-07-14 13:47:26 +02:00
parent 8b647041f4
commit 19865173d8
17 changed files with 30 additions and 34 deletions

View File

@@ -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"))
{

View File

@@ -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())
{

View File

@@ -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

View File

@@ -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;

View File

@@ -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)
{

View File

@@ -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)
{

View File

@@ -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())

View File

@@ -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();

View File

@@ -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);

View File

@@ -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();

View File

@@ -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();

View File

@@ -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)
{

View File

@@ -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)
{

View File

@@ -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)
{

View File

@@ -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"))
{

View File

@@ -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)

View File

@@ -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)