From 093e274a1e1acc7dd6a96ea7603cd7207c2b1d09 Mon Sep 17 00:00:00 2001 From: Ralf Ueberfuhr Date: Fri, 6 Sep 2024 15:02:29 +0200 Subject: [PATCH] Refactor Continuous Testing RPC service and UI - merge observers for test state and results - replace direct rendering of results and state by custom API object (DTO) - optimize size and structure of JSON message resolves #43067 --- .../dev/testing/TestClassResult.java | 25 +- .../deployment/dev/testing/TestResult.java | 27 ++- .../dev/testing/TestRunResults.java | 25 +- .../results/TestClassResultInterface.java | 16 ++ .../testing/results/TestResultInterface.java | 34 +++ .../results/TestRunResultsInterface.java | 31 +++ .../menu/ContinuousTestingProcessor.java | 3 +- .../dev-ui/qwc/qwc-continuous-testing.js | 214 ++++++++--------- .../ContinuousTestingJsonRPCService.java | 102 +++++--- .../ContinuousTestingJsonRPCState.java | 217 ++++++++++++++++++ 10 files changed, 522 insertions(+), 172 deletions(-) create mode 100644 core/devmode-spi/src/main/java/io/quarkus/dev/testing/results/TestClassResultInterface.java create mode 100644 core/devmode-spi/src/main/java/io/quarkus/dev/testing/results/TestResultInterface.java create mode 100644 core/devmode-spi/src/main/java/io/quarkus/dev/testing/results/TestRunResultsInterface.java create mode 100644 extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/continuoustesting/ContinuousTestingJsonRPCState.java diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestClassResult.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestClassResult.java index da4df8a928f7d3..3025d52a6164bb 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestClassResult.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestClassResult.java @@ -3,7 +3,10 @@ import java.util.ArrayList; import java.util.List; -public class TestClassResult implements Comparable { +import io.quarkus.dev.testing.results.TestClassResultInterface; +import io.quarkus.dev.testing.results.TestResultInterface; + +public class TestClassResult implements TestClassResultInterface { final String className; final List passing; final List failing; @@ -11,7 +14,11 @@ public class TestClassResult implements Comparable { final long latestRunId; final long time; - public TestClassResult(String className, List passing, List failing, List skipped, + public TestClassResult( + String className, + List passing, + List failing, + List skipped, long time) { this.className = className; this.passing = passing; @@ -19,15 +26,16 @@ public TestClassResult(String className, List passing, List getResults() { List ret = new ArrayList<>(); ret.addAll(passing); @@ -64,4 +68,5 @@ public List getResults() { ret.addAll(skipped); return ret; } + } diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestResult.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestResult.java index 4f5025391a0b3a..f5d9994f790542 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestResult.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestResult.java @@ -7,7 +7,9 @@ import org.junit.platform.engine.TestExecutionResult; import org.junit.platform.engine.UniqueId; -public class TestResult { +import io.quarkus.dev.testing.results.TestResultInterface; + +public class TestResult implements TestResultInterface { final String displayName; final String testClass; @@ -49,18 +51,22 @@ public TestExecutionResult getTestExecutionResult() { return testExecutionResult; } + @Override public List getLogOutput() { return logOutput; } + @Override public String getDisplayName() { return displayName; } + @Override public String getTestClass() { return testClass; } + @Override public List getTags() { return tags; } @@ -69,23 +75,42 @@ public UniqueId getUniqueId() { return uniqueId; } + @Override public boolean isTest() { return test; } + @Override + public String getId() { + return uniqueId.toString(); + } + + @Override public long getRunId() { return runId; } + @Override public long getTime() { return time; } + @Override public List getProblems() { return problems; } + @Override public boolean isReportable() { return reportable; } + + @Override + public State getState() { + return switch (testExecutionResult.getStatus()) { + case FAILED -> State.FAILED; + case ABORTED -> State.SKIPPED; + case SUCCESSFUL -> State.PASSED; + }; + } } diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestRunResults.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestRunResults.java index e4a96544f492f6..fea7f082621d0f 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestRunResults.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestRunResults.java @@ -7,8 +7,10 @@ import java.util.Map; import io.quarkus.deployment.dev.ClassScanResult; +import io.quarkus.dev.testing.results.TestResultInterface; +import io.quarkus.dev.testing.results.TestRunResultsInterface; -public class TestRunResults { +public class TestRunResults implements TestRunResultsInterface { /** * The run id @@ -28,7 +30,7 @@ public class TestRunResults { private final long started; private final long completed; - private final Map results; + private final Map results; private final Map currentFailing = new HashMap<>(); private final Map historicFailing = new HashMap<>(); private final Map currentPassing = new HashMap<>(); @@ -58,9 +60,9 @@ public TestRunResults(long id, ClassScanResult trigger, boolean full, long start long currentFailedCount = 0; long currentSkippedCount = 0; for (Map.Entry i : results.entrySet()) { - passedCount += i.getValue().getPassing().stream().filter(TestResult::isTest).count(); - failedCount += i.getValue().getFailing().stream().filter(TestResult::isTest).count(); - skippedCount += i.getValue().getSkipped().stream().filter(TestResult::isTest).count(); + passedCount += i.getValue().getPassing().stream().filter(TestResultInterface::isTest).count(); + failedCount += i.getValue().getFailing().stream().filter(TestResultInterface::isTest).count(); + skippedCount += i.getValue().getSkipped().stream().filter(TestResultInterface::isTest).count(); currentPassedCount += i.getValue().getPassing().stream().filter(s -> s.isTest() && s.getRunId() == id).count(); currentFailedCount += i.getValue().getFailing().stream().filter(s -> s.isTest() && s.getRunId() == id).count(); currentSkippedCount += i.getValue().getSkipped().stream().filter(s -> s.isTest() && s.getRunId() == id).count(); @@ -98,6 +100,7 @@ public TestRunResults(long id, ClassScanResult trigger, boolean full, long start this.currentSkippedCount = currentSkippedCount; } + @Override public long getId() { return id; } @@ -110,6 +113,7 @@ public boolean isFull() { return full; } + @Override public Map getResults() { return Collections.unmodifiableMap(results); } @@ -130,14 +134,17 @@ public Map getHistoricPassing() { return historicPassing; } + @Override public long getStartedTime() { return started; } + @Override public long getCompletedTime() { return completed; } + @Override public long getTotalTime() { return completed - started; } @@ -154,34 +161,42 @@ public List getSkipped() { return skipped; } + @Override public long getPassedCount() { return passedCount; } + @Override public long getFailedCount() { return failedCount; } + @Override public long getSkippedCount() { return skippedCount; } + @Override public long getCurrentPassedCount() { return currentPassedCount; } + @Override public long getCurrentFailedCount() { return currentFailedCount; } + @Override public long getCurrentSkippedCount() { return currentSkippedCount; } + @Override public long getTotalCount() { return getPassedCount() + getFailedCount() + getSkippedCount(); } + @Override public long getCurrentTotalCount() { return getCurrentPassedCount() + getCurrentFailedCount() + getCurrentSkippedCount(); } diff --git a/core/devmode-spi/src/main/java/io/quarkus/dev/testing/results/TestClassResultInterface.java b/core/devmode-spi/src/main/java/io/quarkus/dev/testing/results/TestClassResultInterface.java new file mode 100644 index 00000000000000..ec482003a62457 --- /dev/null +++ b/core/devmode-spi/src/main/java/io/quarkus/dev/testing/results/TestClassResultInterface.java @@ -0,0 +1,16 @@ +package io.quarkus.dev.testing.results; + +import java.util.List; + +public interface TestClassResultInterface extends Comparable { + + String getClassName(); + + List getResults(); + + @Override + default int compareTo(TestClassResultInterface o) { + return getClassName().compareTo(o.getClassName()); + } + +} diff --git a/core/devmode-spi/src/main/java/io/quarkus/dev/testing/results/TestResultInterface.java b/core/devmode-spi/src/main/java/io/quarkus/dev/testing/results/TestResultInterface.java new file mode 100644 index 00000000000000..8509d68fa219bc --- /dev/null +++ b/core/devmode-spi/src/main/java/io/quarkus/dev/testing/results/TestResultInterface.java @@ -0,0 +1,34 @@ +package io.quarkus.dev.testing.results; + +import java.util.List; + +public interface TestResultInterface { + List getLogOutput(); + + String getDisplayName(); + + String getTestClass(); + + List getTags(); + + boolean isTest(); + + String getId(); + + long getRunId(); + + long getTime(); + + List getProblems(); + + boolean isReportable(); + + State getState(); + + enum State { + PASSED, + FAILED, + SKIPPED + } + +} diff --git a/core/devmode-spi/src/main/java/io/quarkus/dev/testing/results/TestRunResultsInterface.java b/core/devmode-spi/src/main/java/io/quarkus/dev/testing/results/TestRunResultsInterface.java new file mode 100644 index 00000000000000..816703d9df2bb8 --- /dev/null +++ b/core/devmode-spi/src/main/java/io/quarkus/dev/testing/results/TestRunResultsInterface.java @@ -0,0 +1,31 @@ +package io.quarkus.dev.testing.results; + +import java.util.Map; + +public interface TestRunResultsInterface { + long getId(); + + Map getResults(); + + long getStartedTime(); + + long getCompletedTime(); + + long getTotalTime(); + + long getPassedCount(); + + long getFailedCount(); + + long getSkippedCount(); + + long getCurrentPassedCount(); + + long getCurrentFailedCount(); + + long getCurrentSkippedCount(); + + long getTotalCount(); + + long getCurrentTotalCount(); +} diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/menu/ContinuousTestingProcessor.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/menu/ContinuousTestingProcessor.java index 69eaa535b3961f..f1a7e1c0531b1c 100644 --- a/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/menu/ContinuousTestingProcessor.java +++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/menu/ContinuousTestingProcessor.java @@ -16,6 +16,7 @@ import io.quarkus.deployment.dev.testing.TestRunResults; import io.quarkus.deployment.dev.testing.TestSupport; import io.quarkus.dev.spi.DevModeType; +import io.quarkus.dev.testing.results.TestRunResultsInterface; import io.quarkus.devui.deployment.InternalPageBuildItem; import io.quarkus.devui.runtime.continuoustesting.ContinuousTestingJsonRPCService; import io.quarkus.devui.runtime.continuoustesting.ContinuousTestingRecorder; @@ -237,7 +238,7 @@ private void registerGetStatusMethod(LaunchModeBuildItem launchModeBuildItem, Bu } private void registerGetResultsMethod(LaunchModeBuildItem launchModeBuildItem, BuildTimeActionBuildItem actions) { - actions.addAction("getResults", ignored -> { + actions. addAction("getResults", ignored -> { try { Optional ts = TestSupport.instance(); if (testsDisabled(launchModeBuildItem, ts)) { diff --git a/extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/qwc/qwc-continuous-testing.js b/extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/qwc/qwc-continuous-testing.js index e255967f68e0ea..9e4a4508b7931c 100644 --- a/extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/qwc/qwc-continuous-testing.js +++ b/extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/qwc/qwc-continuous-testing.js @@ -78,7 +78,6 @@ export class QwcContinuousTesting extends QwcHotReloadElement { static properties = { _state: {state: true}, - _results: {state: true}, _busy: {state: true}, _detailsOpenedItem: {state: true, type: Array}, _displayTags: {state: true, type: Boolean}, @@ -93,6 +92,45 @@ export class QwcContinuousTesting extends QwcHotReloadElement { this._displayTags = true; } + set _tests(value) { + this._state = value; + this._state?.result?.passed?.forEach(item => item.style = "successful"); + this._state?.result?.failed?.forEach(item => item.style = "failed"); + this._state?.result?.skipped?.forEach(item => item.style = "aborted"); + } + + get _tests() { + return this._state; + } + + get _testsReceived() { + return this._tests != null; + } + + get _testsEnabled() { + return this._tests?.config?.enabled ?? false; + } + + get _testsCurrentlyRunning() { + return this._tests?.inProgress ?? false; + } + + get _testResult() { + return this._tests?.result; + } + + get _hasTestResult() { + return (this._testResult?.counts?.total ?? 0) > 0 + } + + get _hasFailedTestResult() { + return (this._testResult?.counts?.failed ?? 0) > 0; + } + + get _hasTestResultWithTags() { + return (this._testResult?.tags?.length ?? 0) > 0; + } + connectedCallback() { super.connectedCallback(); this._lastKnownState(); @@ -105,11 +143,8 @@ export class QwcContinuousTesting extends QwcHotReloadElement { } _createObservers(){ - this._streamStateObserver = this.jsonRpc.streamTestState().onNext(jsonRpcResponse => { - this._state = JSON.parse(jsonRpcResponse.result); - }); - this._streamResultsObserver = this.jsonRpc.streamTestResults().onNext(jsonRpcResponse => { - this._results = jsonRpcResponse.result; + this._streamStateObserver = this.jsonRpc.streamState().onNext(jsonRpcResponse => { + this._tests = jsonRpcResponse.result; }); } @@ -120,13 +155,8 @@ export class QwcContinuousTesting extends QwcHotReloadElement { _lastKnownState(){ // Get last known - this.jsonRpc.lastKnownState().then(jsonRpcResponse => { - this._state = JSON.parse(jsonRpcResponse.result); - }); - this.jsonRpc.lastKnownResults().then(jsonRpcResponse => { - if(jsonRpcResponse.result){ - this._results = jsonRpcResponse.result; - } + this.jsonRpc.currentState().then(jsonRpcResponse => { + this._tests = jsonRpcResponse.result; }); } @@ -137,77 +167,36 @@ export class QwcContinuousTesting extends QwcHotReloadElement { } render() { - let results = this._prepareResultsToRender(); return html` - ${this._renderMenuBar(results)} - ${this._renderResults(results)} + ${this._renderMenuBar()} + ${this._renderResults()} ${this._renderBarChart()} `; } - _prepareResultsToRender() { - if(this._state && this._state.running && this._results && this._results.results) { - let itemsByState = { - passing: [], - failing: [], - skipped: [], - } - Object - .values(this._results.results) - .forEach(item => { - itemsByState.passing.push(...item.passing.filter( obj => obj.test === true )); - itemsByState.failing.push(...item.failing.filter( obj => obj.test === true )); - itemsByState.skipped.push(...item.skipped.filter( obj => obj.test === true )); - }); - let items = itemsByState.failing.concat( - itemsByState.passing, - itemsByState.skipped - ); - let hasTags = items.find( item => item.tags && item.tags.length > 0 ); - return { - items: items, - meta: { - hasTags: hasTags, - failing: itemsByState.failing.length, - passing: itemsByState.passing.length, - skipped: itemsByState.skipped.length, - }, - } - } else { - return { - items: [], - meta: { - hasTags: false, - failing: 0, - passing: 0, - skipped: 0, - }, - }; - } - } - - _renderMenuBar(results){ - if(this._state){ - return html`
+ _renderMenuBar(){ + if(this._testsReceived) { + return html` +
- ${this._renderStopStartButton()} + ${this._renderStartStopButton()} ${this._renderRunAllButton()} ${this._renderRunFailedButton()} ${this._renderToggleBrokenOnly()} - ${this._renderToggleDisplayTags(results)} + ${this._renderToggleDisplayTags()}
${this._renderBusyIndicator()}
`; - }else{ - return html`
- ${this._renderStartButton()} -
`; } } _renderBarChart(){ - if(this._state && this._state.running && this._state.run > 0){ - let values = [this._state.passed, this._state.failed, this._state.skipped]; + if(this._testsEnabled && this._hasTestResult){ + let values = [ + this._testResult.counts?.passed ?? 0, + this._testResult.counts?.failed ?? 0, + this._testResult.counts?.skipped ?? 0 + ]; return html` - `; - } - _renderBusyIndicator(){ - if(this._state && this._state.inProgress){ + if(this._testsCurrentlyRunning){ return html``; - }else if(this._results && this._state && this._state.running){ + }else if(this._testsEnabled && this._testResult?.totalTime){ return html` Total time: - ${this._results.totalTime}ms + ${this._testResult?.totalTime}ms ` } } - _renderResults(results){ - if(results.items.length > 0){ + _renderResults(){ + let items = []; + if(this._testsEnabled) { + items.push(... (this._testResult?.failed ?? [])); + items.push(... (this._testResult?.passed ?? [])); + items.push(... (this._testResult?.skipped ?? [])); + } + if(items.length > 0){ return html` - this._tagsRenderer(prop), [])}>` : '' } @@ -327,12 +313,13 @@ export class QwcContinuousTesting extends QwcHotReloadElement { } _testRenderer(testLine){ - let level = testLine.testExecutionResult.status.toLowerCase(); - - return html` + let level = testLine.style ?? ''; + return html` + + - ${testLine.testClass} + ${testLine.className} `; } @@ -340,7 +327,7 @@ export class QwcContinuousTesting extends QwcHotReloadElement { var dn = testLine.displayName; var hi = dn.lastIndexOf('#'); var n = dn.substring(hi + 1); - let level = testLine.testExecutionResult.status.toLowerCase(); + let level = testLine.style ?? ''; return html` ${n} `; @@ -352,36 +339,19 @@ export class QwcContinuousTesting extends QwcHotReloadElement { `; } - _detailsRenderer(prop) { - return html`

${prop}

-
-

${this._detailsOpenedItem}

`; - } - - - _renderStopStartButton(){ - if(this._state && this._state.running){ - return this._renderStopButton(); - } - return this._renderStartButton(); - } - - _renderStartButton(){ - return html` + _renderStartStopButton(){ + return html` - Start - `; - } - - _renderStopButton(){ - return html` - - Stop + ${!this._testsEnabled ? 'Start' : 'Stop'} `; } _renderRunAllButton(){ - if(this._state && this._state.running){ + if(this._testsEnabled){ return html` Run all @@ -390,7 +360,7 @@ export class QwcContinuousTesting extends QwcHotReloadElement { } _renderRunFailedButton(){ - if(this._state && this._state.running && this._state.failed > 0){ + if(this._testsEnabled && this._hasFailedTestResult){ return html` Run failed @@ -399,22 +369,22 @@ export class QwcContinuousTesting extends QwcHotReloadElement { } _renderToggleBrokenOnly(){ - if(this._state && this._state.running){ + if(this._testsEnabled){ return html` `; } } - _renderToggleDisplayTags(results) { - if(this._state && this._state.running){ + _renderToggleDisplayTags() { + if(this._testsEnabled){ return html` `; } diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/continuoustesting/ContinuousTestingJsonRPCService.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/continuoustesting/ContinuousTestingJsonRPCService.java index 9a21cd15f126c9..4fc11a6da11242 100644 --- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/continuoustesting/ContinuousTestingJsonRPCService.java +++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/continuoustesting/ContinuousTestingJsonRPCService.java @@ -1,12 +1,22 @@ package io.quarkus.devui.runtime.continuoustesting; +import java.util.Comparator; +import java.util.LinkedList; +import java.util.List; +import java.util.Set; +import java.util.TreeSet; import java.util.function.Consumer; import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.dev.console.DevConsoleManager; import io.quarkus.dev.testing.ContinuousTestingSharedStateManager; -import io.quarkus.vertx.http.runtime.devmode.Json; +import io.quarkus.dev.testing.results.TestResultInterface; +import io.quarkus.dev.testing.results.TestRunResultsInterface; +import io.quarkus.devui.runtime.continuoustesting.ContinuousTestingJsonRPCState.Config; +import io.quarkus.devui.runtime.continuoustesting.ContinuousTestingJsonRPCState.Result; +import io.quarkus.devui.runtime.continuoustesting.ContinuousTestingJsonRPCState.Result.Counts; +import io.quarkus.devui.runtime.continuoustesting.ContinuousTestingJsonRPCState.Result.Item; import io.smallrye.common.annotation.NonBlocking; import io.smallrye.mutiny.Multi; import io.smallrye.mutiny.operators.multi.processors.BroadcastProcessor; @@ -14,48 +24,74 @@ @ApplicationScoped public class ContinuousTestingJsonRPCService implements Consumer { - private final BroadcastProcessor stateBroadcaster = BroadcastProcessor.create(); - private final BroadcastProcessor resultBroadcaster = BroadcastProcessor.create(); + private final BroadcastProcessor stateBroadcaster = BroadcastProcessor.create(); - private String lastKnownState = ""; - private Object lastKnownResults = ""; + private ContinuousTestingJsonRPCState currentState = new ContinuousTestingJsonRPCState(); @Override - public void accept(ContinuousTestingSharedStateManager.State state) { - Json.JsonObjectBuilder response = Json.object(); - response.put("running", state.running); - response.put("inProgress", state.inProgress); - response.put("run", state.run); - response.put("passed", state.passed); - response.put("failed", state.failed); - response.put("skipped", state.skipped); - response.put("isBrokenOnly", state.isBrokenOnly); - response.put("isTestOutput", state.isTestOutput); - response.put("isInstrumentationBasedReload", state.isInstrumentationBasedReload); - response.put("isLiveReload", state.isLiveReload); - this.lastKnownState = response.build(); - stateBroadcaster.onNext(this.lastKnownState); - this.lastKnownResults = DevConsoleManager.invoke("devui-continuous-testing.getResults"); - if (this.lastKnownResults != null) { - resultBroadcaster.onNext(this.lastKnownResults); + public void accept(final ContinuousTestingSharedStateManager.State state) { + final var results = DevConsoleManager. invoke("devui-continuous-testing.getResults"); + final List passedTests = new LinkedList<>(); + final List failedTests = new LinkedList<>(); + final List skippedTests = new LinkedList<>(); + final Set tags = new TreeSet<>(); + if (null != results) { + results + .getResults() + .values() + .stream() + .flatMap(result -> result.getResults().stream()) + .filter(TestResultInterface::isTest) + .sorted( + Comparator + .comparing(TestResultInterface::getTestClass) + .thenComparing(TestResultInterface::getDisplayName) + .thenComparing(TestResultInterface::getDisplayName)) + .forEach( + result -> { + (switch (result.getState()) { + case PASSED -> passedTests; + case FAILED -> failedTests; + case SKIPPED -> skippedTests; + }) + .add( + new Item() + .setClassName(result.getTestClass()) + .setDisplayName(result.getDisplayName()) + .setProblems(result.getProblems().toArray(new Throwable[0])) + .setTime(result.getTime()) + .setTags(result.getTags().toArray(new String[0]))); + tags.addAll(result.getTags()); + }); } + this.currentState = new ContinuousTestingJsonRPCState() + .setInProgress(state.inProgress) + .setConfig( + new Config() + .setEnabled(state.running) + .setBrokenOnly(state.isBrokenOnly)) + .setResult( + new Result() + .setCounts( + new Counts() + .setPassed(state.passed) + .setFailed(state.failed) + .setSkipped(state.skipped)) + .setTags(tags.toArray(new String[0])) + .setTotalTime(results == null ? 0L : results.getTotalTime()) + .setPassed(passedTests.toArray(new Item[0])) + .setFailed(failedTests.toArray(new Item[0])) + .setSkipped(skippedTests.toArray(new Item[0]))); + this.stateBroadcaster.onNext(this.currentState); } - public Multi streamTestState() { + public Multi streamState() { return stateBroadcaster; } - public Multi streamTestResults() { - return resultBroadcaster; - } - @NonBlocking - public String lastKnownState() { - return this.lastKnownState; + public ContinuousTestingJsonRPCState currentState() { + return this.currentState; } - @NonBlocking - public Object lastKnownResults() { - return this.lastKnownResults; - } } diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/continuoustesting/ContinuousTestingJsonRPCState.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/continuoustesting/ContinuousTestingJsonRPCState.java new file mode 100644 index 00000000000000..928f3ec29a9f41 --- /dev/null +++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/continuoustesting/ContinuousTestingJsonRPCState.java @@ -0,0 +1,217 @@ +package io.quarkus.devui.runtime.continuoustesting; + +public class ContinuousTestingJsonRPCState { + + private boolean inProgress; + private Config config; + private Result result; + + public boolean isInProgress() { + return inProgress; + } + + public ContinuousTestingJsonRPCState setInProgress(boolean inProgress) { + this.inProgress = inProgress; + return this; + } + + public Config getConfig() { + return config; + } + + public ContinuousTestingJsonRPCState setConfig(Config config) { + this.config = config; + return this; + } + + public Result getResult() { + return result; + } + + public ContinuousTestingJsonRPCState setResult(Result result) { + this.result = result; + return this; + } + + public static class Config { + + private boolean enabled; + private boolean brokenOnly; + + public boolean isEnabled() { + return enabled; + } + + public Config setEnabled(boolean enabled) { + this.enabled = enabled; + return this; + } + + public boolean isBrokenOnly() { + return brokenOnly; + } + + public Config setBrokenOnly(boolean brokenOnly) { + this.brokenOnly = brokenOnly; + return this; + } + } + + public static class Result { + + private Counts counts; + private long totalTime; + private String[] tags; + private Item[] passed; + private Item[] failed; + private Item[] skipped; + + public Counts getCounts() { + return counts; + } + + public Result setCounts(Counts counts) { + this.counts = counts; + return this; + } + + public long getTotalTime() { + return totalTime; + } + + public Result setTotalTime(long totalTime) { + this.totalTime = totalTime; + return this; + } + + public String[] getTags() { + return tags; + } + + public Result setTags(String[] tags) { + this.tags = tags; + return this; + } + + public Item[] getPassed() { + return passed; + } + + public Result setPassed(Item[] passed) { + this.passed = passed; + return this; + } + + public Item[] getFailed() { + return failed; + } + + public Result setFailed(Item[] failed) { + this.failed = failed; + return this; + } + + public Item[] getSkipped() { + return skipped; + } + + public Result setSkipped(Item[] skipped) { + this.skipped = skipped; + return this; + } + + public static class Counts { + + private long passed; + private long failed; + private long skipped; + + public long getPassed() { + return passed; + } + + public Counts setPassed(long passed) { + this.passed = passed; + return this; + } + + public long getFailed() { + return failed; + } + + public Counts setFailed(long failed) { + this.failed = failed; + return this; + } + + public long getSkipped() { + return skipped; + } + + public Counts setSkipped(long skipped) { + this.skipped = skipped; + return this; + } + + public long getTotal() { + return passed + failed + skipped; + } + } + + public static class Item { + + private String[] tags; + private String className; + private String displayName; + private long time; + private Throwable[] problems; + + public String[] getTags() { + return tags; + } + + public Item setTags(String[] tags) { + this.tags = tags; + return this; + } + + public String getClassName() { + return className; + } + + public Item setClassName(String className) { + this.className = className; + return this; + } + + public String getDisplayName() { + return displayName; + } + + public Item setDisplayName(String displayName) { + this.displayName = displayName; + return this; + } + + public long getTime() { + return time; + } + + public Item setTime(long time) { + this.time = time; + return this; + } + + public Throwable[] getProblems() { + return problems; + } + + public Item setProblems(Throwable[] problems) { + this.problems = problems; + return this; + } + } + + } + +}