PSForever/PSF-LoginServer
1
0
Fork 0
mirror of https://github.com/psforever/PSF-LoginServer.git synced 2026-06-25 06:44:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

prefacing imports with _root_ to escape name conflict with nested package

Browse source
This commit is contained in:
Fate-JH 2026-03-03 15:53:16 -05:00
parent 9564b20978
commit 14da36dabe
2 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/test/scala/service/HartServiceTest.scala
View file

@ -3,7 +3,7 @@ package service
import akka.actor.{ActorRef, Props}
import akka.testkit.TestProbe
import base.ActorTest
import _root_.base.ActorTest
import net.psforever.objects.zones.{Zone, ZoneMap}
import net.psforever.services.hart.{HartService, HartTimer}
import net.psforever.types.PlanetSideGUID

26
src/test/scala/service/HartTimerTest.scala
View file

@ -1,9 +1,9 @@
// Copyright (c) 2021 PSForever
package service
import akka.actor.Props
import akka.actor.{ActorRef, Props}
import akka.testkit.TestProbe
import base.ActorTest
import _root_.base.ActorTest
import net.psforever.objects.zones.{Zone, ZoneMap}
import net.psforever.services.hart.HartTimer
import net.psforever.types.PlanetSideGUID
@ -14,11 +14,11 @@ class HartTimerNotScheduled extends ActorTest {
"HartTimer" should {
val catchall = new TestProbe(system).ref
val zone = new Zone("test", new ZoneMap("test"), 0) {
override def SetupNumberPools() = {}
override def AvatarEvents = catchall
override def LocalEvents = catchall
override def VehicleEvents = catchall
override def Activity = catchall
override def SetupNumberPools(): Unit = {}
override def AvatarEvents: ActorRef = catchall
override def LocalEvents: ActorRef = catchall
override def VehicleEvents: ActorRef = catchall
override def Activity: ActorRef = catchall
}
val timer = system.actorOf(Props(classOf[HartTimer], zone), "hart-timer")
@ -34,11 +34,11 @@ class HartTimerInitializedPairingScheduled extends ActorTest {
"HartTimer" should {
val catchall = new TestProbe(system).ref
val zone = new Zone("test", new ZoneMap("test"), 0) {
override def SetupNumberPools() = {}
override def AvatarEvents = catchall
override def LocalEvents = catchall
override def VehicleEvents = catchall
override def Activity = catchall
override def SetupNumberPools(): Unit = {}
override def AvatarEvents: ActorRef = catchall
override def LocalEvents: ActorRef = catchall
override def VehicleEvents: ActorRef = catchall
override def Activity: ActorRef = catchall
}
val timer = system.actorOf(Props(classOf[HartTimer], zone), "hart-timer")
@ -54,4 +54,4 @@ class HartTimerInitializedPairingScheduled extends ActorTest {
}
}
object HartTimerTest { /* initially left empty */ }
object HartTimerTest { /* initially left empty */ }