From 8c2c1fb2494c238386203df882c08108367374c1 Mon Sep 17 00:00:00 2001 From: GregHib Date: Sun, 3 May 2020 15:43:39 +0100 Subject: [PATCH] Removed inline classes closes #46 --- .../kotlin/rs/dusk/engine/entity/list/EntityListTest.kt | 7 +++---- .../test/kotlin/rs/dusk/engine/view/ViewportTaskTest.kt | 5 +++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/engine/src/test/kotlin/rs/dusk/engine/entity/list/EntityListTest.kt b/engine/src/test/kotlin/rs/dusk/engine/entity/list/EntityListTest.kt index 57656dd0d..cddc41004 100644 --- a/engine/src/test/kotlin/rs/dusk/engine/entity/list/EntityListTest.kt +++ b/engine/src/test/kotlin/rs/dusk/engine/entity/list/EntityListTest.kt @@ -49,7 +49,7 @@ internal class EntityListTest { list[10, 20, 1] // Then verifyOrder { -// list[any()] FIXME https://github.com/mockk/mockk/issues/152 + list[any()] list[hash] } } @@ -68,7 +68,7 @@ internal class EntityListTest { list.add(10, 20, 1, entity) // Then verifyOrder { -// list.add(any(), entity) + list.add(any(), entity) list.add(hash, entity) } } @@ -95,7 +95,6 @@ internal class EntityListTest { list[10, 20, 1] = entity // Then verifyOrder { -// list[any()] = entity list.add(hash, entity) } } @@ -114,7 +113,7 @@ internal class EntityListTest { list.remove(10, 20, 1, entity) // Then verifyOrder { -// list.remove(any(), entity) + list.remove(any(), entity) list.remove(hash, entity) } } diff --git a/engine/src/test/kotlin/rs/dusk/engine/view/ViewportTaskTest.kt b/engine/src/test/kotlin/rs/dusk/engine/view/ViewportTaskTest.kt index 15195089b..6cee19cb6 100644 --- a/engine/src/test/kotlin/rs/dusk/engine/view/ViewportTaskTest.kt +++ b/engine/src/test/kotlin/rs/dusk/engine/view/ViewportTaskTest.kt @@ -214,9 +214,10 @@ internal class ViewportTaskTest : KoinMock() { val counter = AtomicInteger(0) fun addEntity(x: Int, y: Int, plane: Int): NPC { -// val npc: NPC = mockk(relaxed = true)// FIXME #46 can't mock tile + val npc: NPC = mockk(relaxed = true) val tile = Tile(x, y, plane) - val npc = NPC(counter.getAndIncrement(), tile) + every { npc.index } returns counter.getAndIncrement() + every { npc.tile } returns tile return npc }