client: Update XpTracker test

This commit is contained in:
Owain van Brakel
2019-08-18 01:58:36 +02:00
parent a868adfc6c
commit 78a3875ac5
2 changed files with 6 additions and 7 deletions

View File

@@ -202,7 +202,7 @@ public class XpTrackerPlugin extends Plugin
eventBus.subscribe(MenuOptionClicked.class, this, this::onMenuOptionClicked); eventBus.subscribe(MenuOptionClicked.class, this, this::onMenuOptionClicked);
} }
private void onGameStateChanged(GameStateChanged event) void onGameStateChanged(GameStateChanged event)
{ {
GameState state = event.getGameState(); GameState state = event.getGameState();
if (state == GameState.LOGGED_IN) 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 Skill skill = event.getSkill();
final int currentXp = client.getSkillExperience(skill); final int currentXp = client.getSkillExperience(skill);
@@ -418,7 +418,7 @@ public class XpTrackerPlugin extends Plugin
xpPanel.updateTotal(xpState.getTotalSnapshot()); xpPanel.updateTotal(xpState.getTotalSnapshot());
} }
private void onGameTick(GameTick event) void onGameTick(GameTick event)
{ {
if (initializeTracker) if (initializeTracker)
{ {

View File

@@ -48,7 +48,7 @@ import org.junit.runner.RunWith;
import org.mockito.Mock; import org.mockito.Mock;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
import org.mockito.runners.MockitoJUnitRunner; import org.mockito.junit.MockitoJUnitRunner;
@RunWith(MockitoJUnitRunner.class) @RunWith(MockitoJUnitRunner.class)
public class XpTrackerPluginTest public class XpTrackerPluginTest
@@ -85,7 +85,6 @@ public class XpTrackerPluginTest
{ {
Guice.createInjector(BoundFieldModule.of(this)).injectMembers(this); Guice.createInjector(BoundFieldModule.of(this)).injectMembers(this);
when(client.getWorldType()).thenReturn(EnumSet.of(WorldType.MEMBERS));
when(client.getLocalPlayer()).thenReturn(mock(Player.class)); when(client.getLocalPlayer()).thenReturn(mock(Player.class));
xpTrackerPlugin.setXpPanel(mock(XpPanel.class)); xpTrackerPlugin.setXpPanel(mock(XpPanel.class));
@@ -101,7 +100,7 @@ public class XpTrackerPluginTest
xpTrackerPlugin.onGameStateChanged(gameStateChanged); xpTrackerPlugin.onGameStateChanged(gameStateChanged);
when(client.getSkillExperience(Skill.ATTACK)).thenReturn(42); when(client.getSkillExperience(Skill.ATTACK)).thenReturn(42);
// Initialize tracker // Initialize tracker
xpTrackerPlugin.onGameTick(new GameTick()); xpTrackerPlugin.onGameTick(GameTick.INSTANCE);
// Gain attack xp // Gain attack xp
when(client.getSkillExperience(Skill.ATTACK)).thenReturn(100); when(client.getSkillExperience(Skill.ATTACK)).thenReturn(100);
@@ -114,7 +113,7 @@ public class XpTrackerPluginTest
// Flag initialization of tracker // Flag initialization of tracker
xpTrackerPlugin.onGameStateChanged(gameStateChanged); xpTrackerPlugin.onGameStateChanged(gameStateChanged);
// Initialize tracker // 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 // Start at 42 xp, gain of 58 xp, offline gain of 41900 xp - offset start XP: 42 + 41900
XpStateSingle skillState = xpTrackerPlugin.getSkillState(Skill.ATTACK); XpStateSingle skillState = xpTrackerPlugin.getSkillState(Skill.ATTACK);