From ae3f2e00bd8f03b952ede95fcc86dcc659ae0bd5 Mon Sep 17 00:00:00 2001 From: Obique PSWG Date: Mon, 22 May 2017 12:31:44 -0500 Subject: [PATCH] Sped up tests without compromising quality --- .../awareness/TestBuildoutObjectList.java | 16 +++++++++++++--- .../resources/objects/quadtree/TestQuadTree.java | 10 +++++----- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/test/resources/objects/awareness/TestBuildoutObjectList.java b/test/resources/objects/awareness/TestBuildoutObjectList.java index 2d23a3db6..986e2945e 100644 --- a/test/resources/objects/awareness/TestBuildoutObjectList.java +++ b/test/resources/objects/awareness/TestBuildoutObjectList.java @@ -33,9 +33,11 @@ import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; import java.util.stream.Collectors; +import com.projectswg.common.data.location.Terrain; + import resources.objects.SWGObject; import resources.objects.creature.CreatureObject; -import services.objects.ClientBuildoutService; +import services.objects.ObjectCreator; public class TestBuildoutObjectList { @@ -57,8 +59,16 @@ public class TestBuildoutObjectList { private void load() { if (loaded.getAndSet(true)) return; - ClientBuildoutService buildoutService = new ClientBuildoutService(); - mosEisleyObjects.addAll(buildoutService.loadClientObjectsByArea(843).values().stream().filter(obj -> obj.getParent() != null).collect(Collectors.toList())); + double maxAngle = 2 * Math.PI; + for (double radius = 10; radius <= 250; radius += 20) { + for (double angle = 0; angle < maxAngle; angle += maxAngle / 10) { + SWGObject object = ObjectCreator.createObjectFromTemplate("object/building/tatooine/shared_housing_tatt_style01_med.iff"); + object.setPosition(Terrain.TATOOINE, radius * Math.cos(angle) + 3500, 5, radius * Math.sin(angle) - 4800); + mosEisleyObjects.add(object); + } + } +// ClientBuildoutService buildoutService = new ClientBuildoutService(); +// mosEisleyObjects.addAll(buildoutService.loadClientObjectsByArea(843).values().stream().filter(obj -> obj.getParent() != null).collect(Collectors.toList())); } private boolean isValidWithinRange(SWGObject obj, SWGObject inRange, double range) { diff --git a/test/resources/objects/quadtree/TestQuadTree.java b/test/resources/objects/quadtree/TestQuadTree.java index ee7a404f7..5c39befd6 100644 --- a/test/resources/objects/quadtree/TestQuadTree.java +++ b/test/resources/objects/quadtree/TestQuadTree.java @@ -124,16 +124,16 @@ public class TestQuadTree { List points = new ArrayList(); QuadTree tree = new QuadTree(16, -8192, -8192, 8192, 8192); Point2D p; - for (int x = -2000; x < 2000; x += 50) { - for (int y = -2000; y < 2000; y += 50) { + for (int x = -2000; x < 2000; x += 100) { + for (int y = -2000; y < 2000; y += 100) { p = new Point2D(x, y); points.add(p); tree.put(x, y, p); } } - for (int x = -2000; x < 2000; x += 100) { - for (int y = -2000; y < 2000; y += 100) { - test(points, tree, x, y, 200); + for (int x = -2000; x < 2000; x += 200) { + for (int y = -2000; y < 2000; y += 200) { + test(points, tree, x, y, 400); } } }