mirror
/
fireblade-ecs
mirror of https://github.com/fireblade-engine/ecs.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Lint tests

This commit is contained in:
Christian Treffs 2019-09-30 20:52:24 +02:00
parent 29cd66b947
commit 5117127ee3
18 changed files with 331 additions and 412 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.swiftlint.yml
View File

@ -1,7 +1,6 @@
included:
- Sources
excluded:
- Tests
- docs
- build
identifier_name:

5
Tests/FirebladeECSPerformanceTests/Base.swift
View File

@ -56,16 +56,11 @@ class ExampleSystem {
family.forEach { (position: Position, velocity: Velocity) in
position.x *= 2
velocity.a *= 2
}
}
}
final class SingleGameState: SingleComponent {
var shouldQuit: Bool = false
var playerHealth: Int = 67
}

1
Tests/FirebladeECSPerformanceTests/ComponentPerformanceTests.swift
View File

@ -9,7 +9,6 @@ import FirebladeECS
import XCTest
class ComponentTests: XCTestCase {
func testMeasureStaticComponentIdentifier() {
let number: Int = 10_000
measure {

5
Tests/FirebladeECSPerformanceTests/HashingPerformanceTests.swift
View File

@ -5,11 +5,10 @@
// Created by Christian Treffs on 14.02.19.
//
import XCTest
import FirebladeECS
import XCTest
class HashingPerformanceTests: XCTestCase {
func testMeasureCombineHash() {
let a: Set<Int> = Set<Int>([14_561_291, 26_451_562, 34_562_182, 488_972_556, 5_128_426_962, 68_211_812])
let b: Set<Int> = Set<Int>([1_083_838, 912_312, 83_333, 71_234_555, 4_343_234])
@ -37,6 +36,4 @@ class HashingPerformanceTests: XCTestCase {
}
}
}
}

2
Tests/FirebladeECSPerformanceTests/TypedFamilyPerformanceTests.swift
View File

@ -9,7 +9,6 @@ import FirebladeECS
import XCTest
class TypedFamilyPerformanceTests: XCTestCase {
let numEntities: Int = 10_000
var nexus: Nexus!
@ -32,7 +31,6 @@ class TypedFamilyPerformanceTests: XCTestCase {
}
func testMeasureTraitMatching() {
let a = nexus.createEntity()
a.assign(Position(x: 1, y: 2))
a.assign(Name(name: "myName"))

8
Tests/FirebladeECSPerformanceTests/XCTestManifests.swift
View File

@ -7,7 +7,7 @@ extension ComponentTests {
// to regenerate.
static let __allTests__ComponentTests = [
("testMeasureComponentIdentifier", testMeasureComponentIdentifier),
("testMeasureStaticComponentIdentifier", testMeasureStaticComponentIdentifier),
("testMeasureStaticComponentIdentifier", testMeasureStaticComponentIdentifier)
]
}
@ -17,7 +17,7 @@ extension HashingPerformanceTests {
// to regenerate.
static let __allTests__HashingPerformanceTests = [
("testMeasureCombineHash", testMeasureCombineHash),
("testMeasureSetOfSetHash", testMeasureSetOfSetHash),
("testMeasureSetOfSetHash", testMeasureSetOfSetHash)
]
}
@ -38,7 +38,7 @@ extension TypedFamilyPerformanceTests {
("testPerformanceTypedFamilyFourComponents", testPerformanceTypedFamilyFourComponents),
("testPerformanceTypedFamilyOneComponent", testPerformanceTypedFamilyOneComponent),
("testPerformanceTypedFamilyThreeComponents", testPerformanceTypedFamilyThreeComponents),
("testPerformanceTypedFamilyTwoComponents", testPerformanceTypedFamilyTwoComponents),
("testPerformanceTypedFamilyTwoComponents", testPerformanceTypedFamilyTwoComponents)
]
}
@ -46,7 +46,7 @@ public func __allTests() -> [XCTestCaseEntry] {
return [
testCase(ComponentTests.__allTests__ComponentTests),
testCase(HashingPerformanceTests.__allTests__HashingPerformanceTests),
testCase(TypedFamilyPerformanceTests.__allTests__TypedFamilyPerformanceTests),
testCase(TypedFamilyPerformanceTests.__allTests__TypedFamilyPerformanceTests)
]
}
#endif

4
Tests/FirebladeECSTests/AccessTests.swift
View File

@ -5,14 +5,11 @@
// Created by Christian Treffs on 25.06.19.
//
import FirebladeECS
import XCTest
#if swift(>=5.1)
class AccessTests: XCTestCase {
func testReadOnly() {
let pos = Position(x: 1, y: 2)
@ -39,7 +36,6 @@ class AccessTests: XCTestCase {
XCTAssertEqual(writable.y, 2)
XCTAssertEqual(pos.y, 2)
}
}
#endif

11
Tests/FirebladeECSTests/Base.swift
View File

@ -45,14 +45,11 @@ class Color: Component {
var b: UInt8 = 0
}
final class SingleGameState: SingleComponent {
var shouldQuit: Bool = false
var playerHealth: Int = 67
}
class ExampleSystem {
private let family: Family2<Position, Velocity>
@ -64,16 +61,11 @@ class ExampleSystem {
family.forEach { (position: Position, velocity: Velocity) in
position.x *= 2
velocity.a *= 2
}
}
}
class ColorSystem {
let nexus: Nexus
lazy var colors = nexus.family(requires: Color.self)
@ -107,7 +99,6 @@ class PositionSystem {
func update() {
positions
.forEach { [unowned self](pos: Position) in
let deltaX: Double = self.velocity * ((self.randNorm() * 2) - 1)
let deltaY: Double = self.velocity * ((self.randNorm() * 2) - 1)
let x = pos.x + Int(deltaX)
@ -117,6 +108,4 @@ class PositionSystem {
pos.y = y
}
}
}

4
Tests/FirebladeECSTests/ComponentTests.swift
View File

@ -9,7 +9,6 @@ import FirebladeECS
import XCTest
class ComponentTests: XCTestCase {
func testComponentIdentifier() {
XCTAssertEqual(Position.identifier, Position.identifier)
XCTAssertEqual(Velocity.identifier, Velocity.identifier)
@ -20,8 +19,5 @@ class ComponentTests: XCTestCase {
XCTAssertEqual(p1.identifier, Position.identifier)
XCTAssertEqual(v1.identifier, Velocity.identifier)
XCTAssertNotEqual(v1.identifier, p1.identifier)
}
}

4
Tests/FirebladeECSTests/EntityTests.swift
View File

@ -9,9 +9,7 @@ import FirebladeECS
import XCTest
class EntityTests: XCTestCase {
func testEntityIdentifierAndIndex() {
let min = EntityIdentifier(.min)
XCTAssertEqual(min.index, Int(UInt32.min))
@ -22,7 +20,5 @@ class EntityTests: XCTestCase {
let max = EntityIdentifier(.max)
XCTAssertEqual(max, EntityIdentifier.invalid)
XCTAssertEqual(max.index, Int(UInt32.max))
}
}

10
Tests/FirebladeECSTests/FamilyTests.swift
View File

@ -9,7 +9,6 @@
import XCTest
class FamilyTests: XCTestCase {
var nexus: Nexus!
override func setUp() {
@ -29,7 +28,6 @@ class FamilyTests: XCTestCase {
}
func testFamilyCreation() {
let family = nexus.family(requires: Position.self,
excludesAll: Name.self)
@ -44,7 +42,6 @@ class FamilyTests: XCTestCase {
}
func testFamilyReuse() {
let familyA = nexus.family(requires: Position.self,
excludesAll: Name.self)
@ -83,7 +80,6 @@ class FamilyTests: XCTestCase {
XCTAssertEqual(nexus.numFamilies, 1)
XCTAssertEqual(nexus.numComponents, 0)
XCTAssertEqual(nexus.numEntities, 0)
}
func testFamilyLateMember() {
@ -121,7 +117,7 @@ class FamilyTests: XCTestCase {
familyA
.entityAndComponents
.forEach { (entity: Entity, position: Position) in
.forEach { (entity: Entity, _: Position) in
entity.assign(Velocity(a: 3.14))
entity.remove(Position.self)
}
@ -138,11 +134,9 @@ class FamilyTests: XCTestCase {
XCTAssertEqual(familyA.count, 10)
XCTAssertEqual(familyB.count, 0)
}
func testFamilyMemberBasicIteration() {
for i in 0..<1000 {
nexus.createEntity(with: Position(x: i + 1, y: i + 2))
nexus.createEntity(with: Velocity(a: Float(i)))
@ -181,7 +175,6 @@ class FamilyTests: XCTestCase {
.prefix(currentCount)
.forEach { (entity: Entity) in
entity.destroy()
}
XCTAssertEqual(family.memberIds.count, (count / 2))
@ -192,5 +185,4 @@ class FamilyTests: XCTestCase {
XCTAssertEqual(family.memberIds.count, count + (count / 2))
}
}

6
Tests/FirebladeECSTests/FamilyTraitsTests.swift
View File

@ -9,7 +9,6 @@ import FirebladeECS
import XCTest
class FamilyTraitsTests: XCTestCase {
var nexus: Nexus!
override func setUp() {
@ -23,7 +22,6 @@ class FamilyTraitsTests: XCTestCase {
}
func testTraitCommutativity() {
let t1 = FamilyTraitSet(requiresAll: [Position.self, Velocity.self],
excludesAll: [Name.self])
let t2 = FamilyTraitSet(requiresAll: [Velocity.self, Position.self],
@ -31,11 +29,9 @@ class FamilyTraitsTests: XCTestCase {
XCTAssertEqual(t1, t2)
XCTAssertEqual(t1.hashValue, t2.hashValue)
}
func testTraitMatching() {
let a = nexus.createEntity()
a.assign(Position(x: 1, y: 2))
a.assign(Name(name: "myName"))
@ -49,7 +45,5 @@ class FamilyTraitsTests: XCTestCase {
XCTAssertFalse(noMatch.canBecomeMember(a))
XCTAssertTrue(isMatch.canBecomeMember(a))
}
}

4
Tests/FirebladeECSTests/HashingTests.swift
View File

@ -9,7 +9,6 @@
import XCTest
class HashingTests: XCTestCase {
func makeComponent() -> Int {
let upperBound: Int = 44
let range = UInt32.min...UInt32.max
@ -25,7 +24,6 @@ class HashingTests: XCTestCase {
}
func testCollisionsInCritialRange() {
var hashSet: Set<Int> = Set<Int>()
var range: CountableRange<UInt32> = 0 ..< 1_000_000
@ -52,6 +50,4 @@ class HashingTests: XCTestCase {
XCTAssert(EntityComponentHash.decompose(h, with: entityId) == cH)
}
}
}

8
Tests/FirebladeECSTests/NexusTests.swift
View File

@ -9,7 +9,6 @@ import FirebladeECS
import XCTest
class NexusTests: XCTestCase {
var nexus: Nexus!
override func setUp() {
@ -62,7 +61,6 @@ class NexusTests: XCTestCase {
}
func testComponentCreation() {
XCTAssert(nexus.numEntities == 0)
let e0: Entity = nexus.createEntity()
@ -81,7 +79,6 @@ class NexusTests: XCTestCase {
}
func testComponentDeletion() {
let identifier: EntityIdentifier = nexus.createEntity().identifier
let e0 = nexus.get(entity: identifier)!
@ -125,7 +122,6 @@ class NexusTests: XCTestCase {
e0.destroy()
XCTAssert(e0.numComponents == 0)
}
func testComponentRetrieval() {
@ -136,11 +132,9 @@ class NexusTests: XCTestCase {
let (rPos, rName, rVel) = entity.get(components: Position.self, Name.self, Velocity.self)
XCTAssertTrue(rPos === pos)
XCTAssertTrue(rName === name)
XCTAssertTrue(rVel === vel)
}
func testComponentUniqueness() {
@ -162,7 +156,5 @@ class NexusTests: XCTestCase {
XCTAssert(pB.x != pA.x)
XCTAssert(pB.y != pA.y)
}
}

2
Tests/FirebladeECSTests/SingleTests.swift
View File

@ -46,7 +46,6 @@ class SingleTests: XCTestCase {
XCTAssertEqual(singleA, singleB)
}
func testSingleEntityAndComponentCreation() {
let single = nexus.single(SingleGameState.self)
let gameState = SingleGameState()
@ -54,7 +53,6 @@ class SingleTests: XCTestCase {
XCTAssertNotNil(single.component)
XCTAssertEqual(single.component.shouldQuit, gameState.shouldQuit)
XCTAssertEqual(single.component.playerHealth, gameState.playerHealth)
}
func testSingleCreationOnExistingFamilyMember() {

14
Tests/FirebladeECSTests/SparseSetTests.swift
View File

@ -9,7 +9,6 @@
import XCTest
class SparseSetTests: XCTestCase {
var set: UnorderedSparseSet<Position>!
override func setUp() {
@ -23,7 +22,6 @@ class SparseSetTests: XCTestCase {
}
func testSparseSetAdd() {
let num: Int = 100
for idx in 0..<num {
@ -47,7 +45,6 @@ class SparseSetTests: XCTestCase {
}
func testSparseSetAddAndReplace() {
let p1 = Position(x: 1, y: 1)
let p2 = Position(x: 2, y: 2)
@ -60,11 +57,9 @@ class SparseSetTests: XCTestCase {
XCTAssertEqual(set.get(at: 10)?.x, p2.x)
XCTAssertEqual(set.count, 1)
}
func testSparseSetGet() {
let p1 = Position(x: 1, y: 1)
set.insert(p1, at: 10)
@ -79,7 +74,6 @@ class SparseSetTests: XCTestCase {
}
func testSparseSetRemove() {
let num: Int = 7
for idx in 0..<num {
@ -358,7 +352,6 @@ class SparseSetTests: XCTestCase {
XCTAssertEqual(set.sparse[5], nil)
XCTAssertEqual(set.sparse[6], nil)
XCTAssertEqual(set.sparse[7], nil)
}
func testSparseSetRemoveAndAdd() {
@ -384,11 +377,9 @@ class SparseSetTests: XCTestCase {
XCTAssertEqual(set.get(at: 56)?.x, 56)
XCTAssertEqual(set.get(at: 99)?.x, 99)
XCTAssertEqual(set.get(at: 3)?.x, 3)
}
func testSparseSetRemoveNonPresent() {
XCTAssertTrue(set.isEmpty)
XCTAssertNil(set.remove(at: 100))
XCTAssertTrue(set.isEmpty)
@ -427,11 +418,9 @@ class SparseSetTests: XCTestCase {
XCTAssertTrue(set.get(at: 0) === a)
XCTAssertEqual(set.count, 1)
}
func testSparseSetNonCongiuousData() {
var indices: Set<Int> = [0, 30, 1, 21, 78, 56, 99, 3]
for idx in indices {
@ -462,7 +451,6 @@ class SparseSetTests: XCTestCase {
}
func testSparseSetClear() {
let num: Int = 100
XCTAssertEqual(set.count, 0)
@ -506,7 +494,6 @@ class SparseSetTests: XCTestCase {
// NOTE: this tests only dense insertion order, this is no guarantee for the real ordering.
XCTAssertEqual(string, "Hello World")
}
func testSubscript() {
@ -541,7 +528,6 @@ class SparseSetTests: XCTestCase {
}
func testStartEndIndex() {
let set = UnorderedSparseSet<Character>()
set.insert("C", at: 33)

4
Tests/FirebladeECSTests/SystemsTests.swift
View File

@ -9,7 +9,6 @@
import XCTest
class SystemsTests: XCTestCase {
var nexus: Nexus!
var colorSystem: ColorSystem!
var positionSystem: PositionSystem!
@ -26,11 +25,9 @@ class SystemsTests: XCTestCase {
positionSystem = nil
nexus = nil
super.tearDown()
}
func testSystemsUpdate() {
let num: Int = 10_000
colorSystem.update()
@ -126,5 +123,4 @@ class SystemsTests: XCTestCase {
entity.destroy()
}
}
}

20
Tests/FirebladeECSTests/XCTestManifests.swift
View File

@ -6,7 +6,7 @@ extension ComponentTests {
// `swift test --generate-linuxmain`
// to regenerate.
static let __allTests__ComponentTests = [
("testComponentIdentifier", testComponentIdentifier),
("testComponentIdentifier", testComponentIdentifier)
]
}
@ -15,7 +15,7 @@ extension EntityTests {
// `swift test --generate-linuxmain`
// to regenerate.
static let __allTests__EntityTests = [
("testEntityIdentifierAndIndex", testEntityIdentifierAndIndex),
("testEntityIdentifierAndIndex", testEntityIdentifierAndIndex)
]
}
@ -30,7 +30,7 @@ extension FamilyTests {
("testFamilyExchange", testFamilyExchange),
("testFamilyLateMember", testFamilyLateMember),
("testFamilyMemberBasicIteration", testFamilyMemberBasicIteration),
("testFamilyReuse", testFamilyReuse),
("testFamilyReuse", testFamilyReuse)
]
}
@ -40,7 +40,7 @@ extension FamilyTraitsTests {
// to regenerate.
static let __allTests__FamilyTraitsTests = [
("testTraitCommutativity", testTraitCommutativity),
("testTraitMatching", testTraitMatching),
("testTraitMatching", testTraitMatching)
]
}
@ -49,7 +49,7 @@ extension HashingTests {
// `swift test --generate-linuxmain`
// to regenerate.
static let __allTests__HashingTests = [
("testCollisionsInCritialRange", testCollisionsInCritialRange),
("testCollisionsInCritialRange", testCollisionsInCritialRange)
]
}
@ -63,7 +63,7 @@ extension NexusTests {
("testComponentRetrieval", testComponentRetrieval),
("testComponentUniqueness", testComponentUniqueness),
("testEntityCreate", testEntityCreate),
("testEntityDestroy", testEntityDestroy),
("testEntityDestroy", testEntityDestroy)
]
}
@ -75,7 +75,7 @@ extension SingleTests {
("testSingleCreation", testSingleCreation),
("testSingleCreationOnExistingFamilyMember", testSingleCreationOnExistingFamilyMember),
("testSingleEntityAndComponentCreation", testSingleEntityAndComponentCreation),
("testSingleReuse", testSingleReuse),
("testSingleReuse", testSingleReuse)
]
}
@ -95,7 +95,7 @@ extension SparseSetTests {
("testSparseSetRemoveAndAdd", testSparseSetRemoveAndAdd),
("testSparseSetRemoveNonPresent", testSparseSetRemoveNonPresent),
("testStartEndIndex", testStartEndIndex),
("testSubscript", testSubscript),
("testSubscript", testSubscript)
]
}
@ -104,7 +104,7 @@ extension SystemsTests {
// `swift test --generate-linuxmain`
// to regenerate.
static let __allTests__SystemsTests = [
("testSystemsUpdate", testSystemsUpdate),
("testSystemsUpdate", testSystemsUpdate)
]
}
@ -118,7 +118,7 @@ public func __allTests() -> [XCTestCaseEntry] {
testCase(NexusTests.__allTests__NexusTests),
testCase(SingleTests.__allTests__SingleTests),
testCase(SparseSetTests.__allTests__SparseSetTests),
testCase(SystemsTests.__allTests__SystemsTests),
testCase(SystemsTests.__allTests__SystemsTests)
]
}
#endif