From 78a3875ac546f696006ef891539d43261fa56dda Mon Sep 17 00:00:00 2001 From: Owain van Brakel Date: Sun, 18 Aug 2019 01:58:36 +0200 Subject: [PATCH] client: Update XpTracker test --- .../runelite/client/plugins/xptracker/XpTrackerPlugin.java | 6 +++--- .../client/plugins/xptracker/XpTrackerPluginTest.java | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java index 1c5a8ef086..ae3324a75c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java @@ -202,7 +202,7 @@ public class XpTrackerPlugin extends Plugin eventBus.subscribe(MenuOptionClicked.class, this, this::onMenuOptionClicked); } - private void onGameStateChanged(GameStateChanged event) + void onGameStateChanged(GameStateChanged event) { GameState state = event.getGameState(); if (state == GameState.LOGGED_IN) @@ -360,7 +360,7 @@ public class XpTrackerPlugin extends Plugin } } - private void onExperienceChanged(ExperienceChanged event) + void onExperienceChanged(ExperienceChanged event) { final Skill skill = event.getSkill(); final int currentXp = client.getSkillExperience(skill); @@ -418,7 +418,7 @@ public class XpTrackerPlugin extends Plugin xpPanel.updateTotal(xpState.getTotalSnapshot()); } - private void onGameTick(GameTick event) + void onGameTick(GameTick event) { if (initializeTracker) { diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/xptracker/XpTrackerPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/xptracker/XpTrackerPluginTest.java index 372b51d9ed..8f65e81cbf 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/xptracker/XpTrackerPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/xptracker/XpTrackerPluginTest.java @@ -48,7 +48,7 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) public class XpTrackerPluginTest @@ -85,7 +85,6 @@ public class XpTrackerPluginTest { Guice.createInjector(BoundFieldModule.of(this)).injectMembers(this); - when(client.getWorldType()).thenReturn(EnumSet.of(WorldType.MEMBERS)); when(client.getLocalPlayer()).thenReturn(mock(Player.class)); xpTrackerPlugin.setXpPanel(mock(XpPanel.class)); @@ -101,7 +100,7 @@ public class XpTrackerPluginTest xpTrackerPlugin.onGameStateChanged(gameStateChanged); when(client.getSkillExperience(Skill.ATTACK)).thenReturn(42); // Initialize tracker - xpTrackerPlugin.onGameTick(new GameTick()); + xpTrackerPlugin.onGameTick(GameTick.INSTANCE); // Gain attack xp when(client.getSkillExperience(Skill.ATTACK)).thenReturn(100); @@ -114,7 +113,7 @@ public class XpTrackerPluginTest // Flag initialization of tracker xpTrackerPlugin.onGameStateChanged(gameStateChanged); // Initialize tracker - xpTrackerPlugin.onGameTick(new GameTick()); + xpTrackerPlugin.onGameTick(GameTick.INSTANCE); // Start at 42 xp, gain of 58 xp, offline gain of 41900 xp - offset start XP: 42 + 41900 XpStateSingle skillState = xpTrackerPlugin.getSkillState(Skill.ATTACK);