From 9cdfac78988fd1ea6a464796a6f9e39839b96490 Mon Sep 17 00:00:00 2001 From: austin Date: Thu, 5 Sep 2024 14:43:31 -0400 Subject: [PATCH] refactor java test package --- docs/src/progress/currenttarget.md | 1 - src/test/java/annotations/FastSetup.java | 5 ----- .../audio/collision/HitboxAudioServiceUnitTests.java | 5 +++-- .../engine/loadingthreads/ViewportLoadingTests.java | 6 +++--- .../electrosphere/engine/service/ServiceManagerTests.java | 2 +- .../electrosphere/engine/signal/SignalSystemTests.java | 2 +- .../electrosphere/entity/ServerEntityUtilsUnitTests.java | 2 +- .../java/electrosphere/entity/SpawningCreaturesTest.java | 6 +++--- .../entity/state/attack/ServerAttackTreeTests.java | 6 +++--- .../state/collidable/ClientCollidableTreeTests.java | 6 +++--- .../state/collidable/ServerCollidableTreeTests.java | 6 +++--- .../entity/state/equip/ClientEquipStateTests.java | 8 ++++---- .../entity/state/equip/ServerEquipStateTests.java | 6 +++--- .../entity/types/attach/AttachUtilsUnitTests.java | 4 ++-- .../entity/types/camera/CameraEntityUtilsUnitTests.java | 4 ++-- .../entity/types/item/ItemUtilsUnitTests.java | 4 ++-- .../electrosphere/renderer/ui/elements/WindowTest.java | 6 +++--- .../ai/nodes/actions/combat/MeleeTargetingNodeTests.java | 4 ++-- .../server/datacell/ViewportDataCellManagerUnitTests.java | 4 ++-- .../{ => electrosphere/test}/annotations/BigDataTest.java | 2 +- .../java/electrosphere/test/annotations/FastSetup.java | 5 +++++ .../{ => electrosphere/test}/annotations/FastTest.java | 2 +- .../test}/annotations/IntegrationSetup.java | 2 +- .../test}/annotations/IntegrationTeardown.java | 2 +- .../test}/annotations/IntegrationTest.java | 2 +- .../{ => electrosphere/test}/annotations/UnitTest.java | 2 +- .../{ => electrosphere/test}/integration/StartupTest.java | 6 +++--- .../test}/template/EntityTestTemplate.java | 4 ++-- .../test}/template/RenderingTestTemplate.java | 6 +++--- .../test}/template/extensions/EntityExtension.java | 6 +++--- .../test}/template/extensions/RenderingExtension.java | 4 ++-- .../{ => electrosphere/test}/testutils/EngineInit.java | 2 +- .../java/{ => electrosphere/test}/testutils/InputAPI.java | 2 +- .../test}/testutils/TestEngineUtils.java | 2 +- .../test}/testutils/TestEntityUtils.java | 2 +- .../test}/testutils/TestRenderingUtils.java | 2 +- .../test}/testutils/TestViewportUtils.java | 2 +- src/test/java/electrosphere/util/ds/OctreeTests.java | 4 ++-- 38 files changed, 73 insertions(+), 73 deletions(-) delete mode 100644 src/test/java/annotations/FastSetup.java rename src/test/java/{ => electrosphere/test}/annotations/BigDataTest.java (94%) create mode 100644 src/test/java/electrosphere/test/annotations/FastSetup.java rename src/test/java/{ => electrosphere/test}/annotations/FastTest.java (94%) rename src/test/java/{ => electrosphere/test}/annotations/IntegrationSetup.java (92%) rename src/test/java/{ => electrosphere/test}/annotations/IntegrationTeardown.java (92%) rename src/test/java/{ => electrosphere/test}/annotations/IntegrationTest.java (94%) rename src/test/java/{ => electrosphere/test}/annotations/UnitTest.java (90%) rename src/test/java/{ => electrosphere/test}/integration/StartupTest.java (76%) rename src/test/java/{ => electrosphere/test}/template/EntityTestTemplate.java (74%) rename src/test/java/{ => electrosphere/test}/template/RenderingTestTemplate.java (88%) rename src/test/java/{ => electrosphere/test}/template/extensions/EntityExtension.java (82%) rename src/test/java/{ => electrosphere/test}/template/extensions/RenderingExtension.java (89%) rename src/test/java/{ => electrosphere/test}/testutils/EngineInit.java (98%) rename src/test/java/{ => electrosphere/test}/testutils/InputAPI.java (95%) rename src/test/java/{ => electrosphere/test}/testutils/TestEngineUtils.java (97%) rename src/test/java/{ => electrosphere/test}/testutils/TestEntityUtils.java (98%) rename src/test/java/{ => electrosphere/test}/testutils/TestRenderingUtils.java (98%) rename src/test/java/{ => electrosphere/test}/testutils/TestViewportUtils.java (98%) diff --git a/docs/src/progress/currenttarget.md b/docs/src/progress/currenttarget.md index bb2071d4..fd9a1a6a 100644 --- a/docs/src/progress/currenttarget.md +++ b/docs/src/progress/currenttarget.md @@ -25,5 +25,4 @@ Fix grass rendering distance + unreproducible bugs - Fix entities running to edge of map causing audio engine to break Fix being unable to jump sometimes (usually when pick up sword) diff --git a/src/test/java/annotations/FastSetup.java b/src/test/java/annotations/FastSetup.java deleted file mode 100644 index 4eb093ae..00000000 --- a/src/test/java/annotations/FastSetup.java +++ /dev/null @@ -1,5 +0,0 @@ -package annotations; - -public class FastSetup { - -} diff --git a/src/test/java/electrosphere/audio/collision/HitboxAudioServiceUnitTests.java b/src/test/java/electrosphere/audio/collision/HitboxAudioServiceUnitTests.java index 51792949..3590b336 100644 --- a/src/test/java/electrosphere/audio/collision/HitboxAudioServiceUnitTests.java +++ b/src/test/java/electrosphere/audio/collision/HitboxAudioServiceUnitTests.java @@ -2,8 +2,9 @@ package electrosphere.audio.collision; import org.junit.jupiter.api.Assertions; -import annotations.FastTest; -import annotations.UnitTest; +import electrosphere.test.annotations.UnitTest; +import electrosphere.test.annotations.FastTest; + /** * Unit tests for hitbox audio service diff --git a/src/test/java/electrosphere/engine/loadingthreads/ViewportLoadingTests.java b/src/test/java/electrosphere/engine/loadingthreads/ViewportLoadingTests.java index 842ab9ff..13d38fa8 100644 --- a/src/test/java/electrosphere/engine/loadingthreads/ViewportLoadingTests.java +++ b/src/test/java/electrosphere/engine/loadingthreads/ViewportLoadingTests.java @@ -2,10 +2,10 @@ package electrosphere.engine.loadingthreads; import org.junit.jupiter.api.Assertions; -import annotations.IntegrationTest; +import electrosphere.test.annotations.IntegrationTest; import electrosphere.engine.Main; -import testutils.EngineInit; -import testutils.TestEngineUtils; +import electrosphere.test.testutils.EngineInit; +import electrosphere.test.testutils.TestEngineUtils; /** * Tests loading viewport diff --git a/src/test/java/electrosphere/engine/service/ServiceManagerTests.java b/src/test/java/electrosphere/engine/service/ServiceManagerTests.java index 265cf362..48ef1626 100644 --- a/src/test/java/electrosphere/engine/service/ServiceManagerTests.java +++ b/src/test/java/electrosphere/engine/service/ServiceManagerTests.java @@ -5,7 +5,7 @@ import static org.junit.jupiter.api.Assertions.*; import org.junit.jupiter.api.BeforeEach; import org.mockito.Mockito; -import annotations.UnitTest; +import electrosphere.test.annotations.UnitTest; import electrosphere.logger.Logger; import electrosphere.logger.LoggerInterface; diff --git a/src/test/java/electrosphere/engine/signal/SignalSystemTests.java b/src/test/java/electrosphere/engine/signal/SignalSystemTests.java index 0a5a97ac..863aff7f 100644 --- a/src/test/java/electrosphere/engine/signal/SignalSystemTests.java +++ b/src/test/java/electrosphere/engine/signal/SignalSystemTests.java @@ -4,7 +4,7 @@ import org.junit.jupiter.api.BeforeEach; import org.mockito.ArgumentCaptor; import org.mockito.Mockito; -import annotations.UnitTest; +import electrosphere.test.annotations.UnitTest; import electrosphere.engine.signal.Signal.SignalType; import electrosphere.logger.Logger; import electrosphere.logger.LoggerInterface; diff --git a/src/test/java/electrosphere/entity/ServerEntityUtilsUnitTests.java b/src/test/java/electrosphere/entity/ServerEntityUtilsUnitTests.java index af063f14..47e8004c 100644 --- a/src/test/java/electrosphere/entity/ServerEntityUtilsUnitTests.java +++ b/src/test/java/electrosphere/entity/ServerEntityUtilsUnitTests.java @@ -4,7 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.joml.Vector3d; -import annotations.UnitTest; +import electrosphere.test.annotations.UnitTest; import electrosphere.engine.Globals; import electrosphere.server.datacell.Realm; import electrosphere.server.datacell.RealmManager; diff --git a/src/test/java/electrosphere/entity/SpawningCreaturesTest.java b/src/test/java/electrosphere/entity/SpawningCreaturesTest.java index c37880bd..e3898fd2 100644 --- a/src/test/java/electrosphere/entity/SpawningCreaturesTest.java +++ b/src/test/java/electrosphere/entity/SpawningCreaturesTest.java @@ -4,12 +4,12 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.joml.Vector3d; -import annotations.IntegrationTest; +import electrosphere.test.annotations.IntegrationTest; import electrosphere.engine.Globals; import electrosphere.entity.types.creature.CreatureTemplate; import electrosphere.entity.types.creature.CreatureUtils; -import template.EntityTestTemplate; -import testutils.TestEntityUtils; +import electrosphere.test.template.EntityTestTemplate; +import electrosphere.test.testutils.TestEntityUtils; /** * Basic entity spawning integration tests diff --git a/src/test/java/electrosphere/entity/state/attack/ServerAttackTreeTests.java b/src/test/java/electrosphere/entity/state/attack/ServerAttackTreeTests.java index 508d8c85..04e2ea5d 100644 --- a/src/test/java/electrosphere/entity/state/attack/ServerAttackTreeTests.java +++ b/src/test/java/electrosphere/entity/state/attack/ServerAttackTreeTests.java @@ -5,7 +5,7 @@ import static org.junit.jupiter.api.Assertions.assertNotEquals; import org.joml.Vector3d; -import annotations.IntegrationTest; +import electrosphere.test.annotations.IntegrationTest; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.state.attack.ClientAttackTree.AttackTreeState; @@ -15,8 +15,8 @@ import electrosphere.entity.state.movement.fall.ServerFallTree; import electrosphere.entity.types.creature.CreatureTemplate; import electrosphere.entity.types.creature.CreatureUtils; import electrosphere.entity.types.item.ItemUtils; -import template.EntityTestTemplate; -import testutils.TestEngineUtils; +import electrosphere.test.template.EntityTestTemplate; +import electrosphere.test.testutils.TestEngineUtils; /** * Testing the client's attacking trees diff --git a/src/test/java/electrosphere/entity/state/collidable/ClientCollidableTreeTests.java b/src/test/java/electrosphere/entity/state/collidable/ClientCollidableTreeTests.java index 9ecd2396..73413365 100644 --- a/src/test/java/electrosphere/entity/state/collidable/ClientCollidableTreeTests.java +++ b/src/test/java/electrosphere/entity/state/collidable/ClientCollidableTreeTests.java @@ -4,15 +4,15 @@ import static org.junit.jupiter.api.Assertions.*; import org.joml.Vector3d; -import annotations.IntegrationTest; +import electrosphere.test.annotations.IntegrationTest; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.EntityTags; import electrosphere.entity.state.movement.fall.ClientFallTree; import electrosphere.entity.types.creature.CreatureTemplate; import electrosphere.entity.types.creature.CreatureUtils; -import template.EntityTestTemplate; -import testutils.TestEngineUtils; +import electrosphere.test.template.EntityTestTemplate; +import electrosphere.test.testutils.TestEngineUtils; /** * Tests for the client collidable component diff --git a/src/test/java/electrosphere/entity/state/collidable/ServerCollidableTreeTests.java b/src/test/java/electrosphere/entity/state/collidable/ServerCollidableTreeTests.java index 58c9afdf..310f1d37 100644 --- a/src/test/java/electrosphere/entity/state/collidable/ServerCollidableTreeTests.java +++ b/src/test/java/electrosphere/entity/state/collidable/ServerCollidableTreeTests.java @@ -4,14 +4,14 @@ import static org.junit.jupiter.api.Assertions.*; import org.joml.Vector3d; -import annotations.IntegrationTest; +import electrosphere.test.annotations.IntegrationTest; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.state.movement.fall.ServerFallTree; import electrosphere.entity.types.creature.CreatureTemplate; import electrosphere.entity.types.creature.CreatureUtils; -import template.EntityTestTemplate; -import testutils.TestEngineUtils; +import electrosphere.test.template.EntityTestTemplate; +import electrosphere.test.testutils.TestEngineUtils; /** * Tests for the server collidable tree diff --git a/src/test/java/electrosphere/entity/state/equip/ClientEquipStateTests.java b/src/test/java/electrosphere/entity/state/equip/ClientEquipStateTests.java index 85171c14..6c6ad673 100644 --- a/src/test/java/electrosphere/entity/state/equip/ClientEquipStateTests.java +++ b/src/test/java/electrosphere/entity/state/equip/ClientEquipStateTests.java @@ -8,7 +8,7 @@ import java.util.Set; import org.joml.Vector3d; -import annotations.IntegrationTest; +import electrosphere.test.annotations.IntegrationTest; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.EntityTags; @@ -18,9 +18,9 @@ import electrosphere.entity.types.attach.AttachUtils; import electrosphere.entity.types.creature.CreatureTemplate; import electrosphere.entity.types.creature.CreatureUtils; import electrosphere.entity.types.item.ItemUtils; -import template.EntityTestTemplate; -import testutils.TestEngineUtils; -import testutils.TestViewportUtils; +import electrosphere.test.template.EntityTestTemplate; +import electrosphere.test.testutils.TestEngineUtils; +import electrosphere.test.testutils.TestViewportUtils; /** * Tests for client side equip state diff --git a/src/test/java/electrosphere/entity/state/equip/ServerEquipStateTests.java b/src/test/java/electrosphere/entity/state/equip/ServerEquipStateTests.java index e7e8e1f9..bff6be4f 100644 --- a/src/test/java/electrosphere/entity/state/equip/ServerEquipStateTests.java +++ b/src/test/java/electrosphere/entity/state/equip/ServerEquipStateTests.java @@ -8,7 +8,7 @@ import java.util.List; import org.joml.Vector3d; -import annotations.IntegrationTest; +import electrosphere.test.annotations.IntegrationTest; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.state.inventory.InventoryUtils; @@ -16,8 +16,8 @@ import electrosphere.entity.types.attach.AttachUtils; import electrosphere.entity.types.creature.CreatureTemplate; import electrosphere.entity.types.creature.CreatureUtils; import electrosphere.entity.types.item.ItemUtils; -import template.EntityTestTemplate; -import testutils.TestEngineUtils; +import electrosphere.test.template.EntityTestTemplate; +import electrosphere.test.testutils.TestEngineUtils; /** * Server equip state tests diff --git a/src/test/java/electrosphere/entity/types/attach/AttachUtilsUnitTests.java b/src/test/java/electrosphere/entity/types/attach/AttachUtilsUnitTests.java index 27125e21..7c86230f 100644 --- a/src/test/java/electrosphere/entity/types/attach/AttachUtilsUnitTests.java +++ b/src/test/java/electrosphere/entity/types/attach/AttachUtilsUnitTests.java @@ -2,8 +2,8 @@ package electrosphere.entity.types.attach; import org.junit.jupiter.api.Assertions; -import annotations.FastTest; -import annotations.UnitTest; +import electrosphere.test.annotations.FastTest; +import electrosphere.test.annotations.UnitTest; import electrosphere.entity.Entity; import electrosphere.entity.EntityCreationUtils; import electrosphere.entity.EntityDataStrings; diff --git a/src/test/java/electrosphere/entity/types/camera/CameraEntityUtilsUnitTests.java b/src/test/java/electrosphere/entity/types/camera/CameraEntityUtilsUnitTests.java index 9d2686cb..b5062605 100644 --- a/src/test/java/electrosphere/entity/types/camera/CameraEntityUtilsUnitTests.java +++ b/src/test/java/electrosphere/entity/types/camera/CameraEntityUtilsUnitTests.java @@ -2,8 +2,8 @@ package electrosphere.entity.types.camera; import org.junit.jupiter.api.Assertions; -import annotations.FastTest; -import annotations.UnitTest; +import electrosphere.test.annotations.FastTest; +import electrosphere.test.annotations.UnitTest; /** * Camera entity utils unit tests diff --git a/src/test/java/electrosphere/entity/types/item/ItemUtilsUnitTests.java b/src/test/java/electrosphere/entity/types/item/ItemUtilsUnitTests.java index 25eb5032..3894df78 100644 --- a/src/test/java/electrosphere/entity/types/item/ItemUtilsUnitTests.java +++ b/src/test/java/electrosphere/entity/types/item/ItemUtilsUnitTests.java @@ -2,8 +2,8 @@ package electrosphere.entity.types.item; import org.junit.jupiter.api.Assertions; -import annotations.FastTest; -import annotations.UnitTest; +import electrosphere.test.annotations.FastTest; +import electrosphere.test.annotations.UnitTest; import electrosphere.entity.Entity; import electrosphere.entity.EntityCreationUtils; import electrosphere.entity.EntityDataStrings; diff --git a/src/test/java/electrosphere/renderer/ui/elements/WindowTest.java b/src/test/java/electrosphere/renderer/ui/elements/WindowTest.java index 8c15dc17..9088573d 100644 --- a/src/test/java/electrosphere/renderer/ui/elements/WindowTest.java +++ b/src/test/java/electrosphere/renderer/ui/elements/WindowTest.java @@ -2,11 +2,11 @@ package electrosphere.renderer.ui.elements; import org.junit.jupiter.api.Disabled; -import annotations.IntegrationTest; +import electrosphere.test.annotations.IntegrationTest; import electrosphere.menu.WindowUtils; import electrosphere.menu.mainmenu.MenuGeneratorsUITesting; -import template.RenderingTestTemplate; -import testutils.TestEngineUtils; +import electrosphere.test.template.RenderingTestTemplate; +import electrosphere.test.testutils.TestEngineUtils; /** * Tests for the window class diff --git a/src/test/java/electrosphere/server/ai/nodes/actions/combat/MeleeTargetingNodeTests.java b/src/test/java/electrosphere/server/ai/nodes/actions/combat/MeleeTargetingNodeTests.java index d9c02116..5d6c6db3 100644 --- a/src/test/java/electrosphere/server/ai/nodes/actions/combat/MeleeTargetingNodeTests.java +++ b/src/test/java/electrosphere/server/ai/nodes/actions/combat/MeleeTargetingNodeTests.java @@ -4,7 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.joml.Vector3d; -import annotations.IntegrationTest; +import electrosphere.test.annotations.IntegrationTest; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.ServerEntityUtils; @@ -13,7 +13,7 @@ import electrosphere.entity.types.creature.CreatureUtils; import electrosphere.server.ai.blackboard.Blackboard; import electrosphere.server.ai.nodes.AITreeNode.AITreeNodeResult; import electrosphere.server.content.unit.UnitUtils; -import template.EntityTestTemplate; +import electrosphere.test.template.EntityTestTemplate; /** * Tests for the melee targeting ai node diff --git a/src/test/java/electrosphere/server/datacell/ViewportDataCellManagerUnitTests.java b/src/test/java/electrosphere/server/datacell/ViewportDataCellManagerUnitTests.java index 00d24430..08515218 100644 --- a/src/test/java/electrosphere/server/datacell/ViewportDataCellManagerUnitTests.java +++ b/src/test/java/electrosphere/server/datacell/ViewportDataCellManagerUnitTests.java @@ -2,8 +2,8 @@ package electrosphere.server.datacell; import static org.junit.jupiter.api.Assertions.assertEquals; -import annotations.FastTest; -import annotations.UnitTest; +import electrosphere.test.annotations.FastTest; +import electrosphere.test.annotations.UnitTest; /** * Unit tests for viewport data cell manager diff --git a/src/test/java/annotations/BigDataTest.java b/src/test/java/electrosphere/test/annotations/BigDataTest.java similarity index 94% rename from src/test/java/annotations/BigDataTest.java rename to src/test/java/electrosphere/test/annotations/BigDataTest.java index 089a032e..09c2a2e0 100644 --- a/src/test/java/annotations/BigDataTest.java +++ b/src/test/java/electrosphere/test/annotations/BigDataTest.java @@ -1,4 +1,4 @@ -package annotations; +package electrosphere.test.annotations; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/src/test/java/electrosphere/test/annotations/FastSetup.java b/src/test/java/electrosphere/test/annotations/FastSetup.java new file mode 100644 index 00000000..62f5fe9c --- /dev/null +++ b/src/test/java/electrosphere/test/annotations/FastSetup.java @@ -0,0 +1,5 @@ +package electrosphere.test.annotations; + +public class FastSetup { + +} diff --git a/src/test/java/annotations/FastTest.java b/src/test/java/electrosphere/test/annotations/FastTest.java similarity index 94% rename from src/test/java/annotations/FastTest.java rename to src/test/java/electrosphere/test/annotations/FastTest.java index fb583f96..561f19d6 100644 --- a/src/test/java/annotations/FastTest.java +++ b/src/test/java/electrosphere/test/annotations/FastTest.java @@ -1,4 +1,4 @@ -package annotations; +package electrosphere.test.annotations; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/src/test/java/annotations/IntegrationSetup.java b/src/test/java/electrosphere/test/annotations/IntegrationSetup.java similarity index 92% rename from src/test/java/annotations/IntegrationSetup.java rename to src/test/java/electrosphere/test/annotations/IntegrationSetup.java index 3998f62d..4b42c740 100644 --- a/src/test/java/annotations/IntegrationSetup.java +++ b/src/test/java/electrosphere/test/annotations/IntegrationSetup.java @@ -1,4 +1,4 @@ -package annotations; +package electrosphere.test.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/test/java/annotations/IntegrationTeardown.java b/src/test/java/electrosphere/test/annotations/IntegrationTeardown.java similarity index 92% rename from src/test/java/annotations/IntegrationTeardown.java rename to src/test/java/electrosphere/test/annotations/IntegrationTeardown.java index 5c4e50e2..4f9a5950 100644 --- a/src/test/java/annotations/IntegrationTeardown.java +++ b/src/test/java/electrosphere/test/annotations/IntegrationTeardown.java @@ -1,4 +1,4 @@ -package annotations; +package electrosphere.test.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/test/java/annotations/IntegrationTest.java b/src/test/java/electrosphere/test/annotations/IntegrationTest.java similarity index 94% rename from src/test/java/annotations/IntegrationTest.java rename to src/test/java/electrosphere/test/annotations/IntegrationTest.java index 8c125369..c1d56942 100644 --- a/src/test/java/annotations/IntegrationTest.java +++ b/src/test/java/electrosphere/test/annotations/IntegrationTest.java @@ -1,4 +1,4 @@ -package annotations; +package electrosphere.test.annotations; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/src/test/java/annotations/UnitTest.java b/src/test/java/electrosphere/test/annotations/UnitTest.java similarity index 90% rename from src/test/java/annotations/UnitTest.java rename to src/test/java/electrosphere/test/annotations/UnitTest.java index 8d072b54..ecd8cbd7 100644 --- a/src/test/java/annotations/UnitTest.java +++ b/src/test/java/electrosphere/test/annotations/UnitTest.java @@ -1,4 +1,4 @@ -package annotations; +package electrosphere.test.annotations; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/src/test/java/integration/StartupTest.java b/src/test/java/electrosphere/test/integration/StartupTest.java similarity index 76% rename from src/test/java/integration/StartupTest.java rename to src/test/java/electrosphere/test/integration/StartupTest.java index f594bbe2..ae02b859 100644 --- a/src/test/java/integration/StartupTest.java +++ b/src/test/java/electrosphere/test/integration/StartupTest.java @@ -1,7 +1,7 @@ -package integration; +package electrosphere.test.integration; -import annotations.IntegrationSetup; -import annotations.IntegrationTest; +import electrosphere.test.annotations.IntegrationSetup; +import electrosphere.test.annotations.IntegrationTest; import electrosphere.engine.Globals; import electrosphere.engine.profiler.Profiler; import electrosphere.net.NetUtils; diff --git a/src/test/java/template/EntityTestTemplate.java b/src/test/java/electrosphere/test/template/EntityTestTemplate.java similarity index 74% rename from src/test/java/template/EntityTestTemplate.java rename to src/test/java/electrosphere/test/template/EntityTestTemplate.java index 78a1a9e0..96c5bc8b 100644 --- a/src/test/java/template/EntityTestTemplate.java +++ b/src/test/java/electrosphere/test/template/EntityTestTemplate.java @@ -1,9 +1,9 @@ -package template; +package electrosphere.test.template; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.extension.ExtendWith; -import template.extensions.EntityExtension; +import electrosphere.test.template.extensions.EntityExtension; /** * Template for writing tests that do stuff with entities in a proper scene diff --git a/src/test/java/template/RenderingTestTemplate.java b/src/test/java/electrosphere/test/template/RenderingTestTemplate.java similarity index 88% rename from src/test/java/template/RenderingTestTemplate.java rename to src/test/java/electrosphere/test/template/RenderingTestTemplate.java index 0df17ffe..6cb1b6a7 100644 --- a/src/test/java/template/RenderingTestTemplate.java +++ b/src/test/java/electrosphere/test/template/RenderingTestTemplate.java @@ -1,12 +1,12 @@ -package template; +package electrosphere.test.template; import java.io.File; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.extension.ExtendWith; -import template.extensions.RenderingExtension; -import testutils.TestRenderingUtils; +import electrosphere.test.template.extensions.RenderingExtension; +import electrosphere.test.testutils.TestRenderingUtils; /** * A test class that involves testing renders diff --git a/src/test/java/template/extensions/EntityExtension.java b/src/test/java/electrosphere/test/template/extensions/EntityExtension.java similarity index 82% rename from src/test/java/template/extensions/EntityExtension.java rename to src/test/java/electrosphere/test/template/extensions/EntityExtension.java index a14ab3b1..f1651043 100644 --- a/src/test/java/template/extensions/EntityExtension.java +++ b/src/test/java/electrosphere/test/template/extensions/EntityExtension.java @@ -1,12 +1,12 @@ -package template.extensions; +package electrosphere.test.template.extensions; import org.junit.jupiter.api.extension.AfterEachCallback; import org.junit.jupiter.api.extension.BeforeEachCallback; import org.junit.jupiter.api.extension.ExtensionContext; import electrosphere.engine.Main; -import testutils.EngineInit; -import testutils.TestEngineUtils; +import electrosphere.test.testutils.EngineInit; +import electrosphere.test.testutils.TestEngineUtils; /** * Spins up and tears down entity testing environment diff --git a/src/test/java/template/extensions/RenderingExtension.java b/src/test/java/electrosphere/test/template/extensions/RenderingExtension.java similarity index 89% rename from src/test/java/template/extensions/RenderingExtension.java rename to src/test/java/electrosphere/test/template/extensions/RenderingExtension.java index f066a9bd..151ef815 100644 --- a/src/test/java/template/extensions/RenderingExtension.java +++ b/src/test/java/electrosphere/test/template/extensions/RenderingExtension.java @@ -1,4 +1,4 @@ -package template.extensions; +package electrosphere.test.template.extensions; import org.junit.jupiter.api.extension.AfterEachCallback; import org.junit.jupiter.api.extension.BeforeEachCallback; @@ -6,7 +6,7 @@ import org.junit.jupiter.api.extension.ExtensionContext; import electrosphere.engine.Globals; import electrosphere.engine.Main; -import testutils.TestEngineUtils; +import electrosphere.test.testutils.TestEngineUtils; /** * Spins up an tears down generic rendering environment diff --git a/src/test/java/testutils/EngineInit.java b/src/test/java/electrosphere/test/testutils/EngineInit.java similarity index 98% rename from src/test/java/testutils/EngineInit.java rename to src/test/java/electrosphere/test/testutils/EngineInit.java index 5a2adfe7..3bbd0a6d 100644 --- a/src/test/java/testutils/EngineInit.java +++ b/src/test/java/electrosphere/test/testutils/EngineInit.java @@ -1,4 +1,4 @@ -package testutils; +package electrosphere.test.testutils; import java.util.concurrent.TimeUnit; diff --git a/src/test/java/testutils/InputAPI.java b/src/test/java/electrosphere/test/testutils/InputAPI.java similarity index 95% rename from src/test/java/testutils/InputAPI.java rename to src/test/java/electrosphere/test/testutils/InputAPI.java index ae475161..9e7c6a01 100644 --- a/src/test/java/testutils/InputAPI.java +++ b/src/test/java/electrosphere/test/testutils/InputAPI.java @@ -1,4 +1,4 @@ -package testutils; +package electrosphere.test.testutils; import electrosphere.engine.Globals; diff --git a/src/test/java/testutils/TestEngineUtils.java b/src/test/java/electrosphere/test/testutils/TestEngineUtils.java similarity index 97% rename from src/test/java/testutils/TestEngineUtils.java rename to src/test/java/electrosphere/test/testutils/TestEngineUtils.java index 5d6d3cd8..82df5a36 100644 --- a/src/test/java/testutils/TestEngineUtils.java +++ b/src/test/java/electrosphere/test/testutils/TestEngineUtils.java @@ -1,4 +1,4 @@ -package testutils; +package electrosphere.test.testutils; import electrosphere.engine.Globals; import electrosphere.engine.Main; diff --git a/src/test/java/testutils/TestEntityUtils.java b/src/test/java/electrosphere/test/testutils/TestEntityUtils.java similarity index 98% rename from src/test/java/testutils/TestEntityUtils.java rename to src/test/java/electrosphere/test/testutils/TestEntityUtils.java index b390515e..43150bbc 100644 --- a/src/test/java/testutils/TestEntityUtils.java +++ b/src/test/java/electrosphere/test/testutils/TestEntityUtils.java @@ -1,4 +1,4 @@ -package testutils; +package electrosphere.test.testutils; import org.joml.Vector3d; diff --git a/src/test/java/testutils/TestRenderingUtils.java b/src/test/java/electrosphere/test/testutils/TestRenderingUtils.java similarity index 98% rename from src/test/java/testutils/TestRenderingUtils.java rename to src/test/java/electrosphere/test/testutils/TestRenderingUtils.java index d07c876f..86761d06 100644 --- a/src/test/java/testutils/TestRenderingUtils.java +++ b/src/test/java/electrosphere/test/testutils/TestRenderingUtils.java @@ -1,4 +1,4 @@ -package testutils; +package electrosphere.test.testutils; import java.awt.image.BufferedImage; import java.io.File; diff --git a/src/test/java/testutils/TestViewportUtils.java b/src/test/java/electrosphere/test/testutils/TestViewportUtils.java similarity index 98% rename from src/test/java/testutils/TestViewportUtils.java rename to src/test/java/electrosphere/test/testutils/TestViewportUtils.java index 5fbd301f..386acd35 100644 --- a/src/test/java/testutils/TestViewportUtils.java +++ b/src/test/java/electrosphere/test/testutils/TestViewportUtils.java @@ -1,4 +1,4 @@ -package testutils; +package electrosphere.test.testutils; import java.util.concurrent.TimeUnit; diff --git a/src/test/java/electrosphere/util/ds/OctreeTests.java b/src/test/java/electrosphere/util/ds/OctreeTests.java index a5865a12..c8414345 100644 --- a/src/test/java/electrosphere/util/ds/OctreeTests.java +++ b/src/test/java/electrosphere/util/ds/OctreeTests.java @@ -12,8 +12,8 @@ import java.util.Random; import org.joml.Vector3d; -import annotations.BigDataTest; -import annotations.FastTest; +import electrosphere.test.annotations.BigDataTest; +import electrosphere.test.annotations.FastTest; import electrosphere.util.ds.Octree.OctreeNode; /**