From fa0a16c2d84064232eed2061b7df1fa26ee53d09 Mon Sep 17 00:00:00 2001 From: ThatGamerBlue Date: Sat, 3 Aug 2019 23:36:09 +0100 Subject: [PATCH 1/8] client: fix plugin manager tests Partially closes #1256 --- .../java/net/runelite/client/plugins/PluginManagerTest.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/PluginManagerTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/PluginManagerTest.java index 0069618dd6..505a41ec11 100644 --- 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 org.junit.rules.TemporaryFolder; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; +import net.runelite.client.rs.ClientUpdateCheckMode; @RunWith(MockitoJUnitRunner.class) public class PluginManagerTest @@ -82,7 +83,7 @@ public class PluginManagerTest public void before() throws IOException { Injector injector = Guice.createInjector(Modules - .override(new RuneLiteModule(() -> null, true)) + .override(new RuneLiteModule(ClientUpdateCheckMode.NONE, true)) .with(BoundFieldModule.of(this))); RuneLite.setInjector(injector); @@ -140,7 +141,7 @@ public class PluginManagerTest { List modules = new ArrayList<>(); modules.add(new GraphvizModule()); - modules.add(new RuneLiteModule(() -> null, true)); + modules.add(new RuneLiteModule(ClientUpdateCheckMode.NONE, true)); PluginManager pluginManager = new PluginManager(true, null, null, null, null, null); pluginManager.loadCorePlugins(); From c5494b9aa1d4049e0feda55f53c7bc6053b9adf3 Mon Sep 17 00:00:00 2001 From: Owain van Brakel Date: Sun, 4 Aug 2019 03:16:02 +0200 Subject: [PATCH 2/8] itemskeptondeath: Fix tests --- .../ItemsKeptOnDeathPluginTest.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/itemskeptondeath/ItemsKeptOnDeathPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/itemskeptondeath/ItemsKeptOnDeathPluginTest.java index ae17ac6f9c..15ef8cef3e 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/itemskeptondeath/ItemsKeptOnDeathPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/itemskeptondeath/ItemsKeptOnDeathPluginTest.java @@ -41,7 +41,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -82,9 +81,20 @@ public class ItemsKeptOnDeathPluginTest { // Mock Item Composition and necessary ItemManager methods for this item ItemDefinition c = mock(ItemDefinition.class); - + when(c.getId()) + .thenReturn(id); when(c.getName()) .thenReturn(name); + when(c.isTradeable()) + .thenReturn(tradeable); + when(c.getPrice()) + .thenReturn(price); + + if (!tradeable) + { + when(c.getNote()).thenReturn(-1); + when(c.getLinkedNoteId()).thenReturn(-1); + } when(itemManager.getItemDefinition(id)).thenReturn(c); when(itemManager.canonicalize(id)).thenReturn(id); From 8243a959d83df1beb128f965771eae9042227a9a Mon Sep 17 00:00:00 2001 From: Owain van Brakel Date: Sun, 4 Aug 2019 03:29:46 +0200 Subject: [PATCH 3/8] client-tets: Remove Ignore annotation --- .../plugins/maxhit/calculators/MaxHitCalculatorTest.java | 1 - .../client/plugins/motherlode/MotherlodePluginTest.java | 1 - .../test/java/net/runelite/client/util/ItemUtilTest.java | 6 ------ 3 files changed, 8 deletions(-) diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/maxhit/calculators/MaxHitCalculatorTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/maxhit/calculators/MaxHitCalculatorTest.java index 7482f83f55..3aa1c59c44 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/maxhit/calculators/MaxHitCalculatorTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/maxhit/calculators/MaxHitCalculatorTest.java @@ -33,7 +33,6 @@ import net.runelite.client.plugins.maxhit.calculators.testconfig.MaxHitConfig; import net.runelite.client.plugins.maxhit.calculators.testconfig.MeleeMaxHitConfig; import net.runelite.client.plugins.maxhit.calculators.testconfig.RangeMaxHitConfig; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/motherlode/MotherlodePluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/motherlode/MotherlodePluginTest.java index 7ad10a42b9..7006cb17ee 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/motherlode/MotherlodePluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/motherlode/MotherlodePluginTest.java @@ -43,7 +43,6 @@ import net.runelite.client.Notifier; import net.runelite.client.config.ChatColorConfig; import net.runelite.client.config.RuneLiteConfig; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; diff --git a/runelite-client/src/test/java/net/runelite/client/util/ItemUtilTest.java b/runelite-client/src/test/java/net/runelite/client/util/ItemUtilTest.java index 44c3e91b42..f69238896d 100644 --- a/runelite-client/src/test/java/net/runelite/client/util/ItemUtilTest.java +++ b/runelite-client/src/test/java/net/runelite/client/util/ItemUtilTest.java @@ -37,7 +37,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertTrue; -import org.junit.Ignore; import org.junit.Test; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -85,7 +84,6 @@ public class ItemUtilTest return i; } - @Ignore @Test public void toGameItemMap() { @@ -98,7 +96,6 @@ public class ItemUtilTest assertEquals(ALL_MAP, itemMap2); } - @Ignore @Test public void containsAllItemIds() { @@ -107,7 +104,6 @@ public class ItemUtilTest assertFalse(ItemUtil.containsAllItemIds(items, MIX_IDS)); } - @Ignore @Test public void containsAnyItemId() { @@ -116,7 +112,6 @@ public class ItemUtilTest assertTrue(ItemUtil.containsAnyItemId(items, MIX_IDS)); } - @Ignore @Test public void containsItemId() { @@ -124,7 +119,6 @@ public class ItemUtilTest assertFalse(ItemUtil.containsItemId(items, ItemID.TWISTED_BOW)); } - @Ignore @Test public void containsAllGameItems() { From 856146d4a556746a5ab605220a2da5c4576709bb Mon Sep 17 00:00:00 2001 From: Owain van Brakel Date: Sun, 4 Aug 2019 03:32:39 +0200 Subject: [PATCH 4/8] chatfilterplugin: Fix tests --- .../chatfilter/ChatFilterPluginTest.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/chatfilter/ChatFilterPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/chatfilter/ChatFilterPluginTest.java index d975b52452..2d62b5ea37 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/chatfilter/ChatFilterPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/chatfilter/ChatFilterPluginTest.java @@ -36,10 +36,10 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; +import static org.mockito.Mockito.lenient; import static org.mockito.Mockito.when; import org.mockito.junit.MockitoJUnitRunner; @@ -121,12 +121,11 @@ public class ChatFilterPluginTest assertNull(chatFilterPlugin.censorMessage("te\u008Cst")); } - @Ignore @Test public void testReplayedMessage() { - when(chatFilterConfig.filterType()).thenReturn(ChatFilterType.REMOVE_MESSAGE); - when(chatFilterConfig.filteredWords()).thenReturn("hello osrs"); + chatFilterPlugin.setFilterType(ChatFilterType.REMOVE_MESSAGE); + chatFilterPlugin.setFilteredWords("hello osrs"); chatFilterPlugin.updateFilteredPatterns(); assertNull(chatFilterPlugin.censorMessage("hello\u00A0osrs")); @@ -147,11 +146,10 @@ public class ChatFilterPluginTest assertFalse(chatFilterPlugin.shouldFilterPlayerMessage("Iron Mammal")); } - @Ignore @Test public void testMessageFromClanIsFiltered() { - when(client.isClanMember("B0aty")).thenReturn(true); + lenient().when(client.isClanMember("B0aty")).thenReturn(true); chatFilterPlugin.setFilterClan(true); assertTrue(chatFilterPlugin.shouldFilterPlayerMessage("B0aty")); } @@ -159,7 +157,7 @@ public class ChatFilterPluginTest @Test public void testMessageFromClanIsNotFiltered() { - when(client.isClanMember("B0aty")).thenReturn(true); + lenient().when(client.isClanMember("B0aty")).thenReturn(true); chatFilterPlugin.setFilterClan(false); assertFalse(chatFilterPlugin.shouldFilterPlayerMessage("B0aty")); } @@ -167,15 +165,15 @@ public class ChatFilterPluginTest @Test public void testMessageFromSelfIsNotFiltered() { - when(localPlayer.getName()).thenReturn("Swampletics"); + lenient().when(localPlayer.getName()).thenReturn("Swampletics"); assertFalse(chatFilterPlugin.shouldFilterPlayerMessage("Swampletics")); } @Test public void testMessageFromNonFriendNonClanIsFiltered() { - when(client.isFriended("Woox", false)).thenReturn(false); - when(client.isClanMember("Woox")).thenReturn(false); + lenient().when(client.isFriended("Woox", false)).thenReturn(false); + lenient().when(client.isClanMember("Woox")).thenReturn(false); assertTrue(chatFilterPlugin.shouldFilterPlayerMessage("Woox")); } } \ No newline at end of file From 9650b8064b9495e1b5211d6ec10e91bc9d8e37c7 Mon Sep 17 00:00:00 2001 From: Owain van Brakel Date: Sun, 4 Aug 2019 03:44:15 +0200 Subject: [PATCH 5/8] injector-plugin: Fix and run tests --- injector-plugin/build.gradle | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/injector-plugin/build.gradle b/injector-plugin/build.gradle index 45ccd6ee2f..6333cfb192 100644 --- a/injector-plugin/build.gradle +++ b/injector-plugin/build.gradle @@ -24,6 +24,7 @@ dependencies { compileOnly group: 'org.apache.maven.plugin-tools', name: 'maven-plugin-annotations', version: '3.6.0' annotationProcessor group: 'org.eclipse.sisu', name: 'org.eclipse.sisu.inject', version: '0.3.3' vanilla "net.runelite.rs:vanilla:${rsversion}" + testImplementation project(path: ':deobfuscator', configuration: 'testArchives') } compileJava { @@ -47,12 +48,4 @@ compileJava.doLast() { ] inject.main(jarPaths) loader.close() -} - -test { - exclude '**/*' -} - -compileTestJava { - exclude '**/*' } \ No newline at end of file From c2b0a6ae56d4fb8ec0966a27c34f9744dfcd9b70 Mon Sep 17 00:00:00 2001 From: Owain van Brakel Date: Sun, 4 Aug 2019 03:50:56 +0200 Subject: [PATCH 6/8] travis: enable tests --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 518ca7ff82..2a85daa3ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,5 +13,5 @@ cache: - $HOME/.gradle/caches/ - $HOME/.gradle/wrapper/ -script: ./gradlew build -x test --rerun-tasks +script: ./gradlew build --rerun-tasks From cbbacc6030c62dc07c8b4b0317d65f61fe33d3b9 Mon Sep 17 00:00:00 2001 From: Owain van Brakel Date: Sun, 4 Aug 2019 04:05:52 +0200 Subject: [PATCH 7/8] travis: gradle cache --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2a85daa3ea..885fd45c3d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,5 +13,5 @@ cache: - $HOME/.gradle/caches/ - $HOME/.gradle/wrapper/ -script: ./gradlew build --rerun-tasks +script: ./gradlew build From 1bc4ab5e525521e5b4e16de637906f57e94f6713 Mon Sep 17 00:00:00 2001 From: Owain van Brakel Date: Sun, 4 Aug 2019 04:16:00 +0200 Subject: [PATCH 8/8] gradle: Test build cache