Merge remote-tracking branch 'runelite/master' into rl-upstream-16072020

# Conflicts: # cache/src/main/java/net/runelite/cache/util/XteaKeyManager.java # http-api/pom.xml # http-api/src/main/java/net/runelite/http/api/account/AccountClient.java # http-api/src/main/java/net/runelite/http/api/chat/ChatClient.java # http-api/src/main/java/net/runelite/http/api/item/ItemClient.java # http-api/src/main/java/net/runelite/http/api/osbuddy/OSBGrandExchangeClient.java # http-api/src/main/java/net/runelite/http/api/xtea/XteaClient.java # http-service/src/main/java/net/runelite/http/service/hiscore/HiscoreService.java # runelite-api/src/main/java/net/runelite/api/Client.java # runelite-api/src/main/java/net/runelite/api/EnumID.java # runelite-api/src/main/java/net/runelite/api/IndexDataBase.java # runelite-api/src/main/java/net/runelite/api/ItemComposition.java # runelite-api/src/main/java/net/runelite/api/PlayerComposition.java # runelite-api/src/main/java/net/runelite/api/ScriptID.java # runelite-api/src/main/java/net/runelite/api/VarbitComposition.java # runelite-api/src/main/java/net/runelite/api/events/ActorDeath.java # runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java # runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java # runelite-client/src/main/java/net/runelite/client/ClientSessionManager.java # runelite-client/src/main/java/net/runelite/client/RuneLite.java # runelite-client/src/main/java/net/runelite/client/RuneLiteModule.java # runelite-client/src/main/java/net/runelite/client/RuneLiteProperties.java # runelite-client/src/main/java/net/runelite/client/SessionClient.java # runelite-client/src/main/java/net/runelite/client/account/SessionManager.java # runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java # runelite-client/src/main/java/net/runelite/client/externalplugins/ExternalPluginManager.java # runelite-client/src/main/java/net/runelite/client/game/ItemManager.java # runelite-client/src/main/java/net/runelite/client/game/WorldService.java # runelite-client/src/main/java/net/runelite/client/input/KeyListener.java # runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityConfig.java # runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityOverlay.java # runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/agility/Obstacles.java # runelite-client/src/main/java/net/runelite/client/plugins/bank/BankPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java # runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterConfig.java # runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsConfig.java # runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CrypticClue.java # runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/SkillChallengeClue.java # runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListItem.java # runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListPanel.java # runelite-client/src/main/java/net/runelite/client/plugins/devtools/VarInspector.java # runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordGameEventType.java # runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPanel.java # runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeItemPanel.java # runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeOfferSlot.java # runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java # runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeConfig.java # runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesOverlay.java # runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingListener.java # runelite-client/src/main/java/net/runelite/client/plugins/loginscreen/LoginScreenPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerConfig.java # runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsConfig.java # runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/raids/Raid.java # runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidRoom.java # runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsConfig.java # runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/raids/RoomType.java # runelite-client/src/main/java/net/runelite/client/plugins/randomevents/RandomEventConfig.java # runelite-client/src/main/java/net/runelite/client/plugins/randomevents/RandomEventPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiSearchChatboxTextInput.java # runelite-client/src/main/java/net/runelite/client/plugins/worldmap/MinigameLocation.java # runelite-client/src/main/java/net/runelite/client/plugins/worldmap/MiningSiteLocation.java # runelite-client/src/main/java/net/runelite/client/plugins/worldmap/TeleportLocationData.java # runelite-client/src/main/java/net/runelite/client/plugins/worldmap/TransportationPointLocation.java # runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/xpupdater/XpUpdaterPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/xtea/XteaPlugin.java # runelite-client/src/main/java/net/runelite/client/rs/ClientConfigLoader.java # runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java # runelite-client/src/main/resources/net/runelite/client/plugins/skillcalculator/skill_fletching.json # runelite-client/src/test/java/net/runelite/client/plugins/PluginManagerTest.java # runelite-client/src/test/java/net/runelite/client/plugins/bank/BankPluginTest.java # runelite-client/src/test/java/net/runelite/client/plugins/chatcommands/ChatCommandsPluginTest.java # runelite-client/src/test/java/net/runelite/client/plugins/examine/ExaminePluginTest.java # runelite-client/src/test/java/net/runelite/client/plugins/grandexchange/GrandExchangePluginTest.java # runelite-client/src/test/java/net/runelite/client/plugins/hiscore/HiscorePanelTest.java # runelite-client/src/test/java/net/runelite/client/plugins/keyremapping/KeyRemappingListenerTest.java # runelite-client/src/test/java/net/runelite/client/plugins/loottracker/LootTrackerPluginTest.java # runelite-client/src/test/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPluginTest.java # runelite-client/src/test/java/net/runelite/client/plugins/raids/RaidsPluginTest.java # runelite-client/src/test/java/net/runelite/client/plugins/slayer/SlayerPluginTest.java # runelite-client/src/test/java/net/runelite/client/plugins/xptracker/XpTrackerPluginTest.java # runelite-client/src/test/java/net/runelite/client/rs/ClientConfigLoaderTest.java # runelite-client/src/test/java/net/runelite/client/ui/overlay/infobox/InfoBoxManagerTest.java
2020-07-16 17:50:30 +01:00
parent b407e4b567 8702b6d068
commit ea056d0604
65 changed files with 549 additions and 311 deletions
--- a/runelite-client/src/test/java/net/runelite/client/plugins/PluginManagerTest.java
+++ b/runelite-client/src/test/java/net/runelite/client/plugins/PluginManagerTest.java
@@ -58,6 +58,7 @@ import net.runelite.client.config.ConfigItem;
 import net.runelite.client.eventbus.AccessorGenerator;
 import net.runelite.client.eventbus.EventBus;
 import net.runelite.client.eventbus.Subscribe;
+import okhttp3.OkHttpClient;
 import org.junit.After;
 import static org.junit.Assert.assertEquals;
 import org.junit.Before;
@@ -66,6 +67,7 @@ import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
+import static org.mockito.Mockito.*;
 import org.mockito.junit.MockitoJUnitRunner;

@RunWith(MockitoJUnitRunner.class)
@@ -92,10 +94,12 @@ public class PluginManagerTest
 	@Before
 	public void before() throws IOException
 	{
+		OkHttpClient okHttpClient = mock(OkHttpClient.class);
+
 		executorService = Executors.newSingleThreadScheduledExecutor();

 		Injector injector = Guice.createInjector(Modules
-			.override(new RuneLiteModule(() -> null, false, RuneLite.DEFAULT_CONFIG_FILE))
+			.override(new RuneLiteModule(okHttpClient, () -> null, false, RuneLite.DEFAULT_CONFIG_FILE))
 			.with(BoundFieldModule.of(this)));

 		RuneLite.setInjector(injector);
@@ -157,7 +161,7 @@ public class PluginManagerTest
 	{
 		List<Module> modules = new ArrayList<>();
 		modules.add(new GraphvizModule());
-		modules.add(new RuneLiteModule(() -> null, false, RuneLite.DEFAULT_CONFIG_FILE));
+		modules.add(new RuneLiteModule(mock(OkHttpClient.class), () -> null, false, RuneLite.DEFAULT_CONFIG_FILE));

 		PluginManager pluginManager = new PluginManager(false, null, null, executorService, null, null, null, null);
 		pluginManager.loadCorePlugins();
--- a/runelite-client/src/test/java/net/runelite/client/rs/ClientConfigLoaderTest.java
+++ b/runelite-client/src/test/java/net/runelite/client/rs/ClientConfigLoaderTest.java
@@ -29,6 +29,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
+import okhttp3.OkHttpClient;
 import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.MockWebServer;
 import org.junit.After;
@@ -63,7 +64,7 @@ public class ClientConfigLoaderTest
 	@Test
 	public void testFetch() throws IOException
 	{
-		final RSConfig config = ClientConfigLoader.fetch(server.url("/"));
+		final RSConfig config = new ClientConfigLoader(new OkHttpClient()).fetch(server.url("/"));
 		assertEquals("http://oldschool1.runescape.com/", config.getCodeBase());
 	}

--- a/runelite-client/src/test/java/net/runelite/client/ui/overlay/infobox/InfoBoxManagerTest.java
+++ b/runelite-client/src/test/java/net/runelite/client/ui/overlay/infobox/InfoBoxManagerTest.java
@@ -41,6 +41,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 import org.mockito.junit.MockitoJUnitRunner;

@RunWith(MockitoJUnitRunner.class)
@@ -65,16 +66,31 @@ public class InfoBoxManagerTest

 	private static class TestInfobox extends InfoBox
 	{
-		public TestInfobox(InfoBoxPriority infoBoxPriority)
+		private static final Plugin PLUGIN = mock(Plugin.class);
+
+		static
 		{
-			super(null, mock(Plugin.class));
+			when(PLUGIN.getName()).thenReturn("");
+		}
+
+		private final String text;
+
+		private TestInfobox(InfoBoxPriority infoBoxPriority)
+		{
+			this(infoBoxPriority, null);
+		}
+
+		private TestInfobox(InfoBoxPriority infoBoxPriority, String text)
+		{
+			super(null, PLUGIN);
 			setPriority(infoBoxPriority);
+			this.text = text;
 		}

 		@Override
 		public String getText()
 		{
-			return null;
+			return text;
 		}

 		@Override
@@ -94,4 +110,17 @@ public class InfoBoxManagerTest
 		List<InfoBoxPriority> order = infoBoxManager.getInfoBoxes().stream().map(InfoBox::getPriority).collect(Collectors.toList());
 		assertEquals(Arrays.asList(InfoBoxPriority.HIGH, InfoBoxPriority.MED, InfoBoxPriority.LOW), order);
 	}
-}
+
+	@Test
+	public void testSamePluginAndPriority()
+	{
+		infoBoxManager.addInfoBox(new TestInfobox(InfoBoxPriority.MED, "one"));
+		infoBoxManager.addInfoBox(new TestInfobox(InfoBoxPriority.MED, "two"));
+		infoBoxManager.addInfoBox(new TestInfobox(InfoBoxPriority.MED, "three"));
+
+		assertEquals(3, infoBoxManager.getInfoBoxes().size());
+		assertEquals("one", infoBoxManager.getInfoBoxes().get(0).getText());
+		assertEquals("two", infoBoxManager.getInfoBoxes().get(1).getText());
+		assertEquals("three", infoBoxManager.getInfoBoxes().get(2).getText());
+	}
+}