refactor: MTETest annotations with new IntegrationEnvironment annotation

- follow-up of MovingBlocks/Terasology#5046
Terasology · Dec 18, 2022 · 5fd594e · 5fd594e
1 parent 026d3cc
commit 5fd594e
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 35 deletions.
diff --git a/src/test/java/org/terasology/namegenerator/CreatureNameGeneratorSystemTest.java b/src/test/java/org/terasology/namegenerator/CreatureNameGeneratorSystemTest.java
@@ -2,16 +2,13 @@
 // 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.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 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.integrationenvironment.jupiter.IntegrationEnvironment;
 import org.terasology.engine.logic.common.DisplayNameComponent;
 import org.terasology.engine.registry.In;
 import org.terasology.namegenerator.creature.CreatureNameComponent;
@@ -21,9 +18,7 @@
 /**
  * Tests {@link CreatureNameGeneratorSystem}
  */
-@ExtendWith(MTEExtension.class)
-@Dependencies("NameGenerator")
-@Tag("MteTest")
+@IntegrationEnvironment(dependencies = "NameGenerator")
 public class CreatureNameGeneratorSystemTest {
 
     private static final Logger logger = LoggerFactory.getLogger(CreatureNameGeneratorSystemTest.class);

diff --git a/src/test/java/org/terasology/namegenerator/CreatureNameProviderTest.java b/src/test/java/org/terasology/namegenerator/CreatureNameProviderTest.java
@@ -3,11 +3,8 @@
 
 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.engine.integrationenvironment.jupiter.Dependencies;
-import org.terasology.engine.integrationenvironment.jupiter.MTEExtension;
+import org.terasology.engine.integrationenvironment.jupiter.IntegrationEnvironment;
 import org.terasology.namegenerator.creature.CreatureAffinityVector;
 import org.terasology.namegenerator.creature.CreatureNameProvider;
 
@@ -16,9 +13,7 @@
 /**
  * Tests {@link CreatureNameProvider}
  */
-@Tag("MteTest")
-@ExtendWith(MTEExtension.class)
-@Dependencies("NameGenerator")
+@IntegrationEnvironment(dependencies = "NameGenerator")
 public class CreatureNameProviderTest {
 
     /**

diff --git a/src/test/java/org/terasology/namegenerator/RegionNameProviderTest.java b/src/test/java/org/terasology/namegenerator/RegionNameProviderTest.java
@@ -2,21 +2,16 @@
 // 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.engine.integrationenvironment.jupiter.Dependencies;
-import org.terasology.engine.integrationenvironment.jupiter.MTEExtension;
+import org.terasology.engine.integrationenvironment.jupiter.IntegrationEnvironment;
 import org.terasology.namegenerator.region.RegionNameProvider;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 
 /**
  * Tests {@link RegionNameProvider}
  */
-@Tag("MteTest")
-@ExtendWith(MTEExtension.class)
-@Dependencies("NameGenerator")
+@IntegrationEnvironment(dependencies = "NameGenerator")
 public class RegionNameProviderTest {
 
     /**

diff --git a/src/test/java/org/terasology/namegenerator/TownNameProviderTest.java b/src/test/java/org/terasology/namegenerator/TownNameProviderTest.java
@@ -3,13 +3,10 @@
 
 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.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.terasology.engine.integrationenvironment.jupiter.Dependencies;
-import org.terasology.engine.integrationenvironment.jupiter.MTEExtension;
+import org.terasology.engine.integrationenvironment.jupiter.IntegrationEnvironment;
 import org.terasology.namegenerator.town.TownAffinityVector;
 import org.terasology.namegenerator.town.TownNameProvider;
 
@@ -20,9 +17,7 @@
 /**
  * Tests {@link TownNameProvider}
  */
-@Tag("MteTest")
-@ExtendWith(MTEExtension.class)
-@Dependencies("NameGenerator")
+@IntegrationEnvironment(dependencies = "NameGenerator")
 public class TownNameProviderTest {
 
     private static final Logger logger = LoggerFactory.getLogger(TownNameProviderTest.class);

diff --git a/src/test/java/org/terasology/namegenerator/WaterNameProviderTest.java b/src/test/java/org/terasology/namegenerator/WaterNameProviderTest.java
@@ -2,21 +2,16 @@
 // 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.engine.integrationenvironment.jupiter.Dependencies;
-import org.terasology.engine.integrationenvironment.jupiter.MTEExtension;
+import org.terasology.engine.integrationenvironment.jupiter.IntegrationEnvironment;
 import org.terasology.namegenerator.waters.WaterNameProvider;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 
 /**
  * Tests {@link WaterNameProvider}
  */
-@Tag("MteTest")
-@ExtendWith(MTEExtension.class)
-@Dependencies("NameGenerator")
+@IntegrationEnvironment(dependencies = "NameGenerator")
 public class WaterNameProviderTest {
 
     /**