Improve test setup to support Bukkit

Author: carlodrift

pom.xml

@@ -277,5 +277,11 @@
             <version>4.11.0</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-inline</artifactId>
+            <version>4.11.0</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>

src/main/java/net/clementraynaud/skoice/util/ThreadUtil.java

@@ -29,13 +29,10 @@ private ThreadUtil() {
     }
 
     public static void ensureNotMainThread(boolean disablingBypass) {
-        try {
-            if (Bukkit.isPrimaryThread() && (!disablingBypass || Bukkit.getPluginManager().isPluginEnabled("Skoice"))) {
-                Exception exception = new IllegalStateException("This method should not be called from the main thread.");
-                exception.printStackTrace();
-                Skoice.analyticManager().getBugsnag().notify(exception, Severity.WARNING);
-            }
-        } catch (NullPointerException ignored) {
+        if (Bukkit.isPrimaryThread() && (!disablingBypass || Bukkit.getPluginManager().isPluginEnabled("Skoice"))) {
+            Exception exception = new IllegalStateException("This method should not be called from the main thread.");
+            exception.printStackTrace();
+            Skoice.analyticManager().getBugsnag().notify(exception, Severity.WARNING);
         }
     }
 

src/test/java/net/clementraynaud/skoice/BukkitTestSetup.java

@@ -0,0 +1,31 @@
+package net.clementraynaud.skoice;
+
+import org.bukkit.Bukkit;
+import org.bukkit.plugin.PluginManager;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.mockito.MockedStatic;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.mockStatic;
+import static org.mockito.Mockito.when;
+
+public class BukkitTestSetup {
+
+    private static MockedStatic<Bukkit> mockedBukkit;
+
+    @BeforeAll
+    static void setUpAll() {
+        BukkitTestSetup.mockedBukkit = mockStatic(Bukkit.class);
+        when(Bukkit.isPrimaryThread()).thenReturn(false);
+        PluginManager mockPluginManager = mock(PluginManager.class);
+        when(Bukkit.getPluginManager()).thenReturn(mockPluginManager);
+        when(mockPluginManager.isPluginEnabled("Skoice")).thenReturn(true);
+    }
+
+    @AfterAll
+    static void tearDownAll() {
+        BukkitTestSetup.mockedBukkit.close();
+    }
+
+}

src/test/java/net/clementraynaud/skoice/system/LinkedPlayerTest.java

@@ -19,6 +19,7 @@
 
 package net.clementraynaud.skoice.system;
 
+import net.clementraynaud.skoice.BukkitTestSetup;
 import net.clementraynaud.skoice.Skoice;
 import net.clementraynaud.skoice.storage.config.ConfigYamlFile;
 import org.bukkit.entity.Player;
@@ -38,7 +39,7 @@
 import static org.mockito.Mockito.when;
 
 @ExtendWith(MockitoExtension.class)
-class LinkedPlayerTest {
+class LinkedPlayerTest extends BukkitTestSetup {
 
     @Mock
     private Skoice plugin;

src/test/java/net/clementraynaud/skoice/system/NetworkTest.java

@@ -19,6 +19,7 @@
 
 package net.clementraynaud.skoice.system;
 
+import net.clementraynaud.skoice.BukkitTestSetup;
 import net.clementraynaud.skoice.Skoice;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -34,7 +35,7 @@
 import static org.mockito.Mockito.when;
 
 @ExtendWith(MockitoExtension.class)
-class NetworkTest {
+class NetworkTest extends BukkitTestSetup {
 
     @Mock
     private Skoice plugin;

src/test/java/net/clementraynaud/skoice/system/NetworksTest.java

@@ -19,6 +19,7 @@
 
 package net.clementraynaud.skoice.system;
 
+import net.clementraynaud.skoice.BukkitTestSetup;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -30,7 +31,7 @@
 import static org.mockito.Mockito.when;
 
 @ExtendWith(MockitoExtension.class)
-class NetworksTest {
+class NetworksTest extends BukkitTestSetup {
 
     @Mock
     private Network network1;