Merge branch 'develop' into perf/fasterNetworkShutdown

Author: keturn

.idea/inspectionProfiles/Terasology.xml

@@ -1,4 +1,4 @@
-// Copyright 2021 The Terasology Foundation
+// Copyright 2022 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
 package org.terasology.engine;
 
@@ -11,6 +11,7 @@
 import org.terasology.engine.audio.nullAudio.NullSound;
 import org.terasology.engine.audio.nullAudio.NullStreamingSound;
 import org.terasology.engine.config.Config;
+import org.terasology.engine.config.PlayerConfig;
 import org.terasology.engine.context.Context;
 import org.terasology.engine.core.ComponentSystemManager;
 import org.terasology.engine.core.EngineTime;
@@ -28,6 +29,7 @@
 import org.terasology.engine.entitySystem.entity.internal.EngineEntityManager;
 import org.terasology.engine.entitySystem.prefab.Prefab;
 import org.terasology.engine.entitySystem.prefab.internal.PojoPrefab;
+import org.terasology.engine.identity.storageServiceClient.StorageServiceWorker;
 import org.terasology.engine.logic.behavior.asset.BehaviorTree;
 import org.terasology.engine.network.NetworkSystem;
 import org.terasology.engine.network.internal.NetworkSystemImpl;
@@ -256,6 +258,8 @@ protected void setupConfig() {
         Config config = new Config(context);
         config.loadDefaults();
         context.put(Config.class, config);
+        context.put(StorageServiceWorker.class, mock(StorageServiceWorker.class));
+        context.put(PlayerConfig.class, mock(PlayerConfig.class));
     }
 
     @Override

engine-tests/src/main/java/org/terasology/engine/HeadlessEnvironment.java

@@ -33,8 +33,10 @@
 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;
 import org.terasology.engine.network.NetworkSystem;
 import org.terasology.engine.registry.CoreRegistry;
 import org.terasology.engine.rendering.opengl.ScreenGrabber;
@@ -80,8 +82,10 @@ public class Engines {
     PathManager pathManager;
     PathManagerProvider.Cleaner pathManagerCleaner;
     TerasologyEngine host;
+    private final NetworkMode networkMode;
 
-    public Engines(Set<String> dependencies, String worldGeneratorUri) {
+    public Engines(List<String> dependencies, String worldGeneratorUri, NetworkMode networkMode) {
+        this.networkMode = networkMode;
         this.dependencies.addAll(dependencies);
 
         if (worldGeneratorUri != null) {
@@ -97,7 +101,7 @@ public Engines(Set<String> dependencies, String worldGeneratorUri) {
     public void setup() {
         mockPathManager();
         try {
-            host = createHost();
+            host = createHost(networkMode);
         } catch (IOException e) {
             throw new UncheckedIOException(e);
         }
@@ -128,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
      */
@@ -256,11 +265,11 @@ protected void mockPathManager() {
         PathManagerProvider.setPathManager(pathManager);
     }
 
-    TerasologyEngine createHost() throws IOException {
+    TerasologyEngine createHost(NetworkMode networkMode) throws IOException {
         TerasologyEngine host = createHeadlessEngine();
         host.getFromEngineContext(SystemConfig.class).writeSaveGamesEnabled.set(false);
         host.subscribeToStateChange(new HeadlessStateChangeListener(host));
-        host.changeState(new TestingStateHeadlessSetup(dependencies, worldGeneratorUri));
+        host.changeState(new TestingStateHeadlessSetup(dependencies, worldGeneratorUri, networkMode));
 
         doneLoading = false;
         host.subscribeToStateChange(() -> {

engine-tests/src/main/java/org/terasology/engine/integrationenvironment/Engines.java

@@ -11,6 +11,7 @@
 import org.terasology.engine.core.TerasologyEngine;
 import org.terasology.engine.core.subsystem.headless.mode.StateHeadlessSetup;
 import org.terasology.engine.game.GameManifest;
+import org.terasology.engine.network.NetworkMode;
 import org.terasology.engine.world.time.WorldTime;
 import org.terasology.gestalt.naming.Name;
 
@@ -33,7 +34,8 @@ public class TestingStateHeadlessSetup extends StateHeadlessSetup {
         strictModuleRequirements = true;
     }
 
-    public TestingStateHeadlessSetup(Collection<String> dependencies, String worldGeneratorUri) {
+    public TestingStateHeadlessSetup(Collection<String> dependencies, String worldGeneratorUri, NetworkMode networkMode) {
+        super(networkMode);
         this.dependencies = dependencies;
         this.worldGeneratorUri = new SimpleUri(worldGeneratorUri);
         checkArgument(this.worldGeneratorUri.isValid(), "Not a valid URI `%s`", worldGeneratorUri);

engine-tests/src/main/java/org/terasology/engine/integrationenvironment/Scopes.java

@@ -0,0 +1,17 @@
+// Copyright 2022 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+package org.terasology.engine.integrationenvironment.jupiter;
+
+import org.terasology.engine.network.NetworkMode;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface IntegrationEnvironment {
+    NetworkMode networkMode() default NetworkMode.NONE;
+}