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

Terasology · Jun 7, 2022 · 963bcb5 · 963bcb5
1 parent d7bb176
commit 963bcb5
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 23 deletions.
diff --git a/module.txt b/module.txt
@@ -6,11 +6,6 @@
     "displayName": "Health",
     "description": "Adds the concept of health (or hitpoints) to the game and handles regeneration, restoration and damage of entities.",
     "dependencies": [
-        {
-            "id": "ModuleTestingEnvironment",
-            "minVersion": "0.3.0",
-            "optional": true
-        },
         {
             "id": "CoreAssets",
             "minVersion": "2.0.1"

diff --git a/src/test/java/org/terasology/module/health/BlockTest.java b/src/test/java/org/terasology/module/health/BlockTest.java
@@ -1,4 +1,4 @@
-// Copyright 2021 The Terasology Foundation
+// Copyright 2022 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
 
 package org.terasology.module.health;
@@ -12,6 +12,9 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.terasology.engine.core.Time;
 import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.integrationenvironment.ModuleTestingHelper;
+import org.terasology.engine.integrationenvironment.jupiter.Dependencies;
+import org.terasology.engine.integrationenvironment.jupiter.MTEExtension;
 import org.terasology.engine.logic.characters.events.AttackEvent;
 import org.terasology.engine.registry.In;
 import org.terasology.engine.world.BlockEntityRegistry;
@@ -20,9 +23,6 @@
 import org.terasology.engine.world.block.BlockManager;
 import org.terasology.module.health.components.BlockDamagedComponent;
 import org.terasology.module.health.components.RegenComponent;
-import org.terasology.moduletestingenvironment.MTEExtension;
-import org.terasology.moduletestingenvironment.ModuleTestingHelper;
-import org.terasology.moduletestingenvironment.extension.Dependencies;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;

diff --git a/src/test/java/org/terasology/module/health/DamageEventTest.java b/src/test/java/org/terasology/module/health/DamageEventTest.java
@@ -1,4 +1,4 @@
-// Copyright 2021 The Terasology Foundation
+// Copyright 2022 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
 
 package org.terasology.module.health;
@@ -8,16 +8,16 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.terasology.engine.entitySystem.entity.EntityManager;
 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.Dependencies;
+import org.terasology.engine.integrationenvironment.jupiter.MTEExtension;
 import org.terasology.engine.logic.health.EngineDamageTypes;
 import org.terasology.engine.logic.players.PlayerCharacterComponent;
 import org.terasology.engine.registry.In;
 import org.terasology.module.health.components.HealthComponent;
 import org.terasology.module.health.events.BeforeDamagedEvent;
 import org.terasology.module.health.events.DoDamageEvent;
-import org.terasology.moduletestingenvironment.MTEExtension;
-import org.terasology.moduletestingenvironment.ModuleTestingHelper;
-import org.terasology.moduletestingenvironment.TestEventReceiver;
-import org.terasology.moduletestingenvironment.extension.Dependencies;
 
 import java.util.List;
 

diff --git a/src/test/java/org/terasology/module/health/RestorationTest.java b/src/test/java/org/terasology/module/health/RestorationTest.java
@@ -1,4 +1,4 @@
-// Copyright 2021 The Terasology Foundation
+// Copyright 2022 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
 package org.terasology.module.health;
 
@@ -7,15 +7,15 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.terasology.engine.entitySystem.entity.EntityManager;
 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.Dependencies;
+import org.terasology.engine.integrationenvironment.jupiter.MTEExtension;
 import org.terasology.engine.logic.players.PlayerCharacterComponent;
 import org.terasology.engine.registry.In;
 import org.terasology.module.health.components.HealthComponent;
 import org.terasology.module.health.events.BeforeRestoreEvent;
 import org.terasology.module.health.events.DoRestoreEvent;
-import org.terasology.moduletestingenvironment.MTEExtension;
-import org.terasology.moduletestingenvironment.ModuleTestingHelper;
-import org.terasology.moduletestingenvironment.TestEventReceiver;
-import org.terasology.moduletestingenvironment.extension.Dependencies;
 
 import java.util.List;
 

diff --git a/src/test/java/org/terasology/module/health/systems/RegenTest.java b/src/test/java/org/terasology/module/health/systems/RegenTest.java
@@ -1,4 +1,4 @@
-// Copyright 2021 The Terasology Foundation
+// Copyright 2022 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
 
 package org.terasology.module.health.systems;
@@ -9,6 +9,9 @@
 import org.terasology.engine.core.Time;
 import org.terasology.engine.entitySystem.entity.EntityManager;
 import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.integrationenvironment.ModuleTestingHelper;
+import org.terasology.engine.integrationenvironment.jupiter.Dependencies;
+import org.terasology.engine.integrationenvironment.jupiter.MTEExtension;
 import org.terasology.engine.logic.players.PlayerCharacterComponent;
 import org.terasology.engine.registry.In;
 import org.terasology.module.health.components.HealthComponent;
@@ -17,9 +20,6 @@
 import org.terasology.module.health.core.BaseRegenComponent;
 import org.terasology.module.health.events.DeregisterRegenEvent;
 import org.terasology.module.health.events.DoDamageEvent;
-import org.terasology.moduletestingenvironment.MTEExtension;
-import org.terasology.moduletestingenvironment.ModuleTestingHelper;
-import org.terasology.moduletestingenvironment.extension.Dependencies;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;