From 55e94b4c9f118c75b6e696eb4cb4373c028ee39f Mon Sep 17 00:00:00 2001
From: tastybento <tastybento@users.noreply.github.com>
Date: Sun, 10 Dec 2023 09:10:48 -0800
Subject: [PATCH] Revert "Rewrote PanelItemTest to avoid null check errors in
 Bukkit class"

This reverts commit 5a193cda1cd7176ca9bc31b37d4bf0ebcfaa10a3.
---
 .../bentobox/api/panels/PanelItemTest.java    | 46 ++++++-------------
 1 file changed, 14 insertions(+), 32 deletions(-)

diff --git a/src/test/java/world/bentobox/bentobox/api/panels/PanelItemTest.java b/src/test/java/world/bentobox/bentobox/api/panels/PanelItemTest.java
index d796ee9ed..9779feeeb 100644
--- a/src/test/java/world/bentobox/bentobox/api/panels/PanelItemTest.java
+++ b/src/test/java/world/bentobox/bentobox/api/panels/PanelItemTest.java
@@ -4,18 +4,13 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import java.util.List;
 import java.util.Optional;
-import java.util.logging.Logger;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
-import org.bukkit.Server;
-import org.bukkit.World;
-import org.bukkit.inventory.ItemFactory;
 import org.bukkit.inventory.ItemStack;
 import org.junit.After;
 import org.junit.Before;
@@ -23,6 +18,8 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.Mockito;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
 import world.bentobox.bentobox.api.panels.PanelItem.ClickHandler;
@@ -33,35 +30,29 @@ import world.bentobox.bentobox.api.panels.builders.PanelItemBuilder;
  *
  */
 @RunWith(PowerMockRunner.class)
+@PrepareForTest({ Bukkit.class })
 public class PanelItemTest {
 
+    @Mock
     private PanelItemBuilder pib;
     private PanelItem pi;
     @Mock
     private ClickHandler clickHandler;
-    @Mock
-    private Server server;
-    @Mock
-    private ItemFactory itemFac;
 
     /**
      * @throws java.lang.Exception
      */
     @Before
     public void setUp() throws Exception {
-        World world = mock(World.class);
-        when(server.getLogger()).thenReturn(Logger.getAnonymousLogger());
-        when(server.getWorld("world")).thenReturn(world);
-        when(server.getVersion()).thenReturn("BSB_Mocking");
-        when(server.getItemFactory()).thenReturn(itemFac);
-
-        if (Bukkit.getServer() == null) {
-            Bukkit.setServer(server);
-        }
-
-        pib = new PanelItemBuilder().amount(2).clickHandler(clickHandler).description(List.of("Description", "hello"))
-                .icon(new ItemStack(Material.STONE)).name("Name");
-        pi = pib.build();
+        PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS);
+        // Builder
+        when(pib.getAmount()).thenReturn(2);
+        when(pib.getClickHandler()).thenReturn(clickHandler);
+        when(pib.getDescription()).thenReturn(List.of("Description", "hello"));
+        when(pib.getIcon()).thenReturn(new ItemStack(Material.STONE));
+        when(pib.getName()).thenReturn("Name");
+        when(pib.getPlayerHeadName()).thenReturn("tastybento");
+        pi = new PanelItem(pib);
     }
 
     /**
@@ -105,7 +96,7 @@ public class PanelItemTest {
     @Test
     public void testSetDescription() {
         assertEquals(2, pi.getDescription().size());
-        pi.setDescription(List.of("1", "2", "3"));
+        pi.setDescription(List.of("1","2","3"));
         assertEquals(3, pi.getDescription().size());
     }
 
@@ -187,10 +178,6 @@ public class PanelItemTest {
      */
     @Test
     public void testIsPlayerHead() {
-        // Make a head
-        pib = new PanelItemBuilder().amount(2).clickHandler(clickHandler).description(List.of("Description", "hello"))
-                .icon("tastybento").name("Name");
-        pi = pib.build();
         assertTrue(pi.isPlayerHead());
 
     }
@@ -200,11 +187,6 @@ public class PanelItemTest {
      */
     @Test
     public void testGetPlayerHeadName() {
-        // Make a head
-        pib = new PanelItemBuilder().amount(2).clickHandler(clickHandler).description(List.of("Description", "hello"))
-                .icon("tastybento").name("Name");
-        pi = pib.build();
-
         assertEquals("tastybento", pi.getPlayerHeadName());
     }