test(MTE)! set default NetworkMode to NONE (#5041)

* test(MTE)! set default NetworkMode to NONE
MovingBlocks · Jun 7, 2022 · 3674bbb · 3674bbb
1 parent be0f9de
commit 3674bbb
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 1 deletion.
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.IntegrationEnvironment;
 import org.terasology.engine.integrationenvironment.jupiter.MTEExtension;
 import org.terasology.engine.network.JoinStatus;
 import org.terasology.engine.network.NetworkMode;
@@ -131,6 +132,11 @@ public void tearDown() {
 
     /**
      * Creates a new client and connects it to the host.
+     * <p>
+     * Requires the host to have a {@link NetworkMode} that accepts connections.
+     * Configure the host's network mode using
+     * {@link IntegrationEnvironment#networkMode @IntegrationEnvironment#networkmode}
+     * on your test class.
      *
      * @return the created client's context object
      */

diff --git a/...ain/java/org/terasology/engine/integrationenvironment/jupiter/IntegrationEnvironment.java b/...ain/java/org/terasology/engine/integrationenvironment/jupiter/IntegrationEnvironment.java
@@ -13,5 +13,5 @@
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface IntegrationEnvironment {
-    NetworkMode networkMode() default NetworkMode.LISTEN_SERVER;
+    NetworkMode networkMode() default NetworkMode.NONE;
 }
diff --git a/...ests/src/test/java/org/terasology/engine/integrationenvironment/ClientConnectionTest.java b/...ests/src/test/java/org/terasology/engine/integrationenvironment/ClientConnectionTest.java
@@ -11,13 +11,16 @@
 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.IntegrationEnvironment;
 import org.terasology.engine.integrationenvironment.jupiter.MTEExtension;
+import org.terasology.engine.network.NetworkMode;
 
 import java.io.IOException;
 import java.util.List;
 
 @Tag("MteTest")
 @ExtendWith(MTEExtension.class)
+@IntegrationEnvironment(networkMode = NetworkMode.LISTEN_SERVER)
 public class ClientConnectionTest {
     private static final Logger logger = LoggerFactory.getLogger(ClientConnectionTest.class);
 

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,10 +11,12 @@
 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.IntegrationEnvironment;
 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;
+import org.terasology.engine.network.NetworkMode;
 import org.terasology.engine.registry.In;
 import org.terasology.engine.world.WorldProvider;
 import org.terasology.engine.world.block.BlockManager;
@@ -23,6 +25,7 @@
 
 @Tag("MteTest")
 @ExtendWith(MTEExtension.class)
+@IntegrationEnvironment(networkMode = NetworkMode.LISTEN_SERVER)
 public class ExampleTest {
 
     @In

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
@@ -15,16 +15,19 @@
 import org.terasology.engine.entitySystem.entity.EntityRef;
 import org.terasology.engine.integrationenvironment.ModuleTestingHelper;
 import org.terasology.engine.integrationenvironment.TestEventReceiver;
+import org.terasology.engine.integrationenvironment.jupiter.IntegrationEnvironment;
 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;
+import org.terasology.engine.network.NetworkMode;
 import org.terasology.engine.registry.In;
 
 import java.io.IOException;
 
 @Tag("MteTest")
 @ExtendWith(MTEExtension.class)
+@IntegrationEnvironment(networkMode = NetworkMode.LISTEN_SERVER)
 public class DelayManagerTest {
     private static final Logger logger = LoggerFactory.getLogger(DelayManagerTest.class);