diff --git a/src/test/java/org/terasology/entityNetwork/SidedLocationNetworkNodeTest.java b/src/test/java/org/terasology/entityNetwork/SidedLocationNetworkNodeTest.java index df7f232..6c32acf 100644 --- 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 index e966761..78dc592 100644 --- 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,9 +15,10 @@ 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"; @@ -25,7 +26,7 @@ public class BlockNetworkTest { 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 index f2f9783..cb88f17 100644 --- a/src/test/java/org/terasology/entityNetwork/systems/SimpleNetworkTest.java +++ b/src/test/java/org/terasology/entityNetwork/systems/SimpleNetworkTest.java @@ -2,16 +2,16 @@ 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"; @@ -19,7 +19,7 @@ public class SimpleNetworkTest { private byte allDirections; private byte upOnly; - @Before + @BeforeEach public void setup() { network = new BlockNetwork(); allDirections = 63;