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

Merge remote-tracking branch 'runelite/master'

Browse Source
This commit is contained in:
Owain van Brakel
2020-02-11 19:56:18 +01:00
parent 7742e61360 8137fd87c2
commit 491a7e76c4
14 changed files with 320 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runelite-client/src/test/java/net/runelite/client/config/TestConfig.java
View File

@@ -25,7 +25,7 @@
package net.runelite.client.config;
@ConfigGroup("test")
public interface TestConfig
public interface TestConfig extends Config
{
@ConfigItem(
keyName = "key",

8
runelite-client/src/test/java/net/runelite/client/plugins/PluginManagerTest.java
View File

@@ -116,7 +116,7 @@ public class PluginManagerTest
@Test
public void testLoadPlugins() throws Exception
{
PluginManager pluginManager = new PluginManager(false, null, null, null, null, null);
PluginManager pluginManager = new PluginManager(false, null, null, null, null);
pluginManager.setOutdated(true);
pluginManager.loadCorePlugins();
Collection<Plugin> plugins = pluginManager.getPlugins();
@@ -127,7 +127,7 @@ public class PluginManagerTest
.count();
assertEquals(expected, plugins.size());
pluginManager = new PluginManager(false, null, null, null, null, null);
pluginManager = new PluginManager(false, null, null, null, null);
pluginManager.loadCorePlugins();
plugins = pluginManager.getPlugins();
@@ -146,7 +146,7 @@ public class PluginManagerTest
modules.add(new GraphvizModule());
modules.add(new RuneLiteModule(() -> null, true));
PluginManager pluginManager = new PluginManager(true, null, null, null, null, null);
PluginManager pluginManager = new PluginManager(true, null, null, null, null);
pluginManager.loadCorePlugins();
modules.addAll(pluginManager.getPlugins());
@@ -198,7 +198,7 @@ public class PluginManagerTest
public void testEventbusAnnotations() throws PluginInstantiationException
{
EventBus eventbus = new EventBus();
PluginManager pluginManager = new PluginManager(true, eventbus, null, null, null, null)
PluginManager pluginManager = new PluginManager(true, eventbus, null, null, null)
{
@Override
public boolean isPluginEnabled(Plugin plugin)