test: use ModuleTestingEnvironment provided by engine-tests (#36)

Terasology · Jun 7, 2022 · 026d3cc · 026d3cc
1 parent 069382d
commit 026d3cc
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 20 deletions.
diff --git a/module.txt b/module.txt
@@ -8,11 +8,6 @@
     {
       "id": "MarkovChains",
       "minVersion": "1.5.1"
-    },
-    {
-      "id": "ModuleTestingEnvironment",
-      "minVersion": "0.3.1",
-      "optional": true
     }
   ],
   "isServerSideOnly": false,

diff --git a/src/test/java/org/terasology/namegenerator/CreatureNameGeneratorSystemTest.java b/src/test/java/org/terasology/namegenerator/CreatureNameGeneratorSystemTest.java
@@ -1,4 +1,4 @@
-// Copyright 2021 The Terasology Foundation
+// Copyright 2022 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
 package org.terasology.namegenerator;
 
@@ -10,10 +10,10 @@
 import org.terasology.engine.entitySystem.entity.EntityRef;
 import org.terasology.engine.entitySystem.entity.internal.EngineEntityManager;
 import org.terasology.engine.entitySystem.entity.lifecycleEvents.OnAddedComponent;
+import org.terasology.engine.integrationenvironment.jupiter.Dependencies;
+import org.terasology.engine.integrationenvironment.jupiter.MTEExtension;
 import org.terasology.engine.logic.common.DisplayNameComponent;
 import org.terasology.engine.registry.In;
-import org.terasology.moduletestingenvironment.MTEExtension;
-import org.terasology.moduletestingenvironment.extension.Dependencies;
 import org.terasology.namegenerator.creature.CreatureNameComponent;
 import org.terasology.namegenerator.creature.CreatureNameGeneratorComponent;
 import org.terasology.namegenerator.creature.CreatureNameGeneratorSystem;

diff --git a/src/test/java/org/terasology/namegenerator/CreatureNameProviderTest.java b/src/test/java/org/terasology/namegenerator/CreatureNameProviderTest.java
@@ -1,13 +1,13 @@
-// Copyright 2021 The Terasology Foundation
+// Copyright 2022 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
 
 package org.terasology.namegenerator;
 
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.terasology.moduletestingenvironment.MTEExtension;
-import org.terasology.moduletestingenvironment.extension.Dependencies;
+import org.terasology.engine.integrationenvironment.jupiter.Dependencies;
+import org.terasology.engine.integrationenvironment.jupiter.MTEExtension;
 import org.terasology.namegenerator.creature.CreatureAffinityVector;
 import org.terasology.namegenerator.creature.CreatureNameProvider;
 

diff --git a/src/test/java/org/terasology/namegenerator/RegionNameProviderTest.java b/src/test/java/org/terasology/namegenerator/RegionNameProviderTest.java
@@ -1,12 +1,12 @@
-// Copyright 2021 The Terasology Foundation
+// Copyright 2022 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
 package org.terasology.namegenerator;
 
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.terasology.moduletestingenvironment.MTEExtension;
-import org.terasology.moduletestingenvironment.extension.Dependencies;
+import org.terasology.engine.integrationenvironment.jupiter.Dependencies;
+import org.terasology.engine.integrationenvironment.jupiter.MTEExtension;
 import org.terasology.namegenerator.region.RegionNameProvider;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;

diff --git a/src/test/java/org/terasology/namegenerator/TownNameProviderTest.java b/src/test/java/org/terasology/namegenerator/TownNameProviderTest.java
@@ -1,4 +1,4 @@
-// Copyright 2021 The Terasology Foundation
+// Copyright 2022 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
 
 package org.terasology.namegenerator;
@@ -8,8 +8,8 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.terasology.moduletestingenvironment.MTEExtension;
-import org.terasology.moduletestingenvironment.extension.Dependencies;
+import org.terasology.engine.integrationenvironment.jupiter.Dependencies;
+import org.terasology.engine.integrationenvironment.jupiter.MTEExtension;
 import org.terasology.namegenerator.town.TownAffinityVector;
 import org.terasology.namegenerator.town.TownNameProvider;
 

diff --git a/src/test/java/org/terasology/namegenerator/WaterNameProviderTest.java b/src/test/java/org/terasology/namegenerator/WaterNameProviderTest.java
@@ -1,12 +1,12 @@
-// Copyright 2021 The Terasology Foundation
+// Copyright 2022 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
 package org.terasology.namegenerator;
 
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.terasology.moduletestingenvironment.MTEExtension;
-import org.terasology.moduletestingenvironment.extension.Dependencies;
+import org.terasology.engine.integrationenvironment.jupiter.Dependencies;
+import org.terasology.engine.integrationenvironment.jupiter.MTEExtension;
 import org.terasology.namegenerator.waters.WaterNameProvider;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;