From 0240df46c6d95145b9aaf0f3f8a863c89ab2d141 Mon Sep 17 00:00:00 2001 From: Josh Larson Date: Wed, 20 Jul 2022 14:20:00 -0500 Subject: [PATCH] Removed remaining Thread.sleep's from test cases --- .../holocore/services/gameplay/combat/AttackCostTest.kt | 3 ++- .../holocore/services/gameplay/combat/FactionPvpTest.kt | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/test/java/com/projectswg/holocore/services/gameplay/combat/AttackCostTest.kt b/src/test/java/com/projectswg/holocore/services/gameplay/combat/AttackCostTest.kt index 6084c4a9c..1305a3b74 100644 --- a/src/test/java/com/projectswg/holocore/services/gameplay/combat/AttackCostTest.kt +++ b/src/test/java/com/projectswg/holocore/services/gameplay/combat/AttackCostTest.kt @@ -3,6 +3,7 @@ package com.projectswg.holocore.services.gameplay.combat import com.projectswg.common.data.CRC import com.projectswg.common.network.packets.swg.login.creation.ClientCreateCharacter import com.projectswg.common.network.packets.swg.zone.object_controller.CommandQueueEnqueue +import com.projectswg.common.network.packets.swg.zone.object_controller.CommandTimer import com.projectswg.holocore.intents.support.global.network.InboundPacketIntent import com.projectswg.holocore.services.gameplay.combat.buffs.BuffService import com.projectswg.holocore.resources.support.data.server_info.loader.DataLoader @@ -96,7 +97,7 @@ class AttackCostTest : TestRunnerSimulatedWorld() { val crc = CRC.getCrc("burstrun") broadcastAndWait(InboundPacketIntent(player, CommandQueueEnqueue(player.creatureObject.objectId, 0, crc, 0, ""))) - Thread.sleep(10) // Give the command queue a chance to be processed + (player as GenericPlayer).waitForNextPacket(CommandTimer::class.java) } private fun createCreatureObject(): CreatureObject { diff --git a/src/test/java/com/projectswg/holocore/services/gameplay/combat/FactionPvpTest.kt b/src/test/java/com/projectswg/holocore/services/gameplay/combat/FactionPvpTest.kt index 24e9ee7e0..52aa9114f 100644 --- a/src/test/java/com/projectswg/holocore/services/gameplay/combat/FactionPvpTest.kt +++ b/src/test/java/com/projectswg/holocore/services/gameplay/combat/FactionPvpTest.kt @@ -3,6 +3,7 @@ package com.projectswg.holocore.services.gameplay.combat import com.projectswg.common.data.CRC import com.projectswg.common.data.encodables.tangible.PvpStatus import com.projectswg.common.network.packets.swg.zone.object_controller.CommandQueueEnqueue +import com.projectswg.common.network.packets.swg.zone.object_controller.CommandTimer import com.projectswg.holocore.intents.gameplay.gcw.faction.FactionIntent import com.projectswg.holocore.intents.gameplay.player.experience.skills.GrantSkillIntent import com.projectswg.holocore.intents.support.global.network.InboundPacketIntent @@ -69,7 +70,7 @@ class FactionPvpTest : TestRunnerSimulatedWorld() { val targetObjectId = target.objectId broadcastAndWait(InboundPacketIntent(player, CommandQueueEnqueue(player.creatureObject.objectId, 0, crc, targetObjectId, ""))) - Thread.sleep(10) // Give the command queue a chance to be processed + player.waitForNextPacket(CommandTimer::class.java) } private fun createCreatureObject(): GenericCreatureObject {