mirror of
https://github.com/psforever/PSF-LoginServer.git
synced 2026-04-26 14:55:28 +00:00
* Add .scalafmt.conf
* Adopt quill for database access
* Removed postgresql-async
* Refactored all instances of database access
* Creating duplicate characters of the same account is no longer possible
* Rewrote large parts of LoginSessionActor
* Implement migrations
* Move overrides into subdirectory
* Make usernames case insensitive
* Use LOWER(?) comparison instead of storing lowercased username
* import scala.util.{Success, Failure}
* Add config and joda-time dependencies
* Add sbt-scalafmt
* Use defaultWithAlign scalafmt preset
* Format all
* Add scalafix
* Remove unused imports
* Don't lowercase username when inserting
* Update readme
* Listen on worldserver.Hostname address
* Remove database test on startup
It could fail when the global thread pool is busy loading zone
maps. Migrations run on the main thread and also serve the
purpose of verifying the database configuration so it's fine to
remove the test altogether.
* Refactor chat message handlers, zones
What started as a small change to how zones are stored turned
into a pretty big effort of refactoring the chat message handler.
The !hack command was removed, the /capturebase commandwas added.
* Expose db ports in docker-compose.yml
* Silence property override log
* Rework configuration
* Unify configuration using the typesafe.config library
* Add configuration option for public address
* Configuration is now loaded from application.conf rather than worldserver.ini
* Refactor PsLogin and remove unnecessary logging
* Move pslogin into net.psforever.pslogin namespace
* Fix coverage
This commit is contained in:
Jakob Gillich
GitHub
parent
88b194fde2
commit
e0defe8240
850 changed files with 144487 additions and 47476 deletions
|
|
@ -10,7 +10,7 @@ import org.specs2.mutable._
|
|||
class EntityTest extends Specification {
|
||||
//both WorldEntity and IdentifiableEntity are components of PlanetSideGameObject
|
||||
private class EntityTestClass extends PlanetSideGameObject {
|
||||
def Definition : ObjectDefinition = new ObjectDefinition(0) { }
|
||||
def Definition: ObjectDefinition = new ObjectDefinition(0) {}
|
||||
}
|
||||
|
||||
"PlanetSideGUID" should {
|
||||
|
|
@ -36,17 +36,17 @@ class EntityTest extends Specification {
|
|||
}
|
||||
|
||||
"valid and stale are pattern-matchable" in {
|
||||
val guid1 : PlanetSideGUID = ValidPlanetSideGUID(1)
|
||||
val guid2 : PlanetSideGUID = StalePlanetSideGUID(1)
|
||||
def getGuid(o : PlanetSideGUID) : PlanetSideGUID = o //distancing the proper type
|
||||
val guid1: PlanetSideGUID = ValidPlanetSideGUID(1)
|
||||
val guid2: PlanetSideGUID = StalePlanetSideGUID(1)
|
||||
def getGuid(o: PlanetSideGUID): PlanetSideGUID = o //distancing the proper type
|
||||
|
||||
getGuid(guid1) match {
|
||||
case ValidPlanetSideGUID(1) => ok
|
||||
case _ => ko
|
||||
case _ => ko
|
||||
}
|
||||
getGuid(guid2) match {
|
||||
case StalePlanetSideGUID(1) => ok
|
||||
case _ => ko
|
||||
case _ => ko
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -58,14 +58,14 @@ class EntityTest extends Specification {
|
|||
}
|
||||
|
||||
"initialize" in {
|
||||
val obj : EntityTestClass = new EntityTestClass()
|
||||
val obj: EntityTestClass = new EntityTestClass()
|
||||
obj.Position mustEqual Vector3(0f, 0f, 0f)
|
||||
obj.Orientation mustEqual Vector3(0f, 0f, 0f)
|
||||
obj.Velocity.isEmpty mustEqual true
|
||||
}
|
||||
|
||||
"mutate and access" in {
|
||||
val obj : EntityTestClass = new EntityTestClass
|
||||
val obj: EntityTestClass = new EntityTestClass
|
||||
obj.Position = Vector3(1f, 1f, 1f)
|
||||
obj.Orientation = Vector3(2f, 2f, 2f)
|
||||
obj.Velocity = Vector3(3f, 3f, 3f)
|
||||
|
|
@ -76,61 +76,61 @@ class EntityTest extends Specification {
|
|||
}
|
||||
|
||||
"clamp Orientation" in {
|
||||
val obj : EntityTestClass = new EntityTestClass
|
||||
val obj: EntityTestClass = new EntityTestClass
|
||||
obj.Orientation = Vector3(-1f, 361f, -0f)
|
||||
obj.Orientation mustEqual Vector3(359f, 1f, 0f)
|
||||
}
|
||||
|
||||
"is moving (at all)" in {
|
||||
val obj : EntityTestClass = new EntityTestClass
|
||||
val obj: EntityTestClass = new EntityTestClass
|
||||
obj.Velocity.isEmpty mustEqual true
|
||||
obj.isMoving mustEqual false
|
||||
|
||||
obj.Velocity = Vector3.Zero
|
||||
obj.isMoving mustEqual false
|
||||
obj.Velocity = Vector3(1,0,0)
|
||||
obj.Velocity = Vector3(1, 0, 0)
|
||||
obj.isMoving mustEqual true
|
||||
obj.Velocity = None
|
||||
obj.isMoving mustEqual false
|
||||
}
|
||||
|
||||
"is moving (Vector3 comparison)" in {
|
||||
val obj : EntityTestClass = new EntityTestClass
|
||||
val test1 = Vector3(1,0,0)
|
||||
val test2 = Vector3(2,0,0)
|
||||
val obj: EntityTestClass = new EntityTestClass
|
||||
val test1 = Vector3(1, 0, 0)
|
||||
val test2 = Vector3(2, 0, 0)
|
||||
obj.Velocity.isEmpty mustEqual true
|
||||
obj.isMoving mustEqual false
|
||||
obj.isMoving(test1) mustEqual false
|
||||
obj.isMoving(test2) mustEqual false
|
||||
|
||||
obj.Velocity = Vector3(1,0,0)
|
||||
obj.Velocity = Vector3(1, 0, 0)
|
||||
obj.isMoving(test1) mustEqual true
|
||||
obj.isMoving(test2) mustEqual false
|
||||
obj.Velocity = Vector3(3,0,0)
|
||||
obj.Velocity = Vector3(3, 0, 0)
|
||||
obj.isMoving(test1) mustEqual true
|
||||
obj.isMoving(test2) mustEqual true
|
||||
obj.Velocity = Vector3(1,1,0)
|
||||
obj.Velocity = Vector3(1, 1, 0)
|
||||
obj.isMoving(test1) mustEqual true
|
||||
obj.isMoving(test2) mustEqual false
|
||||
}
|
||||
|
||||
"is moving (Float comparison)" in {
|
||||
val obj : EntityTestClass = new EntityTestClass
|
||||
val obj: EntityTestClass = new EntityTestClass
|
||||
obj.Velocity.isEmpty mustEqual true
|
||||
obj.isMoving mustEqual false
|
||||
obj.isMoving(1) mustEqual false
|
||||
obj.isMoving(2) mustEqual false
|
||||
obj.isMoving(4) mustEqual false
|
||||
|
||||
obj.Velocity = Vector3(1,0,0)
|
||||
obj.Velocity = Vector3(1, 0, 0)
|
||||
obj.isMoving(1) mustEqual true
|
||||
obj.isMoving(2) mustEqual false
|
||||
obj.isMoving(4) mustEqual false
|
||||
obj.Velocity = Vector3(3,0,0)
|
||||
obj.Velocity = Vector3(3, 0, 0)
|
||||
obj.isMoving(1) mustEqual true
|
||||
obj.isMoving(2) mustEqual true
|
||||
obj.isMoving(4) mustEqual true
|
||||
obj.Velocity = Vector3(1,1,1)
|
||||
obj.Velocity = Vector3(1, 1, 1)
|
||||
obj.isMoving(1) mustEqual true
|
||||
obj.isMoving(2) mustEqual true
|
||||
obj.isMoving(4) mustEqual false
|
||||
|
|
@ -144,65 +144,62 @@ class EntityTest extends Specification {
|
|||
}
|
||||
|
||||
"error while not set" in {
|
||||
val obj : EntityTestClass = new EntityTestClass
|
||||
val obj: EntityTestClass = new EntityTestClass
|
||||
obj.GUID must throwA[NoGUIDException]
|
||||
}
|
||||
|
||||
"error if set to an invalid GUID before being set to a valid GUID" in {
|
||||
val obj : EntityTestClass = new EntityTestClass
|
||||
val obj: EntityTestClass = new EntityTestClass
|
||||
obj.GUID must throwA[NoGUIDException]
|
||||
try {
|
||||
obj.GUID = StalePlanetSideGUID(1)
|
||||
ko
|
||||
}
|
||||
catch {
|
||||
case AssigningGUIDException(_, _, _, _ : StalePlanetSideGUID) => ok
|
||||
case _ : Throwable => ko
|
||||
} catch {
|
||||
case AssigningGUIDException(_, _, _, _: StalePlanetSideGUID) => ok
|
||||
case _: Throwable => ko
|
||||
}
|
||||
}
|
||||
|
||||
"work after valid mutation" in {
|
||||
val obj : EntityTestClass = new EntityTestClass
|
||||
val obj: EntityTestClass = new EntityTestClass
|
||||
obj.GUID = PlanetSideGUID(1051)
|
||||
obj.GUID mustEqual PlanetSideGUID(1051)
|
||||
}
|
||||
|
||||
"raise complaint about subsequent mutations using a valid GUID" in {
|
||||
val obj : EntityTestClass = new EntityTestClass
|
||||
val obj: EntityTestClass = new EntityTestClass
|
||||
obj.GUID = PlanetSideGUID(1051)
|
||||
obj.GUID mustEqual PlanetSideGUID(1051)
|
||||
try {
|
||||
obj.GUID = ValidPlanetSideGUID(1)
|
||||
ko
|
||||
}
|
||||
catch {
|
||||
} catch {
|
||||
case AssigningGUIDException(_, _, _, ValidPlanetSideGUID(1)) => ok
|
||||
case _ : Throwable => ko
|
||||
case _: Throwable => ko
|
||||
}
|
||||
}
|
||||
|
||||
"ignore subsequent mutations using an invalid GUID" in {
|
||||
val obj : EntityTestClass = new EntityTestClass
|
||||
val obj: EntityTestClass = new EntityTestClass
|
||||
obj.GUID = PlanetSideGUID(1051)
|
||||
obj.GUID mustEqual PlanetSideGUID(1051)
|
||||
try {
|
||||
obj.GUID = StalePlanetSideGUID(1)
|
||||
ko
|
||||
}
|
||||
catch {
|
||||
case AssigningGUIDException(_, _, _, _ : StalePlanetSideGUID) => ok
|
||||
case _ : Throwable => ko
|
||||
} catch {
|
||||
case AssigningGUIDException(_, _, _, _: StalePlanetSideGUID) => ok
|
||||
case _: Throwable => ko
|
||||
}
|
||||
}
|
||||
|
||||
"invalidate does nothing by default" in {
|
||||
val obj : EntityTestClass = new EntityTestClass
|
||||
val obj: EntityTestClass = new EntityTestClass
|
||||
obj.Invalidate()
|
||||
obj.GUID must throwA[NoGUIDException]
|
||||
}
|
||||
|
||||
"invalidate changes the nature of the previous valid mutation" in {
|
||||
val obj : EntityTestClass = new EntityTestClass
|
||||
val obj: EntityTestClass = new EntityTestClass
|
||||
obj.GUID = PlanetSideGUID(1051)
|
||||
obj.GUID mustEqual PlanetSideGUID(1051)
|
||||
obj.GUID.isInstanceOf[ValidPlanetSideGUID] mustEqual true
|
||||
|
|
@ -212,7 +209,7 @@ class EntityTest extends Specification {
|
|||
}
|
||||
|
||||
"setting an invalid GUID after invalidating the previous valid mutation still raises complaint" in {
|
||||
val obj : EntityTestClass = new EntityTestClass
|
||||
val obj: EntityTestClass = new EntityTestClass
|
||||
obj.GUID = PlanetSideGUID(1051)
|
||||
obj.GUID mustEqual PlanetSideGUID(1051)
|
||||
obj.GUID.isInstanceOf[ValidPlanetSideGUID] mustEqual true
|
||||
|
|
@ -224,7 +221,7 @@ class EntityTest extends Specification {
|
|||
}
|
||||
|
||||
"setting a valid GUID after invalidating correctly sets the new valid GUID" in {
|
||||
val obj : EntityTestClass = new EntityTestClass
|
||||
val obj: EntityTestClass = new EntityTestClass
|
||||
obj.GUID = PlanetSideGUID(1051)
|
||||
obj.GUID mustEqual PlanetSideGUID(1051)
|
||||
obj.GUID.isInstanceOf[ValidPlanetSideGUID] mustEqual true
|
||||
|
|
@ -237,7 +234,7 @@ class EntityTest extends Specification {
|
|||
}
|
||||
|
||||
"setting the same valid GUID after invalidating correctly resets the valid GUID" in {
|
||||
val obj : EntityTestClass = new EntityTestClass
|
||||
val obj: EntityTestClass = new EntityTestClass
|
||||
obj.GUID = PlanetSideGUID(1051)
|
||||
obj.GUID mustEqual PlanetSideGUID(1051)
|
||||
obj.GUID.isInstanceOf[ValidPlanetSideGUID] mustEqual true
|
||||
|
|
@ -250,19 +247,19 @@ class EntityTest extends Specification {
|
|||
}
|
||||
|
||||
"report not having a GUID when not set" in {
|
||||
val obj : EntityTestClass = new EntityTestClass
|
||||
val obj: EntityTestClass = new EntityTestClass
|
||||
obj.HasGUID mustEqual false
|
||||
}
|
||||
|
||||
"report having a GUID when a valid GUID is set" in {
|
||||
val obj : EntityTestClass = new EntityTestClass
|
||||
val obj: EntityTestClass = new EntityTestClass
|
||||
obj.HasGUID mustEqual false
|
||||
obj.GUID = PlanetSideGUID(1051)
|
||||
obj.HasGUID mustEqual true
|
||||
}
|
||||
|
||||
"report not having a GUID after invalidating (staleness)" in {
|
||||
val obj : EntityTestClass = new EntityTestClass
|
||||
val obj: EntityTestClass = new EntityTestClass
|
||||
obj.HasGUID mustEqual false
|
||||
obj.GUID = PlanetSideGUID(1051)
|
||||
obj.HasGUID mustEqual true
|
||||
|
|
@ -273,7 +270,7 @@ class EntityTest extends Specification {
|
|||
}
|
||||
|
||||
"report having a GUID after setting a valid GUID, after invalidating" in {
|
||||
val obj : EntityTestClass = new EntityTestClass
|
||||
val obj: EntityTestClass = new EntityTestClass
|
||||
obj.HasGUID mustEqual false
|
||||
obj.GUID = PlanetSideGUID(1051)
|
||||
obj.HasGUID mustEqual true
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue