Fixed and improved tests

BentoBoxWorld · Dec 15, 2019 · cd9baae · cd9baae
1 parent 40a9b86
commit cd9baae
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 33 deletions.
diff --git a/src/main/java/world/bentobox/magiccobblestonegenerator/StoneGeneratorAddon.java b/src/main/java/world/bentobox/magiccobblestonegenerator/StoneGeneratorAddon.java
@@ -111,13 +111,13 @@ private void registerPlaceholders() {
                 .filter(g -> !settings.getDisabledGameModes().contains(g.getDescription().getName()))
                 .forEach(g -> {
                     // Register placeholders
-                    getPlugin().getPlaceholdersManager()
-                            .registerPlaceholder(this, g.getDescription().getName().toLowerCase() + "_island_generator_tier",
-                                    user -> {
-                                        long level = isLevelProvided() ? 0L : getLevelAddon().getIslandLevel(g.getOverWorld(), user.getUniqueId());
-                                        Settings.GeneratorTier tier = getManager().getGeneratorTier(level, user.getWorld());
-                                        return tier != null ? tier.getName() : "";
-                                    });
+                    getPlugin().getPlaceholdersManager().registerPlaceholder(this,
+                            g.getDescription().getName().toLowerCase() + "_island_generator_tier",
+                            user -> {
+                                long level = isLevelProvided() ? 0L : getLevelAddon().getIslandLevel(g.getOverWorld(), user.getUniqueId());
+                                Settings.GeneratorTier tier = getManager().getGeneratorTier(level, user.getWorld());
+                                return tier != null ? tier.getName() : "";
+                            });
                 });
     }
 

diff --git a/src/test/java/world/bentobox/magiccobblestonegenerator/StoneGeneratorAddonTest.java b/src/test/java/world/bentobox/magiccobblestonegenerator/StoneGeneratorAddonTest.java
@@ -43,6 +43,7 @@
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.managers.AddonsManager;
+import world.bentobox.bentobox.managers.PlaceholdersManager;
 import world.bentobox.magiccobblestonegenerator.config.Settings;
 import world.bentobox.magiccobblestonegenerator.tasks.MagicGenerator;
 
@@ -68,6 +69,9 @@ public class StoneGeneratorAddonTest {
     @Mock
     private GameModeAddon gameMode;
 
+    @Mock
+    private PlaceholdersManager placeholdersManager;
+
     /**
      * @throws java.lang.Exception
      */
@@ -77,6 +81,7 @@ public void setUp() throws Exception {
         Whitebox.setInternalState(BentoBox.class, "instance", plugin);
         when(plugin.isEnabled()).thenReturn(true);
         when(plugin.getLogger()).thenReturn(logger);
+        when(plugin.getPlaceholdersManager()).thenReturn(placeholdersManager);
         // Bukkit
         PowerMockito.mockStatic(Bukkit.class);
         when(Bukkit.getLogger()).thenReturn(logger);
@@ -115,8 +120,6 @@ public void setUp() throws Exception {
         @NonNull
         Optional<CompositeCommand> opCmd = Optional.of(cmd );
         when(gameMode.getPlayerCommand()).thenReturn(opCmd);
-
-
     }
 
     /**
@@ -140,27 +143,6 @@ private void deleteAll(File file) throws IOException {
         }
 
     }
-
-    /**
-     * Test method for {@link world.bentobox.magiccobblestonegenerator.StoneGeneratorAddon#onEnable()}.
-     */
-    @Test
-    public void testOnEnableDisabledPlugin() {
-        when(plugin.isEnabled()).thenReturn(false);
-        addon.onEnable();
-        verify(logger).severe(eq("BentoBox is not available or disabled!"));
-        assertEquals(addon.getState(), State.DISABLED);
-    }
-
-    /**
-     * Test method for {@link world.bentobox.magiccobblestonegenerator.StoneGeneratorAddon#onEnable()}.
-     */
-    @Test
-    public void testOnEnableDisabled() {
-        addon.setState(State.DISABLED);
-        addon.onEnable();
-        verify(logger).severe(eq("Magic Cobblestone Generator Addon is not available or disabled!"));
-    }
 
     /**
      * Test method for {@link world.bentobox.magiccobblestonegenerator.StoneGeneratorAddon#onEnable()}.
@@ -225,7 +207,7 @@ public void testOnReloadDisabled() {
     public void testGetSettings() {
         assertNull(addon.getSettings());
         addon.onLoad();
-        assertTrue(addon.getSettings() instanceof Settings);
+        assertNotNull(addon.getSettings());
 
     }
 
@@ -236,7 +218,7 @@ public void testGetSettings() {
     public void testGetGenerator() {
         assertNull(addon.getGenerator());
         testOnEnable();
-        assertTrue(addon.getGenerator() instanceof MagicGenerator);
+        assertNotNull(addon.getGenerator());
     }
 
     /**
@@ -246,7 +228,7 @@ public void testGetGenerator() {
     public void testGetManager() {
         assertNull(addon.getManager());
         testOnEnable();
-        assertTrue(addon.getManager() instanceof StoneGeneratorManager);
+        assertNotNull(addon.getManager());
     }
 
     /**