refactor java test package

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)

src/test/java/annotations/FastSetup.java

@@ -1,5 +0,0 @@
-package annotations;
-
-public class FastSetup {
-    
-}

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 electrosphere.test.annotations.UnitTest;
-import annotations.UnitTest;
+import electrosphere.test.annotations.FastTest;
+
 
 /**
  * Unit tests for hitbox audio service

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 electrosphere.test.testutils.EngineInit;
-import testutils.TestEngineUtils;
+import electrosphere.test.testutils.TestEngineUtils;
 
 /**
  * Tests loading viewport

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;
 

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;

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;

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 electrosphere.test.template.EntityTestTemplate;
-import testutils.TestEntityUtils;
+import electrosphere.test.testutils.TestEntityUtils;
 
 /**
  * Basic entity spawning integration tests

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 electrosphere.test.template.EntityTestTemplate;
-import testutils.TestEngineUtils;
+import electrosphere.test.testutils.TestEngineUtils;
 
 /**
  * Testing the client's attacking trees

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 electrosphere.test.template.EntityTestTemplate;
-import testutils.TestEngineUtils;
+import electrosphere.test.testutils.TestEngineUtils;
 
 /**
  * Tests for the client collidable component

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 electrosphere.test.template.EntityTestTemplate;
-import testutils.TestEngineUtils;
+import electrosphere.test.testutils.TestEngineUtils;
 
 /**
  * Tests for the server collidable tree

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 electrosphere.test.template.EntityTestTemplate;
-import testutils.TestEngineUtils;
+import electrosphere.test.testutils.TestEngineUtils;
-import testutils.TestViewportUtils;
+import electrosphere.test.testutils.TestViewportUtils;
 
 /**
  * Tests for client side equip state

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 electrosphere.test.template.EntityTestTemplate;
-import testutils.TestEngineUtils;
+import electrosphere.test.testutils.TestEngineUtils;
 
 /**
  * Server equip state tests

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 electrosphere.test.annotations.FastTest;
-import annotations.UnitTest;
+import electrosphere.test.annotations.UnitTest;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityCreationUtils;
 import electrosphere.entity.EntityDataStrings;

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 electrosphere.test.annotations.FastTest;
-import annotations.UnitTest;
+import electrosphere.test.annotations.UnitTest;
 
 /**
  * Camera entity utils unit tests

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 electrosphere.test.annotations.FastTest;
-import annotations.UnitTest;
+import electrosphere.test.annotations.UnitTest;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityCreationUtils;
 import electrosphere.entity.EntityDataStrings;

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 electrosphere.test.template.RenderingTestTemplate;
-import testutils.TestEngineUtils;
+import electrosphere.test.testutils.TestEngineUtils;
 
 /**
  * Tests for the window class

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

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 electrosphere.test.annotations.FastTest;
-import annotations.UnitTest;
+import electrosphere.test.annotations.UnitTest;
 
 /**
  * Unit tests for viewport data cell manager

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;

src/test/java/electrosphere/test/annotations/FastSetup.java

@@ -0,0 +1,5 @@
+package electrosphere.test.annotations;
+
+public class FastSetup {
+    
+}

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;

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;

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;

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;

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;

src/test/java/electrosphere/test/integration/StartupTest.java

@@ -1,7 +1,7 @@
-package integration;
+package electrosphere.test.integration;
 
-import annotations.IntegrationSetup;
+import electrosphere.test.annotations.IntegrationSetup;
-import annotations.IntegrationTest;
+import electrosphere.test.annotations.IntegrationTest;
 import electrosphere.engine.Globals;
 import electrosphere.engine.profiler.Profiler;
 import electrosphere.net.NetUtils;

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

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 electrosphere.test.template.extensions.RenderingExtension;
-import testutils.TestRenderingUtils;
+import electrosphere.test.testutils.TestRenderingUtils;
 
 /**
  * A test class that involves testing renders

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 electrosphere.test.testutils.EngineInit;
-import testutils.TestEngineUtils;
+import electrosphere.test.testutils.TestEngineUtils;
 
 /**
  * Spins up and tears down entity testing environment

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

src/test/java/electrosphere/test/testutils/EngineInit.java

@@ -1,4 +1,4 @@
-package testutils;
+package electrosphere.test.testutils;
 
 import java.util.concurrent.TimeUnit;
 

src/test/java/electrosphere/test/testutils/InputAPI.java

@@ -1,4 +1,4 @@
-package testutils;
+package electrosphere.test.testutils;
 
 import electrosphere.engine.Globals;
 

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;

src/test/java/electrosphere/test/testutils/TestEntityUtils.java

@@ -1,4 +1,4 @@
-package testutils;
+package electrosphere.test.testutils;
 
 import org.joml.Vector3d;
 

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;

src/test/java/electrosphere/test/testutils/TestViewportUtils.java

@@ -1,4 +1,4 @@
-package testutils;
+package electrosphere.test.testutils;
 
 import java.util.concurrent.TimeUnit;
 

src/test/java/electrosphere/util/ds/OctreeTests.java

@@ -12,8 +12,8 @@ import java.util.Random;
 
 import org.joml.Vector3d;
 
-import annotations.BigDataTest;
+import electrosphere.test.annotations.BigDataTest;
-import annotations.FastTest;
+import electrosphere.test.annotations.FastTest;
 import electrosphere.util.ds.Octree.OctreeNode;
 
 /**