Address code review: import order, debug logging, flushEDT() helpers in tests

Agent-Logs-Url: https://github.com/bedaHovorka/interlockSim/sessions/a05d505b-27f4-4dc3-8ad6-c336a6ca4ec8

Co-authored-by: bedaHovorka <5263405+bedaHovorka@users.noreply.github.com>

Author: Copilot

desktop-ui/src/main/kotlin/cz/vutbr/fit/interlockSim/gui/SimulationController.kt

@@ -98,7 +98,11 @@ internal class SimulationController(
 		// Wire speed indicator: notify StatusBar whenever SimulationRunner speed changes.
 		// The listener is removed when the simulation stops (in stop() or monitor finally).
 		val listener = PropertyChangeListener { evt ->
-			val multiplier = evt.newValue as? Double ?: return@PropertyChangeListener
+			val multiplier = evt.newValue as? Double
+			if (multiplier == null) {
+				logger.debug { "Ignoring unexpected ${SimulationRunner.PROP_SPEED_MULTIPLIER} value: ${evt.newValue}" }
+				return@PropertyChangeListener
+			}
 			statusBar?.updateSpeedIndicator(multiplier)
 		}
 		speedListener = listener

desktop-ui/src/main/kotlin/cz/vutbr/fit/interlockSim/gui/StatusBar.kt

@@ -18,8 +18,8 @@ import java.awt.Dimension
 import java.awt.event.MouseEvent
 import java.awt.event.MouseMotionListener
 import javax.swing.JLabel
-import kotlin.math.abs
 import javax.swing.SwingUtilities
+import kotlin.math.abs
 
 /**
  * Status bar for displaying context information and mouse motion status

desktop-ui/src/test/kotlin/cz/vutbr/fit/interlockSim/gui/SimulationControllerTest.kt

@@ -468,8 +468,7 @@ class SimulationControllerTest {
 		controller.runner!!.speedMultiplier = 2.0
 
 		// Flush EDT twice (listener calls invokeLater, so two flushes are needed)
-		SwingUtilities.invokeAndWait { /* flush 1 */ }
-		SwingUtilities.invokeAndWait { /* flush 2 */ }
+		flushEDT()
 
 		SwingUtilities.invokeAndWait {
 			assertThat(findSpeedText(statusBar)).isEqualTo("Speed: 2.0x")
@@ -499,15 +498,13 @@ class SimulationControllerTest {
 
 		// Set non-default speed, then stop
 		controller.runner!!.speedMultiplier = 3.0
-		SwingUtilities.invokeAndWait { /* flush */ }
-		SwingUtilities.invokeAndWait { /* flush invokeLater */ }
+		flushEDT()
 
 		controller.stop()
 		blockSim.countDown()
 
 		// Stop calls updateSpeedIndicator(DEFAULT_SPEED) via invokeLater
-		SwingUtilities.invokeAndWait { /* flush stop's invokeLater */ }
-		SwingUtilities.invokeAndWait { /* flush nested */ }
+		flushEDT()
 
 		SwingUtilities.invokeAndWait {
 			assertThat(statusBar.isVisible).isFalse()
@@ -516,6 +513,17 @@ class SimulationControllerTest {
 
 	// ── helpers ───────────────────────────────────────────────────────────────
 
+	/**
+	 * Flushes the EDT queue by calling [SwingUtilities.invokeAndWait] the given number of times.
+	 *
+	 * Two flushes are typically needed when a background thread fires an event handled by
+	 * [SwingUtilities.invokeLater]: the first flush dispatches the invokeLater task, and the
+	 * second flush ensures any nested EDT work queued by the task is also completed.
+	 */
+	private fun flushEDT(times: Int = 2) {
+		repeat(times) { SwingUtilities.invokeAndWait { /* flush */ } }
+	}
+
 	private fun findSpeedText(statusBar: StatusBar): String? =
 		statusBar.text.takeIf { it.startsWith("Speed:") }
 

desktop-ui/src/test/kotlin/cz/vutbr/fit/interlockSim/gui/StatusBarTest.kt

@@ -17,6 +17,7 @@ import assertk.assertions.isEqualTo
 import assertk.assertions.isFalse
 import assertk.assertions.isTrue
 import cz.vutbr.fit.interlockSim.PROGRAM_NAME
+import cz.vutbr.fit.interlockSim.objects.core.ContextChangeEvent
 import cz.vutbr.fit.interlockSim.testutil.KoinTestBase
 import cz.vutbr.fit.interlockSim.testutil.testModuleFull
 import io.mockk.mockk
@@ -27,7 +28,7 @@ import org.junit.jupiter.api.Test
 import org.koin.core.module.Module
 import java.awt.Component
 import java.awt.event.MouseEvent
-import cz.vutbr.fit.interlockSim.objects.core.ContextChangeEvent
+import javax.swing.SwingUtilities
 
 /**
  * Tests for StatusBar GUI component.
@@ -165,11 +166,9 @@ class StatusBarTest : KoinTestBase() {
 	@Test
 	@DisplayName("updateSpeedIndicator shows speed text when multiplier is not 1.0x")
 	fun updateSpeedIndicatorShowsSpeedText() {
-		// updateSpeedIndicator uses invokeLater; use invokeAndWait to flush
-		javax.swing.SwingUtilities.invokeAndWait {
-			statusBar.updateSpeedIndicator(2.0)
-		}
-		javax.swing.SwingUtilities.invokeAndWait { /* flush invokeLater */ }
+		// updateSpeedIndicator uses invokeLater; call from non-EDT and flush twice
+		statusBar.updateSpeedIndicator(2.0)
+		flushEDT()
 
 		assertThat(statusBar.text).isEqualTo("Speed: 2.0x")
 		assertThat(statusBar.isVisible).isTrue()
@@ -179,30 +178,36 @@ class StatusBarTest : KoinTestBase() {
 	@DisplayName("updateSpeedIndicator hides status bar at default speed (1.0x)")
 	fun updateSpeedIndicatorHidesAtDefaultSpeed() {
 		// First show at non-default speed, then reset
-		javax.swing.SwingUtilities.invokeAndWait {
-			statusBar.updateSpeedIndicator(3.0)
-		}
-		javax.swing.SwingUtilities.invokeAndWait { /* flush */ }
+		statusBar.updateSpeedIndicator(3.0)
+		flushEDT()
 
-		javax.swing.SwingUtilities.invokeAndWait {
-			statusBar.updateSpeedIndicator(1.0)
-		}
-		javax.swing.SwingUtilities.invokeAndWait { /* flush */ }
+		statusBar.updateSpeedIndicator(1.0)
+		flushEDT()
 
 		assertThat(statusBar.isVisible).isFalse()
 	}
 
 	@Test
 	@DisplayName("updateSpeedIndicator formats multiplier to one decimal place")
 	fun updateSpeedIndicatorFormatsMultiplier() {
-		javax.swing.SwingUtilities.invokeAndWait {
-			statusBar.updateSpeedIndicator(0.5)
-		}
-		javax.swing.SwingUtilities.invokeAndWait { /* flush */ }
+		statusBar.updateSpeedIndicator(0.5)
+		flushEDT()
 
 		assertThat(statusBar.text).isEqualTo("Speed: 0.5x")
 	}
 
+	/**
+	 * Flushes the EDT queue by calling [SwingUtilities.invokeAndWait] twice.
+	 *
+	 * Two flushes are needed when code under test uses [SwingUtilities.invokeLater]:
+	 * the first flush lets the invokeLater task land on EDT, and the second flush
+	 * runs it.
+	 */
+	private fun flushEDT() {
+		SwingUtilities.invokeAndWait { /* flush 1 */ }
+		SwingUtilities.invokeAndWait { /* flush 2 */ }
+	}
+
 	/**
 	 * Test implementation of StatusProducer as a Component.
 	 * This allows us to test the actual mouse listener behavior.