From e636b44b4c2da6082dad84d081ae3b27ea254579 Mon Sep 17 00:00:00 2001 From: Michael Pollind Date: Wed, 10 Feb 2021 21:10:18 -0800 Subject: [PATCH 1/2] test: migrate test cases to jupiter --- src/test/java/org/terasology/world/generator/TreeTests.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/java/org/terasology/world/generator/TreeTests.java b/src/test/java/org/terasology/world/generator/TreeTests.java index 6fa82d3..9d16e3a 100644 --- a/src/test/java/org/terasology/world/generator/TreeTests.java +++ b/src/test/java/org/terasology/world/generator/TreeTests.java @@ -6,8 +6,8 @@ import org.joml.Vector2ic; import org.joml.Vector3i; import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentMatchers; import org.mockito.Mockito; import org.terasology.context.internal.ContextImpl; @@ -32,7 +32,7 @@ public class TreeTests { private BlockManager blockManager; private ExtraBlockDataManager extraDataManager; - @Before + @BeforeEach public void setup() { ContextImpl context = new ContextImpl(); CoreRegistry.setContext(context); From 88087fc50ec83a57ceba46eead6da9eea1c779b0 Mon Sep 17 00:00:00 2001 From: Michael Pollind Date: Mon, 22 Feb 2021 19:28:34 -0800 Subject: [PATCH 2/2] fix assertions --- .../java/org/terasology/world/generator/TreeTests.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/test/java/org/terasology/world/generator/TreeTests.java b/src/test/java/org/terasology/world/generator/TreeTests.java index 9d16e3a..ebbdec7 100644 --- a/src/test/java/org/terasology/world/generator/TreeTests.java +++ b/src/test/java/org/terasology/world/generator/TreeTests.java @@ -5,7 +5,6 @@ import org.joml.Vector2ic; import org.joml.Vector3i; -import org.junit.Assert; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.ArgumentMatchers; @@ -27,6 +26,8 @@ import java.util.stream.IntStream; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class TreeTests { private BlockManager blockManager; @@ -108,8 +109,9 @@ public Block setBlock(int x, int y, int z, Block block) { } private void assertIsLessOrEqual(final Vector3i actual, final Vector3i maximum) { - Assert.assertTrue("Maximum extent " + actual + " should be less or equal to " + maximum, - actual.x <= maximum.x && actual.y <= maximum.y && actual.z <= maximum.z); + assertTrue( + actual.x <= maximum.x && actual.y <= maximum.y && actual.z <= maximum.z, + "Maximum extent " + actual + " should be less or equal to " + maximum); } }