From f7ae87fdf5c199c5d88a7a85ca1c7235e43f9b94 Mon Sep 17 00:00:00 2001
From: Obique PSWG <obique.pswg@gmail.com>
Date: Mon, 14 Nov 2016 19:30:15 -0600
Subject: [PATCH] Fixed unit test in TestAwarenessHandler

---
 .../resources/objects/awareness/TestAwarenessHandler.java | 8 ++++----
 test/resources/objects/awareness/TestTerrainMap.java      | 1 -
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/test/resources/objects/awareness/TestAwarenessHandler.java b/test/resources/objects/awareness/TestAwarenessHandler.java
index 59a3decd..f01ca642 100644
--- a/test/resources/objects/awareness/TestAwarenessHandler.java
+++ b/test/resources/objects/awareness/TestAwarenessHandler.java
@@ -29,7 +29,6 @@ package resources.objects.awareness;
 
 import java.util.ArrayList;
 import java.util.List;
-
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -58,7 +57,7 @@ public class TestAwarenessHandler {
 	@BeforeClass
 	public static void initTatooine() {
 		ClientBuildoutService buildoutService = new ClientBuildoutService();
-		double loadDistance = 1024*1.414; // 1024 * sqrt(2)
+		double loadDistance = 1024*1.414*2; // 1024 * sqrt(2)
 		for (SWGObject obj : buildoutService.loadClientObjectsByArea(843)) { // mos eisley's area id
 			initObject(obj, loadDistance);
 		}
@@ -140,7 +139,8 @@ public class TestAwarenessHandler {
 		callback.set(0, 0, 0, 0);
 		awareness.moveObject(creature, starport.getCellByNumber(1), new Location(0, 0, 0, Terrain.TATOOINE));
 		awareness.moveObject(CREATURE2, CREATURE2_LOCATION);
-//		callback.waitAndTest(0, 0, 1, 0, 1000);
+		awaitCallbacks(awareness, 1000);
+		callback.testAssert(0, 0, 1, 0);
 	}
 	
 	private void initAwareness(AwarenessHandler awareness, MapCallback callback) {
@@ -148,7 +148,7 @@ public class TestAwarenessHandler {
 		for (SWGObject obj : EISLEY_OBJECTS) {
 			awareness.moveObject(obj, obj.getLocation());
 		}
-		awaitCallbacks(awareness, 1000);
+		awaitCallbacks(awareness, 3000);
 		callback.set(0, 0, 0, 0);
 	}
 	
diff --git a/test/resources/objects/awareness/TestTerrainMap.java b/test/resources/objects/awareness/TestTerrainMap.java
index b5067082..7bec660d 100644
--- a/test/resources/objects/awareness/TestTerrainMap.java
+++ b/test/resources/objects/awareness/TestTerrainMap.java
@@ -81,7 +81,6 @@ public class TestTerrainMap {
 			map.moveWithinMap(objA, new Location(0, 0, 0, Terrain.TATOOINE)); // 1 - Within Range, 1 - Successful Move
 			objB.setLocation(new Location(5, 0, 5, Terrain.TATOOINE));
 			objB.moveToContainer(cell);
-			map.moveToParent(objB, cell); // 0 - Within Range, 0 - Successful Move
 			awaitCallbacks(map, 1000);
 			callback.testAssert(1, 0, 2, 0);
 		} finally {