Further improved the reliability of the TrappingXPTest

Author: Josh-Larson

src/test/java/com/projectswg/holocore/headless/experience.kt

@@ -25,17 +25,18 @@
  ***********************************************************************************/
 package com.projectswg.holocore.headless
 
+import com.projectswg.common.network.NetBuffer
 import java.util.concurrent.TimeUnit
 
 fun ZonedInCharacter.waitForExperiencePoints(xpType: String) {
-	val originalXP = getXP(xpType)
-	player.waitForNextObjectDelta(player.playerObject.objectId, 8, 0, 1, TimeUnit.SECONDS) ?: throw IllegalStateException("No XP delta received")
-	val newXP = getXP(xpType)
-	
-	if (newXP == originalXP) {
-		// We may have received a delta for a different XP type. Try again.
-		// The exception above will be thrown if we never get the delta we're waiting for, preventing an infinite loop.
-		waitForExperiencePoints(xpType) 
+	while (true) { // Quits naturally when the packet timeout is exceeded
+		val experienceDelta = player.waitForNextObjectDelta(player.playerObject.objectId, 8, 0, 50, TimeUnit.MILLISECONDS) ?: throw IllegalStateException("No XP delta received")
+		// TODO: Add a proper parser for SWGMap deltas
+		val deltasData = NetBuffer.wrap(experienceDelta.deltaData)
+		deltasData.seek(9)
+		val deltaXpType = deltasData.ascii
+		if (deltaXpType == xpType)
+			return
 	}
 }
 

src/test/java/com/projectswg/holocore/services/gameplay/player/experience/TrappingXPTest.kt

@@ -41,7 +41,6 @@ class TrappingXPTest : AcceptanceTest() {
 		val character = HeadlessSWGClient.createZonedInCharacter(user.username, user.password, "adminchar")
 		val npc = spawnNPC("creature_bantha", character.player.creatureObject.location)
 
-		waitForIntents()
 		killTarget(character, npc)
 
 		// There are three types of XP we receive from this kill: combat_meleespecialize_unarmed, trapping, and combat_general

src/test/java/com/projectswg/holocore/test/resources/GenericPlayer.java

@@ -213,6 +213,7 @@ public <T extends SWGPacket> T waitForNextPacket(Class<T> type, long timeout, Ti
 		}
 		return null;
 	}
+	
 	@Nullable
 	public DeltasMessage waitForNextObjectDelta(long objectId, int num, int update, long timeout, TimeUnit unit) {
 		Predicate<DeltasMessage> deltaPacketFilter = p -> p.getObjectId() == objectId && p.getNum() == num && p.getUpdate() == update;