temp: gestalt-di migration changes

src/main/java/org/terasology/moduletestingenvironment/Engines.java

@@ -69,7 +69,7 @@
 public class Engines {
     private static final Logger logger = LoggerFactory.getLogger(Engines.class);
 
-    protected final Set<String> dependencies = Sets.newHashSet("engine");
+    protected final Set<String> dependencies = Sets.newHashSet("engine", "unittest");
     protected String worldGeneratorUri = ModuleTestingEnvironment.DEFAULT_WORLD_GENERATOR;
     protected boolean doneLoading;
     protected Context hostContext;
@@ -236,13 +236,17 @@
                 logger.info("Install path does not appear to be a module: {}", installPath);
             }
         } catch (IOException e) {
             logger.warn("Could not read install path as module at " + installPath);
         }
     }
 
     protected void mockPathManager() {
         PathManager originalPathManager = PathManager.getInstance();
-        pathManager = Mockito.spy(originalPathManager);
+        if (org.mockito.Mockito.mockingDetails(originalPathManager).isMock()) {
+            pathManager = originalPathManager;
+        } else {
+            pathManager = Mockito.spy(originalPathManager);
+        }
         Mockito.when(pathManager.getModulePaths()).thenReturn(Collections.emptyList());
         pathManagerCleaner = new PathManagerProvider.Cleaner(originalPathManager, pathManager);
         PathManagerProvider.setPathManager(pathManager);
@@ -257,7 +261,7 @@
         doneLoading = false;
         terasologyEngine.subscribeToStateChange(() -> {
             GameState newState = terasologyEngine.getState();
             logger.debug("New engine state is {}", terasologyEngine.getState());
             if (newState instanceof StateIngame) {
                 hostContext = newState.getContext();
                 if (hostContext == null) {
@@ -283,18 +287,20 @@
     }
 
     void connectToHost(TerasologyEngine client, MainLoop mainLoop) {
-        CoreRegistry.put(Config.class, client.getFromEngineContext(Config.class));
+        Context clientContext = client.createChildContext();
+        clientContext.put(Config.class, client.getFromEngineContext(Config.class));
+        CoreRegistry.setContext(clientContext);
         JoinStatus joinStatus = null;
         try {
-            joinStatus = client.getFromEngineContext(NetworkSystem.class).join("localhost", 25777);
+            joinStatus = clientContext.get(NetworkSystem.class).join("localhost", 25777);
         } catch (InterruptedException e) {
             logger.warn("Interrupted while joining: ", e);
         }
 
         client.changeState(new StateLoading(joinStatus));
-        CoreRegistry.put(GameEngine.class, client);
+        clientContext.put(GameEngine.class, client);
 
         // TODO: subscribe to state change and return an asynchronous result
         //     so that we don't need to pass mainLoop to here.
         mainLoop.runUntil(() -> client.getState() instanceof StateIngame);
     }