ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into hi-phil-swift-here-for-flex-tape-the-super-strong-waterproof-tape

Browse Source
This commit is contained in:
ThatGamerBlue
2021-03-10 16:32:29 +00:00
parent a02ace2619 36ec314ab7
commit 74028f9690
22 changed files with 313 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
runelite-client/src/test/java/net/runelite/client/plugins/chatcommands/ChatCommandsPluginTest.java
View File

@@ -49,6 +49,7 @@ import net.runelite.client.chat.ChatCommandManager;
import net.runelite.client.chat.ChatMessageManager;
import net.runelite.client.config.ChatColorConfig;
import net.runelite.client.config.ConfigManager;
import net.runelite.client.config.RuneLiteConfig;
import net.runelite.http.api.chat.ChatClient;
import net.runelite.http.api.hiscore.HiscoreClient;
import net.runelite.http.api.hiscore.HiscoreSkill;
@@ -106,6 +107,10 @@ public class ChatCommandsPluginTest
@Bind
ChatClient chatClient;
@Mock
@Bind
RuneLiteConfig runeLiteConfig;
@Mock
@Bind
ChatCommandsConfig chatCommandsConfig;

5
runelite-client/src/test/java/net/runelite/client/plugins/grandexchange/GrandExchangePluginTest.java
View File

@@ -32,7 +32,6 @@ import java.util.EnumSet;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ScheduledExecutorService;
import javax.inject.Inject;
import net.runelite.api.Client;
import net.runelite.api.GameState;
@@ -109,10 +108,6 @@ public class GrandExchangePluginTest
@Bind
private MouseManager mouseManager;
@Mock
@Bind
private ScheduledExecutorService scheduledExecutorService;
@Mock
@Bind
private GrandExchangeClient grandExchangeClient;

180
runelite-client/src/test/java/net/runelite/client/plugins/opponentinfo/OpponentInfoPluginTest.java Normal file
View File

@@ -0,0 +1,180 @@
/*
* Copyright (c) 2021, Jordan Atwood <jordan.atwood423@gmail.com>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package net.runelite.client.plugins.opponentinfo;
import com.google.inject.Guice;
import com.google.inject.Inject;
import com.google.inject.testing.fieldbinder.Bind;
import com.google.inject.testing.fieldbinder.BoundFieldModule;
import net.runelite.api.Actor;
import net.runelite.api.Client;
import net.runelite.api.events.InteractingChanged;
import net.runelite.api.NPC;
import net.runelite.api.Player;
import net.runelite.client.ui.overlay.OverlayManager;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import org.junit.Before;
import org.junit.runner.RunWith;
import org.junit.Test;
import org.mockito.junit.MockitoJUnitRunner;
import org.mockito.Mock;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.class)
public class OpponentInfoPluginTest
{
@Mock
@Bind
Client client;
@Mock
@Bind
OverlayManager overlayManager;
@Mock
@Bind
OpponentInfoConfig config;
@Mock
@Bind
OpponentInfoOverlay opponentInfoOverlay;
@Mock
@Bind
PlayerComparisonOverlay playerComparisonOverlay;
@Inject
OpponentInfoPlugin plugin;
private final Player localPlayer = mock(Player.class);
@Before
public void before()
{
Guice.createInjector(BoundFieldModule.of(this)).injectMembers(this);
when(client.getLocalPlayer()).thenReturn(localPlayer);
}
@Test
public void testNpcInteractions()
{
final NPC npc = mock(NPC.class);
interactingChanged(npc, localPlayer);
assertNull(plugin.getLastOpponent());
assertNull(plugin.getLastTime());
interactingChanged(npc, null);
assertNull(plugin.getLastOpponent());
assertNull(plugin.getLastTime());
interactingChanged(localPlayer, npc);
assertSame(npc, plugin.getLastOpponent());
assertNull(plugin.getLastTime());
interactingChanged(npc, localPlayer);
assertSame(npc, plugin.getLastOpponent());
assertNull(plugin.getLastTime());
interactingChanged(localPlayer, null);
// last opponent is remembered for 5 seconds
assertSame(npc, plugin.getLastOpponent());
assertNotNull(plugin.getLastTime());
}
@Test
public void testOtherPlayerInteractions()
{
final Player otherPlayer = mock(Player.class);
interactingChanged(otherPlayer, localPlayer);
assertNull(plugin.getLastOpponent());
assertNull(plugin.getLastTime());
interactingChanged(otherPlayer, null);
assertNull(plugin.getLastOpponent());
assertNull(plugin.getLastTime());
interactingChanged(localPlayer, otherPlayer);
assertSame(otherPlayer, plugin.getLastOpponent());
assertNull(plugin.getLastTime());
interactingChanged(otherPlayer, localPlayer);
assertSame(otherPlayer, plugin.getLastOpponent());
assertNull(plugin.getLastTime());
interactingChanged(localPlayer, null);
// last opponent is remembered for 5 seconds
assertSame(otherPlayer, plugin.getLastOpponent());
assertNotNull(plugin.getLastTime());
}
@Test
public void testNonLocalPlayerInteractions()
{
final Player otherPlayer = mock(Player.class);
final NPC npc = mock(NPC.class);
interactingChanged(otherPlayer, npc);
assertNull(plugin.getLastOpponent());
assertNull(plugin.getLastTime());
interactingChanged(npc, otherPlayer);
assertNull(plugin.getLastOpponent());
assertNull(plugin.getLastTime());
interactingChanged(otherPlayer, null);
assertNull(plugin.getLastOpponent());
assertNull(plugin.getLastTime());
interactingChanged(npc, null);
assertNull(plugin.getLastOpponent());
assertNull(plugin.getLastTime());
}
private void interactingChanged(final Actor source, final Actor target)
{
when(source.getInteracting()).thenReturn(target);
plugin.onInteractingChanged(new InteractingChanged(source, target));
}
}

2
runelite-client/src/test/java/net/runelite/client/plugins/slayer/SlayerPluginTest.java
View File

@@ -553,6 +553,8 @@ public class SlayerPluginTest
assertEquals("", slayerPlugin.getTaskName());
assertEquals(0, slayerPlugin.getAmount());
verify(configManager).unsetRSProfileConfiguration(SlayerConfig.GROUP_NAME, SlayerConfig.TASK_LOC_KEY);
}
@Test