Move Bukkit to JUnit 5

EngineHub · Jul 15, 2019 · 8cd8a7c · 8cd8a7c
1 parent 06988ca
commit 8cd8a7c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 18 deletions.
diff --git a/worldedit-bukkit/src/test/java/com/sk89q/wepif/DinnerPermsResolverTest.java b/worldedit-bukkit/src/test/java/com/sk89q/wepif/DinnerPermsResolverTest.java
@@ -19,26 +19,26 @@
 
 package com.sk89q.wepif;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
 import org.bukkit.Server;
 import org.bukkit.plugin.PluginManager;
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 public class DinnerPermsResolverTest {
     private DinnerPermsResolver resolver;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         Server server = mock(Server.class);
         when(server.getPluginManager()).thenReturn(mock(PluginManager.class));
         resolver = new DinnerPermsResolver(server);
     }
-    
+
     @Test
     public void testBasicResolving() {
         final TestOfflinePermissible permissible = new TestOfflinePermissible();
@@ -49,7 +49,7 @@ public void testBasicResolving() {
         assertFalse(resolver.hasPermission(permissible, "completely.unrelated"));
         permissible.clearPermissions();
     }
-    
+
     @Test
     public void testBasicWildcardResolution() {
         final TestOfflinePermissible permissible = new TestOfflinePermissible();
@@ -59,24 +59,24 @@ public void testBasicWildcardResolution() {
         assertTrue(resolver.hasPermission(permissible, "commandbook.spawnmob.spider.skeleton"));
         permissible.clearPermissions();
     }
-    
+
     @Test
     public void testNegatingNodes() {
         final TestOfflinePermissible permissible = new TestOfflinePermissible();
         permissible.setPermission("commandbook.*", true);
         permissible.setPermission("commandbook.cuteasianboys", false);
         permissible.setPermission("commandbook.warp.*", false);
         permissible.setPermission("commandbook.warp.create", true);
-        
+
         assertTrue(resolver.hasPermission(permissible, "commandbook.motd"));
         assertFalse(resolver.hasPermission(permissible, "commandbook.cuteasianboys"));
         assertFalse(resolver.hasPermission(permissible, "commandbook.warp.remove"));
         assertTrue(resolver.hasPermission(permissible, "commandbook.warp.create"));
-        
+
         permissible.clearPermissions();
     }
-    
+
-    
+
     @Test
     public void testInGroup() {
         final TestOfflinePermissible permissible = new TestOfflinePermissible();

diff --git a/worldedit-bukkit/src/test/java/com/sk89q/worldedit/bukkit/BukkitWorldTest.java b/worldedit-bukkit/src/test/java/com/sk89q/worldedit/bukkit/BukkitWorldTest.java
@@ -20,15 +20,16 @@
 package com.sk89q.worldedit.bukkit;
 
 import com.sk89q.worldedit.util.TreeGenerator;
-import org.junit.Assert;
+import org.junit.jupiter.api.Test;
-import org.junit.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class BukkitWorldTest {
 
     @Test
     public void testTreeTypeMapping() {
         for (TreeGenerator.TreeType type : TreeGenerator.TreeType.values()) {
-            Assert.assertNotNull("No mapping for: " + type, BukkitWorld.toBukkitTreeType(type));
+            assertNotNull(BukkitWorld.toBukkitTreeType(type), "No mapping for: " + type);
         }
     }