test: move classes implementing Jupiter interfaces to their own subpa…

…ckage
MovingBlocks · May 14, 2022 · fe49bc4 · fe49bc4
1 parent 911b6e0
commit fe49bc4
Show file tree

Hide file tree

Showing 23 changed files with 31 additions and 15 deletions.
diff --git a/engine-tests/src/main/java/org/terasology/engine/integrationenvironment/Engines.java b/engine-tests/src/main/java/org/terasology/engine/integrationenvironment/Engines.java
@@ -33,6 +33,7 @@
 import org.terasology.engine.core.subsystem.lwjgl.LwjglInput;
 import org.terasology.engine.core.subsystem.lwjgl.LwjglTimer;
 import org.terasology.engine.core.subsystem.openvr.OpenVRInput;
+import org.terasology.engine.integrationenvironment.jupiter.MTEExtension;
 import org.terasology.engine.network.JoinStatus;
 import org.terasology.engine.network.NetworkSystem;
 import org.terasology.engine.registry.CoreRegistry;
@@ -93,7 +94,7 @@ public Engines(Set<String> dependencies, String worldGeneratorUri) {
      * <p>
      * Every instance should be shut down properly by calling {@link #tearDown()}.
      */
-    protected void setup() {
+    public void setup() {
         mockPathManager();
         try {
             host = createHost();
@@ -110,7 +111,7 @@ protected void setup() {
      * <p>
      * Used to properly shut down and clean up a testing environment set up and started with {@link #setup()}.
      */
-    protected void tearDown() {
+    public void tearDown() {
         engines.forEach(TerasologyEngine::shutdown);
         engines.forEach(TerasologyEngine::cleanup);
         engines.clear();

diff --git a/engine-tests/src/main/java/org/terasology/engine/integrationenvironment/MainLoop.java b/engine-tests/src/main/java/org/terasology/engine/integrationenvironment/MainLoop.java
@@ -17,6 +17,7 @@
 import org.terasology.engine.core.TerasologyEngine;
 import org.terasology.engine.core.Time;
 import org.terasology.engine.entitySystem.entity.EntityManager;
+import org.terasology.engine.integrationenvironment.jupiter.MTEExtension;
 import org.terasology.engine.world.WorldProvider;
 import org.terasology.engine.world.block.BlockRegion;
 import org.terasology.engine.world.block.BlockRegionc;

diff --git a/...tests/src/main/java/org/terasology/engine/integrationenvironment/ModuleTestingHelper.java b/...tests/src/main/java/org/terasology/engine/integrationenvironment/ModuleTestingHelper.java
@@ -31,7 +31,7 @@ public class ModuleTestingHelper implements ModuleTestingEnvironment {
     final Engines engines;
     final MainLoop mainLoop;
 
-    ModuleTestingHelper(Engines engines) {
+    public ModuleTestingHelper(Engines engines) {
         this.engines = engines;
         this.mainLoop = new MainLoop(engines);
     }

diff --git a/engine-tests/src/main/java/org/terasology/engine/integrationenvironment/Scopes.java b/engine-tests/src/main/java/org/terasology/engine/integrationenvironment/Scopes.java
@@ -6,6 +6,7 @@
 import com.google.common.collect.ObjectArrays;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.extension.ExtensionContext;
+import org.terasology.engine.integrationenvironment.jupiter.MTEExtension;
 
 import java.util.function.Function;
 

diff --git a/...onenvironment/extension/Dependencies.java → ...tionenvironment/jupiter/Dependencies.java b/...onenvironment/extension/Dependencies.java → ...tionenvironment/jupiter/Dependencies.java
@@ -1,9 +1,7 @@
 // Copyright 2022 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
 
-package org.terasology.engine.integrationenvironment.extension;
-
-import org.terasology.engine.integrationenvironment.MTEExtension;
+package org.terasology.engine.integrationenvironment.jupiter;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/...tionenvironment/IsolatedMTEExtension.java → ...ronment/jupiter/IsolatedMTEExtension.java b/...tionenvironment/IsolatedMTEExtension.java → ...ronment/jupiter/IsolatedMTEExtension.java
@@ -1,7 +1,9 @@
 // Copyright 2022 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
 
-package org.terasology.engine.integrationenvironment;
+package org.terasology.engine.integrationenvironment.jupiter;
+
+import org.terasology.engine.integrationenvironment.Scopes;
 
 /**
  * Subclass of {@link MTEExtension} which isolates all test cases by creating a new engine for each test. This is much

diff --git a/.../integrationenvironment/MTEExtension.java → ...tionenvironment/jupiter/MTEExtension.java b/.../integrationenvironment/MTEExtension.java → ...tionenvironment/jupiter/MTEExtension.java
@@ -1,7 +1,7 @@
 // Copyright 2022 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
 
-package org.terasology.engine.integrationenvironment;
+package org.terasology.engine.integrationenvironment.jupiter;
 
 import ch.qos.logback.classic.LoggerContext;
 import ch.qos.logback.classic.joran.JoranConfigurator;
@@ -17,8 +17,10 @@
 import org.junit.jupiter.api.extension.TestInstancePostProcessor;
 import org.opentest4j.MultipleFailuresError;
 import org.slf4j.LoggerFactory;
-import org.terasology.engine.integrationenvironment.extension.Dependencies;
-import org.terasology.engine.integrationenvironment.extension.UseWorldGenerator;
+import org.terasology.engine.integrationenvironment.Engines;
+import org.terasology.engine.integrationenvironment.MainLoop;
+import org.terasology.engine.integrationenvironment.ModuleTestingHelper;
+import org.terasology.engine.integrationenvironment.Scopes;
 import org.terasology.engine.registry.In;
 import org.terasology.unittest.worlds.DummyWorldGenerator;
 

diff --git a/...ironment/extension/UseWorldGenerator.java → ...nvironment/jupiter/UseWorldGenerator.java b/...ironment/extension/UseWorldGenerator.java → ...nvironment/jupiter/UseWorldGenerator.java
@@ -1,9 +1,7 @@
 // Copyright 2022 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
 
-package org.terasology.engine.integrationenvironment.extension;
-
-import org.terasology.engine.integrationenvironment.MTEExtension;
+package org.terasology.engine.integrationenvironment.jupiter;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/engine-tests/src/main/java/org/terasology/engine/integrationenvironment/package-info.java b/engine-tests/src/main/java/org/terasology/engine/integrationenvironment/package-info.java
@@ -6,7 +6,7 @@
  * <p>
  * Key points of interest for test authors are:
  * <ul>
- *     <li>{@link org.terasology.engine.integrationenvironment.MTEExtension MTEExtension}: Use this on your JUnit 5 test classes.
+ *     <li>{@link org.terasology.engine.integrationenvironment.jupiter.MTEExtension MTEExtension}: Use this on your JUnit 5 test classes.
  *     <li>{@link org.terasology.engine.integrationenvironment.MainLoop MainLoop}: Methods for running the engine during your test scenarios.
  *     <li>{@link org.terasology.engine.integrationenvironment.Engines}: You can add additional engines to simulate remote connections to the
  *         host. <i>[Experimental]</i>

diff --git a/...ne-tests/src/test/java/org/terasology/engine/integrationenvironment/AssetLoadingTest.java b/...ne-tests/src/test/java/org/terasology/engine/integrationenvironment/AssetLoadingTest.java
@@ -6,6 +6,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.terasology.engine.entitySystem.prefab.Prefab;
+import org.terasology.engine.integrationenvironment.jupiter.MTEExtension;
 import org.terasology.engine.registry.In;
 import org.terasology.engine.world.block.Block;
 import org.terasology.engine.world.block.BlockManager;

diff --git a/...sts/src/test/java/org/terasology/engine/integrationenvironment/ChunkRegionFutureTest.java b/...sts/src/test/java/org/terasology/engine/integrationenvironment/ChunkRegionFutureTest.java
@@ -11,6 +11,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.terasology.engine.entitySystem.entity.EntityManager;
+import org.terasology.engine.integrationenvironment.jupiter.MTEExtension;
 import org.terasology.engine.registry.In;
 import org.terasology.engine.world.WorldProvider;
 import org.terasology.engine.world.block.Block;

diff --git a/...ests/src/test/java/org/terasology/engine/integrationenvironment/ClientConnectionTest.java b/...ests/src/test/java/org/terasology/engine/integrationenvironment/ClientConnectionTest.java
@@ -9,6 +9,7 @@
 import org.terasology.engine.context.Context;
 import org.terasology.engine.core.TerasologyEngine;
 import org.terasology.engine.core.modes.StateIngame;
+import org.terasology.engine.integrationenvironment.jupiter.MTEExtension;
 
 import java.io.IOException;
 import java.util.List;

diff --git a/...tests/src/test/java/org/terasology/engine/integrationenvironment/ComponentSystemTest.java b/...tests/src/test/java/org/terasology/engine/integrationenvironment/ComponentSystemTest.java
@@ -8,6 +8,7 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.terasology.engine.entitySystem.entity.EntityManager;
 import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.integrationenvironment.jupiter.MTEExtension;
 import org.terasology.engine.registry.In;
 import org.terasology.unittest.stubs.DummyComponent;
 import org.terasology.unittest.stubs.DummyEvent;

diff --git a/engine-tests/src/test/java/org/terasology/engine/integrationenvironment/ExampleTest.java b/engine-tests/src/test/java/org/terasology/engine/integrationenvironment/ExampleTest.java
@@ -11,6 +11,7 @@
 import org.terasology.engine.context.Context;
 import org.terasology.engine.core.Time;
 import org.terasology.engine.entitySystem.entity.EntityManager;
+import org.terasology.engine.integrationenvironment.jupiter.MTEExtension;
 import org.terasology.engine.logic.players.LocalPlayer;
 import org.terasology.engine.logic.players.event.ResetCameraEvent;
 import org.terasology.engine.network.ClientComponent;

diff --git a/...-tests/src/test/java/org/terasology/engine/integrationenvironment/IsolatedEngineTest.java b/...-tests/src/test/java/org/terasology/engine/integrationenvironment/IsolatedEngineTest.java
@@ -13,6 +13,7 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.terasology.engine.entitySystem.entity.EntityManager;
 import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.integrationenvironment.jupiter.IsolatedMTEExtension;
 import org.terasology.engine.registry.In;
 import org.terasology.unittest.stubs.DummyComponent;
 import org.terasology.unittest.stubs.DummyEvent;

diff --git a/...a/org/terasology/engine/integrationenvironment/MTEExtensionTestWithPerClassLifecycle.java b/...a/org/terasology/engine/integrationenvironment/MTEExtensionTestWithPerClassLifecycle.java
@@ -15,6 +15,7 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.terasology.engine.entitySystem.entity.EntityManager;
 import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.integrationenvironment.jupiter.MTEExtension;
 import org.terasology.engine.registry.In;
 import org.terasology.unittest.stubs.DummyComponent;
 import org.terasology.unittest.stubs.DummyEvent;

diff --git a/.../org/terasology/engine/integrationenvironment/MTEExtensionTestWithPerMethodLifecycle.java b/.../org/terasology/engine/integrationenvironment/MTEExtensionTestWithPerMethodLifecycle.java
@@ -15,6 +15,7 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.terasology.engine.entitySystem.entity.EntityManager;
 import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.integrationenvironment.jupiter.MTEExtension;
 import org.terasology.engine.registry.In;
 import org.terasology.unittest.stubs.DummyComponent;
 import org.terasology.unittest.stubs.DummyEvent;

diff --git a/.../test/java/org/terasology/engine/integrationenvironment/ModuleTestingEnvironmentTest.java b/.../test/java/org/terasology/engine/integrationenvironment/ModuleTestingEnvironmentTest.java
@@ -10,6 +10,7 @@
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.terasology.engine.integrationenvironment.jupiter.MTEExtension;
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;

diff --git a/engine-tests/src/test/java/org/terasology/engine/integrationenvironment/NestedTest.java b/engine-tests/src/test/java/org/terasology/engine/integrationenvironment/NestedTest.java
@@ -9,6 +9,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.terasology.engine.entitySystem.entity.EntityManager;
+import org.terasology.engine.integrationenvironment.jupiter.MTEExtension;
 import org.terasology.engine.registry.In;
 
 @Tag("MteTest")

diff --git a/...sts/src/test/java/org/terasology/engine/integrationenvironment/SubclassInjectionTest.java b/...sts/src/test/java/org/terasology/engine/integrationenvironment/SubclassInjectionTest.java
@@ -8,6 +8,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.terasology.engine.integrationenvironment.fixtures.BaseTestingClass;
+import org.terasology.engine.integrationenvironment.jupiter.MTEExtension;
 
 @Tag("MteTest")
 @ExtendWith(MTEExtension.class)

diff --git a/...sts/src/test/java/org/terasology/engine/integrationenvironment/TestEventReceiverTest.java b/...sts/src/test/java/org/terasology/engine/integrationenvironment/TestEventReceiverTest.java
@@ -9,6 +9,7 @@
 import org.terasology.engine.context.Context;
 import org.terasology.engine.entitySystem.entity.EntityManager;
 import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.integrationenvironment.jupiter.MTEExtension;
 import org.terasology.engine.logic.location.LocationComponent;
 import org.terasology.engine.registry.In;
 import org.terasology.unittest.stubs.DummyComponent;

diff --git a/...e-tests/src/test/java/org/terasology/engine/integrationenvironment/WorldProviderTest.java b/...e-tests/src/test/java/org/terasology/engine/integrationenvironment/WorldProviderTest.java
@@ -7,6 +7,7 @@
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.terasology.engine.integrationenvironment.jupiter.MTEExtension;
 import org.terasology.engine.registry.In;
 import org.terasology.engine.world.WorldProvider;
 import org.terasology.engine.world.block.BlockManager;

diff --git a/...ts/src/test/java/org/terasology/engine/integrationenvironment/delay/DelayManagerTest.java b/...ts/src/test/java/org/terasology/engine/integrationenvironment/delay/DelayManagerTest.java
@@ -13,9 +13,9 @@
 import org.terasology.engine.core.Time;
 import org.terasology.engine.entitySystem.entity.EntityManager;
 import org.terasology.engine.entitySystem.entity.EntityRef;
-import org.terasology.engine.integrationenvironment.MTEExtension;
 import org.terasology.engine.integrationenvironment.ModuleTestingHelper;
 import org.terasology.engine.integrationenvironment.TestEventReceiver;
+import org.terasology.engine.integrationenvironment.jupiter.MTEExtension;
 import org.terasology.engine.logic.delay.DelayManager;
 import org.terasology.engine.logic.delay.DelayedActionTriggeredEvent;
 import org.terasology.engine.network.ClientComponent;