From ed3d2d3621d8286f10d28f80a73df06f21aaa764 Mon Sep 17 00:00:00 2001 From: Shadowfacts Date: Thu, 27 Jun 2019 19:29:29 -0400 Subject: [PATCH] Fix tests failing due to missing screen during attempted window dismissal --- src/test/kotlin/net/shadowfacts/cacao/view/ViewClickTests.kt | 5 ++++- .../net/shadowfacts/cacao/view/button/ButtonClickTests.kt | 5 ++++- .../net/shadowfacts/cacao/view/button/EnumButtonTests.kt | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/test/kotlin/net/shadowfacts/cacao/view/ViewClickTests.kt b/src/test/kotlin/net/shadowfacts/cacao/view/ViewClickTests.kt index 3be895c..2cda207 100644 --- a/src/test/kotlin/net/shadowfacts/cacao/view/ViewClickTests.kt +++ b/src/test/kotlin/net/shadowfacts/cacao/view/ViewClickTests.kt @@ -1,5 +1,6 @@ package net.shadowfacts.cacao.view +import net.shadowfacts.cacao.CacaoScreen import net.shadowfacts.cacao.Window import net.shadowfacts.cacao.geometry.Point import net.shadowfacts.cacao.geometry.Rect @@ -14,11 +15,13 @@ import java.util.concurrent.CompletableFuture */ class ViewClickTests { + lateinit var screen: CacaoScreen lateinit var window: Window @BeforeEach fun setup() { - window = Window() + screen = CacaoScreen() + window = screen.addWindow(Window()) } @Test diff --git a/src/test/kotlin/net/shadowfacts/cacao/view/button/ButtonClickTests.kt b/src/test/kotlin/net/shadowfacts/cacao/view/button/ButtonClickTests.kt index a846556..ad8ebca 100644 --- a/src/test/kotlin/net/shadowfacts/cacao/view/button/ButtonClickTests.kt +++ b/src/test/kotlin/net/shadowfacts/cacao/view/button/ButtonClickTests.kt @@ -1,5 +1,6 @@ package net.shadowfacts.cacao.view.button +import net.shadowfacts.cacao.CacaoScreen import net.shadowfacts.cacao.Window import net.shadowfacts.cacao.geometry.Point import net.shadowfacts.cacao.geometry.Size @@ -17,11 +18,13 @@ import java.util.concurrent.CompletableFuture */ class ButtonClickTests { + lateinit var screen: CacaoScreen lateinit var window: Window @BeforeEach fun setup() { - window = Window() + screen = CacaoScreen() + window = screen.addWindow(Window()) } @Test diff --git a/src/test/kotlin/net/shadowfacts/cacao/view/button/EnumButtonTests.kt b/src/test/kotlin/net/shadowfacts/cacao/view/button/EnumButtonTests.kt index a434fca..c0a7479 100644 --- a/src/test/kotlin/net/shadowfacts/cacao/view/button/EnumButtonTests.kt +++ b/src/test/kotlin/net/shadowfacts/cacao/view/button/EnumButtonTests.kt @@ -1,5 +1,6 @@ package net.shadowfacts.cacao.view.button +import net.shadowfacts.cacao.CacaoScreen import net.shadowfacts.cacao.Window import net.shadowfacts.cacao.geometry.Point import net.shadowfacts.cacao.geometry.Rect @@ -28,11 +29,13 @@ class EnumButtonTests { ONE, TWO, THREE } + lateinit var screen: CacaoScreen lateinit var window: Window @BeforeEach fun setup() { - window = Window() + screen = CacaoScreen() + window = screen.addWindow(Window()) } @Test