Skip to content

Commit 87e1ca6

Browse files
authored
Merge pull request #1589 from madsboddum/fix/testing/compilation-errors
Testcase compilation error fixes
2 parents a3c9648 + fbfde6a commit 87e1ca6

2 files changed

Lines changed: 12 additions & 14 deletions

File tree

src/test/java/com/projectswg/holocore/services/gameplay/combat/CloningTest.kt

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
/***********************************************************************************
22
* Copyright (c) 2024 /// Project SWG /// www.projectswg.com *
33
* *
4-
* ProjectSWG is the first NGE emulator for Star Wars Galaxies founded on *
4+
* ProjectSWG is an emulation project for Star Wars Galaxies founded on *
55
* July 7th, 2011 after SOE announced the official shutdown of Star Wars Galaxies. *
6-
* Our goal is to create an emulator which will provide a server for players to *
7-
* continue playing a game similar to the one they used to play. We are basing *
8-
* it on the final publish of the game prior to end-game events. *
6+
* Our goal is to create one or more emulators which will provide servers for *
7+
* players to continue playing a game similar to the one they used to play. *
98
* *
109
* This file is part of Holocore. *
1110
* *
@@ -48,9 +47,9 @@ class CloningTest : AcceptanceTest() {
4847

4948
@Test
5049
fun `possible to clone after being deathblown`() {
51-
addUser("username", "password", AccessLevel.DEV)
52-
val character1 = HeadlessSWGClient.createZonedInCharacter("username", "password", "charone")
53-
val character2 = HeadlessSWGClient.createZonedInCharacter("username", "password", "chartwo")
50+
val user = generateUser(AccessLevel.DEV)
51+
val character1 = HeadlessSWGClient.createZonedInCharacter(user.username, user.password, "charone")
52+
val character2 = HeadlessSWGClient.createZonedInCharacter(user.username, user.password, "chartwo")
5453
character1.duel(character2.player.creatureObject)
5554
character2.duel(character1.player.creatureObject)
5655
character1.adminKill(character2.player.creatureObject)

src/test/java/com/projectswg/holocore/services/support/KillAdminCommandTest.kt

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
/***********************************************************************************
22
* Copyright (c) 2024 /// Project SWG /// www.projectswg.com *
33
* *
4-
* ProjectSWG is the first NGE emulator for Star Wars Galaxies founded on *
4+
* ProjectSWG is an emulation project for Star Wars Galaxies founded on *
55
* July 7th, 2011 after SOE announced the official shutdown of Star Wars Galaxies. *
6-
* Our goal is to create an emulator which will provide a server for players to *
7-
* continue playing a game similar to the one they used to play. We are basing *
8-
* it on the final publish of the game prior to end-game events. *
6+
* Our goal is to create one or more emulators which will provide servers for *
7+
* players to continue playing a game similar to the one they used to play. *
98
* *
109
* This file is part of Holocore. *
1110
* *
@@ -74,9 +73,9 @@ class KillAdminCommandTest : AcceptanceTest() {
7473

7574
@Test
7675
fun killPlayer() {
77-
addUser("username", "password", AccessLevel.DEV)
78-
val character1 = HeadlessSWGClient.createZonedInCharacter("username", "password", "charone")
79-
val character2 = HeadlessSWGClient.createZonedInCharacter("username", "password", "chartwo")
76+
val user = generateUser(AccessLevel.DEV)
77+
val character1 = HeadlessSWGClient.createZonedInCharacter(user.username, user.password, "charone")
78+
val character2 = HeadlessSWGClient.createZonedInCharacter(user.username, user.password, "chartwo")
8079

8180
character1.adminKill(character2.player.creatureObject)
8281

0 commit comments

Comments
 (0)