Make plugins work with new OverlayManager

- Remove the usage of getOverlay and getOverlays
- Replace the overlay addition/removal with correct calls to
overlayManager.add and overlayManager.remove
- Update tests

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
This commit is contained in:
Tomas Slusny
2018-05-23 12:29:32 +02:00
parent 921bfb2fdd
commit 41e0b27a99
53 changed files with 587 additions and 411 deletions

View File

@@ -30,13 +30,14 @@ import com.google.inject.testing.fieldbinder.BoundFieldModule;
import java.util.Set;
import javax.inject.Inject;
import net.runelite.api.Client;
import net.runelite.api.VarPlayer;
import net.runelite.api.Skill;
import net.runelite.api.VarPlayer;
import net.runelite.api.Varbits;
import net.runelite.api.events.ConfigChanged;
import net.runelite.api.events.VarbitChanged;
import net.runelite.api.widgets.Widget;
import net.runelite.api.widgets.WidgetInfo;
import net.runelite.client.ui.overlay.OverlayManager;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.junit.Before;
@@ -54,6 +55,10 @@ public class AttackStylesPluginTest
@Bind
Client client;
@Mock
@Bind
OverlayManager overlayManager;
@Mock
@Bind
AttackStylesConfig attackConfig;

View File

@@ -25,6 +25,7 @@
package net.runelite.client.plugins.cerberus;
import com.google.inject.Guice;
import com.google.inject.testing.fieldbinder.Bind;
import com.google.inject.testing.fieldbinder.BoundFieldModule;
import java.util.Arrays;
import java.util.List;
@@ -32,10 +33,12 @@ import javax.inject.Inject;
import net.runelite.api.NPC;
import net.runelite.api.coords.LocalPoint;
import net.runelite.api.events.GameTick;
import net.runelite.client.ui.overlay.OverlayManager;
import static org.junit.Assert.assertEquals;
import org.junit.Before;
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.runners.MockitoJUnitRunner;
@@ -43,6 +46,10 @@ import org.mockito.runners.MockitoJUnitRunner;
@RunWith(MockitoJUnitRunner.class)
public class CerberusPluginTest
{
@Mock
@Bind
OverlayManager overlayManager;
@Inject
CerberusPlugin cerberusPlugin;

View File

@@ -36,6 +36,7 @@ import net.runelite.api.widgets.Widget;
import net.runelite.api.widgets.WidgetInfo;
import net.runelite.client.Notifier;
import net.runelite.client.game.ItemManager;
import net.runelite.client.ui.overlay.OverlayManager;
import net.runelite.client.ui.overlay.infobox.InfoBoxManager;
import static org.junit.Assert.assertEquals;
import org.junit.Before;
@@ -92,6 +93,10 @@ public class SlayerPluginTest
@Bind
SlayerConfig slayerConfig;
@Mock
@Bind
OverlayManager overlayManager;
@Mock
@Bind
SlayerOverlay overlay;