Bound the setup wizard window tests and close through the window's X

Written-by: DeepSeek V4 Pro
Written-by: Claude Fable 5.2
This commit is contained in:
Rsclub2_2 committed 2026-11-18 21:32:11 +01:00
1 parent f5783ade25
commit f1e80c6ed3
1 file changed
+12 -5
@@ -29,28 +29,35 @@ class SetupWizardWindowTest {
private val closer = Executors.newSingleThreadExecutor() private val closer = Executors.newSingleThreadExecutor()
/** Closes the dialog the way its X does, as soon as it is on screen. */ /** Closes the dialog the way its X does, as soon as it is on screen. */
private fun disposeOnceShowing(): Future<*> = private fun closeOnceShowing(): Future<*> =
closer.submit { closer.submit {
awaitUntil(Duration.ofSeconds(10), "the wizard's dialog never appeared") { awaitUntil(Duration.ofSeconds(10), "the wizard's dialog never appeared") {
showingDialog() != null showingDialog() != null
} }
EventQueue.invokeLater { showingDialog()?.dispose() } EventQueue.invokeLater {
val window = showingDialog()
window?.dispatchEvent(java.awt.event.WindowEvent(window, java.awt.event.WindowEvent.WINDOW_CLOSING))
}
} }
@Test @Test
fun closingTheWindowCountsAsLater() { fun closingTheWindowCountsAsLater() {
assumeFalse(GraphicsEnvironment.isHeadless(), "needs a display") assumeFalse(GraphicsEnvironment.isHeadless(), "needs a display")
val worker = Executors.newSingleThreadExecutor()
try { try {
val closing = disposeOnceShowing() val closing = closeOnceShowing()
val prefs = prefs() val prefs = prefs()
val call = worker.submit<SetupWizardOutcome> { SetupWizardWindow.show(SetupWizardState(prefs), prefs) }
val outcome = SetupWizardWindow.show(SetupWizardState(prefs), prefs) // A dialog that never appears must fail the test, not hang it.
val outcome = call.get(20, TimeUnit.SECONDS)
assertEquals(SetupWizardOutcome.LATER, outcome) assertEquals(SetupWizardOutcome.LATER, outcome)
assertEquals("", prefs.getStn_loginCallSign(), "closing the window wrote something") assertEquals("", prefs.getStn_loginCallSign(), "closing the window wrote something")
closing.get(1, TimeUnit.SECONDS) closing.get(1, TimeUnit.SECONDS)
} finally { } finally {
worker.shutdownNow()
closer.shutdownNow() closer.shutdownNow()
} }
} }
@@ -61,7 +68,7 @@ class SetupWizardWindowTest {
val worker = Executors.newSingleThreadExecutor() val worker = Executors.newSingleThreadExecutor()
try { try {
val closing = disposeOnceShowing() val closing = closeOnceShowing()
val prefs = prefs() val prefs = prefs()
val call = worker.submit { val call = worker.submit {
EventQueue.invokeAndWait { SetupWizardWindow.show(SetupWizardState(prefs), prefs) } EventQueue.invokeAndWait { SetupWizardWindow.show(SetupWizardState(prefs), prefs) }