test: migrate test to jupiter API (#53)

Terasology · Feb 26, 2021 · 29ef47d · 29ef47d
1 parent d1ca1a1
commit 29ef47d
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 18 deletions.
diff --git a/src/test/java/org/terasology/entityNetwork/SidedLocationNetworkNodeTest.java b/src/test/java/org/terasology/entityNetwork/SidedLocationNetworkNodeTest.java
@@ -16,22 +16,22 @@
 package org.terasology.entityNetwork;
 
 import org.joml.Vector3i;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.terasology.math.Side;
 import org.terasology.math.SideBitFlag;
 
 import java.util.function.BiPredicate;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class SidedLocationNetworkNodeTest {
     static final String NETWORK_ID = "test";
     private byte allDirections;
 
-    @Before
+    @BeforeEach
     public void setup() {
         allDirections = 63;
     }

diff --git a/src/test/java/org/terasology/entityNetwork/systems/BlockNetworkTest.java b/src/test/java/org/terasology/entityNetwork/systems/BlockNetworkTest.java
@@ -5,8 +5,8 @@
 import com.google.common.collect.Sets;
 import org.joml.Vector3i;
 import org.joml.Vector3ic;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.terasology.entityNetwork.BlockLocationNetworkNode;
 import org.terasology.entityNetwork.Network;
 import org.terasology.entityNetwork.NetworkNode;
@@ -15,17 +15,18 @@
 
 import java.util.Set;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 
 public class BlockNetworkTest {
     static final String NETWORK_ID = "test";
     private BlockNetwork blockNetwork;
     private TestListener listener;
     private byte allDirections;
 
-    @Before
+    @BeforeEach
     public void setup() {
         blockNetwork = new BlockNetwork();
         listener = new TestListener();

diff --git a/src/test/java/org/terasology/entityNetwork/systems/SimpleNetworkTest.java b/src/test/java/org/terasology/entityNetwork/systems/SimpleNetworkTest.java
@@ -2,24 +2,24 @@
 
 import org.joml.Vector3i;
 import org.joml.Vector3ic;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.terasology.entityNetwork.NetworkNode;
 import org.terasology.entityNetwork.SidedBlockLocationNetworkNode;
 import org.terasology.math.Side;
 import org.terasology.math.SideBitFlag;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class SimpleNetworkTest {
     static final String NETWORK_ID = "test";
     private BlockNetwork network;
     private byte allDirections;
     private byte upOnly;
 
-    @Before
+    @BeforeEach
     public void setup() {
         network = new BlockNetwork();
         allDirections = 63;