From ae768e1e429d8218cdc402c4345cc4fe630c4683 Mon Sep 17 00:00:00 2001
From: FateJH <Jason_DiDonato@yahoo.com>
Date: Thu, 9 Jan 2020 12:07:01 -0500
Subject: [PATCH] test fixes

---
 .../test/scala/objects/number/NumberSourceTest.scala  | 11 +++++++----
 .../test/scala/objects/terminal/ProximityTest.scala   |  4 ++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/common/src/test/scala/objects/number/NumberSourceTest.scala b/common/src/test/scala/objects/number/NumberSourceTest.scala
index 72e44d788..3b66fce2f 100644
--- a/common/src/test/scala/objects/number/NumberSourceTest.scala
+++ b/common/src/test/scala/objects/number/NumberSourceTest.scala
@@ -106,11 +106,12 @@ class NumberSourceTest extends Specification {
     "return a secure key" in {
       val obj = LimitedNumberSource(25)
       val test = new TestClass()
+
       val result1 : Option[LoanedKey] = obj.Available(5)
       result1.get.Object = test
-      test.GUID = PlanetSideGUID(5)
-      val result2 : Option[SecureKey] = obj.Get(5)
+      test.GUID mustEqual PlanetSideGUID(5)
 
+      val result2 : Option[SecureKey] = obj.Get(5)
       obj.Return(result2.get).contains(test) mustEqual true
     }
 
@@ -180,18 +181,20 @@ class NumberSourceTest extends Specification {
       val obj = LimitedNumberSource(25)
       val test1 = new TestClass()
       val test2 = new TestClass()
+      val test3 = new TestClass()
       obj.Available(5) //no assignment
       obj.Available(10).get.Object = test1
       obj.Available(15).get.Object = test2
       obj.Restrict(15)
-      obj.Restrict(20).get.Object = test1
+      obj.Restrict(20).get.Object = test3
       obj.CountUsed mustEqual 4
 
       val list : List[IdentifiableEntity] = obj.Clear()
       obj.CountUsed mustEqual 0
       list.size mustEqual 3
-      list.count(obj => obj == test1) mustEqual 2
+      list.count(obj => obj == test1) mustEqual 1
       list.count(obj => obj == test2) mustEqual 1
+      list.count(obj => obj == test3) mustEqual 1
     }
   }
 }
diff --git a/common/src/test/scala/objects/terminal/ProximityTest.scala b/common/src/test/scala/objects/terminal/ProximityTest.scala
index 8909f1a6d..91580fc38 100644
--- a/common/src/test/scala/objects/terminal/ProximityTest.scala
+++ b/common/src/test/scala/objects/terminal/ProximityTest.scala
@@ -157,7 +157,7 @@ class ProximityTerminalControlTwoUsersTest extends ActorTest {
     avatar2.Health = 50
 
     avatar.GUID = PlanetSideGUID(1)
-    avatar.GUID = PlanetSideGUID(2)
+    avatar2.GUID = PlanetSideGUID(2)
     terminal.GUID = PlanetSideGUID(3)
     terminal.Actor ! Service.Startup()
     expectNoMsg(500 milliseconds) //spacer
@@ -252,7 +252,7 @@ class ProximityTerminalControlNotStopTest extends ActorTest {
     avatar2.Health = 50
 
     avatar.GUID = PlanetSideGUID(1)
-    avatar.GUID = PlanetSideGUID(2)
+    avatar2.GUID = PlanetSideGUID(2)
     terminal.GUID = PlanetSideGUID(3)
     terminal.Actor ! Service.Startup()
     expectNoMsg(500 milliseconds) //spacer