Merge pull request #19791 from stuartwdouglas/19777

Update Dev UI with the correct state when resuming
quarkusio · Sep 1, 2021 · ee8028a · ee8028a
2 parents 236dc6b + 25ab926
commit ee8028a
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 16 deletions.
diff --git a/...e/ContinuousTestingWebSocketListener.java → ...ntinuousTestingWebSocketTestListener.java b/...e/ContinuousTestingWebSocketListener.java → ...ntinuousTestingWebSocketTestListener.java
@@ -11,7 +11,9 @@
 import io.quarkus.deployment.dev.testing.TestRunResults;
 import io.quarkus.dev.testing.ContinuousTestingWebsocketListener;
 
-public class ContinuousTestingWebSocketListener implements TestListener {
+public class ContinuousTestingWebSocketTestListener implements TestListener {
+
+    private volatile ContinuousTestingWebsocketListener.State lastState;
 
     @Override
     public void listenerRegistered(TestController testController) {
@@ -20,9 +22,18 @@ public void listenerRegistered(TestController testController) {
 
     @Override
     public void testsEnabled() {
-        ContinuousTestingWebsocketListener
-                .setLastState(
-                        new ContinuousTestingWebsocketListener.State(true, true, 0L, 0L, 0L, 0L, false, false, false, true));
+        if (lastState == null) {
+            ContinuousTestingWebsocketListener
+                    .setLastState(new ContinuousTestingWebsocketListener.State(true, false,
+                            0, 0, 0, 0,
+                            ContinuousTestingWebsocketListener.getLastState().isBrokenOnly,
+                            ContinuousTestingWebsocketListener.getLastState().isTestOutput,
+                            ContinuousTestingWebsocketListener.getLastState().isInstrumentationBasedReload,
+                            ContinuousTestingWebsocketListener.getLastState().isLiveReload));
+        } else {
+            ContinuousTestingWebsocketListener
+                    .setLastState(lastState);
+        }
     }
 
     @Override
@@ -46,17 +57,18 @@ public void testComplete(TestResult result) {
 
             @Override
             public void runComplete(TestRunResults testRunResults) {
+                lastState = new ContinuousTestingWebsocketListener.State(true, false,
+                        testRunResults.getPassedCount() +
+                                testRunResults.getFailedCount() +
+                                testRunResults.getSkippedCount(),
+                        testRunResults.getPassedCount(),
+                        testRunResults.getFailedCount(), testRunResults.getSkippedCount(),
+                        ContinuousTestingWebsocketListener.getLastState().isBrokenOnly,
+                        ContinuousTestingWebsocketListener.getLastState().isTestOutput,
+                        ContinuousTestingWebsocketListener.getLastState().isInstrumentationBasedReload,
+                        ContinuousTestingWebsocketListener.getLastState().isLiveReload);
                 ContinuousTestingWebsocketListener.setLastState(
-                        new ContinuousTestingWebsocketListener.State(true, false,
-                                testRunResults.getPassedCount() +
-                                        testRunResults.getFailedCount() +
-                                        testRunResults.getSkippedCount(),
-                                testRunResults.getPassedCount(),
-                                testRunResults.getFailedCount(), testRunResults.getSkippedCount(),
-                                ContinuousTestingWebsocketListener.getLastState().isBrokenOnly,
-                                ContinuousTestingWebsocketListener.getLastState().isTestOutput,
-                                ContinuousTestingWebsocketListener.getLastState().isInstrumentationBasedReload,
-                                ContinuousTestingWebsocketListener.getLastState().isLiveReload));
+                        lastState);
             }
 
             @Override

diff --git a/...ployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/tests/TestsProcessor.java b/...ployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/tests/TestsProcessor.java
@@ -23,7 +23,7 @@
 import io.quarkus.devconsole.spi.DevConsoleTemplateInfoBuildItem;
 import io.quarkus.vertx.http.deployment.NonApplicationRootPathBuildItem;
 import io.quarkus.vertx.http.deployment.RouteBuildItem;
-import io.quarkus.vertx.http.deployment.devmode.console.ContinuousTestingWebSocketListener;
+import io.quarkus.vertx.http.deployment.devmode.console.ContinuousTestingWebSocketTestListener;
 import io.quarkus.vertx.http.runtime.devmode.DevConsoleRecorder;
 import io.quarkus.vertx.http.runtime.devmode.Json;
 import io.vertx.core.Handler;
@@ -61,7 +61,7 @@ public void setupTestRoutes(
                     .route("dev/test")
                     .handler(recorder.continousTestHandler(shutdownContextBuildItem))
                     .build());
-            testListenerBuildItemBuildProducer.produce(new TestListenerBuildItem(new ContinuousTestingWebSocketListener()));
+            testListenerBuildItemBuildProducer.produce(new TestListenerBuildItem(new ContinuousTestingWebSocketTestListener()));
         }
 
     }