From b7fea7d2ed09fd9dcba0e3e7324b08f469368640 Mon Sep 17 00:00:00 2001 From: Anastasia Katsman Date: Tue, 2 Jan 2024 12:22:30 +0100 Subject: [PATCH] [rdct-tests]: rename shutdown -> closeProjectAndExitApp && shutdown -> exitApp - comment about the fact it also closes the project GitOrigin-RevId: c6cd02e81403feef3d9422fca27d3bf283ed288c --- .../intellij/remoteDev/tests/impl/DistributedTestHost.kt | 8 +++++--- .../remoteDev/tests/modelSources/DistributedTestModel.kt | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/platform/remoteDev-util/src/com/intellij/remoteDev/tests/impl/DistributedTestHost.kt b/platform/remoteDev-util/src/com/intellij/remoteDev/tests/impl/DistributedTestHost.kt index 8b5b1f27fece..89a79d21cd3f 100644 --- a/platform/remoteDev-util/src/com/intellij/remoteDev/tests/impl/DistributedTestHost.kt +++ b/platform/remoteDev-util/src/com/intellij/remoteDev/tests/impl/DistributedTestHost.kt @@ -211,10 +211,12 @@ open class DistributedTestHost(coroutineScope: CoroutineScope) { true } } - - session.shutdown.adviseOn(lifetime, Dispatchers.Default.asRdScheduler) { + /** + * Includes closing the project + */ + session.exitApp.adviseOn(lifetime, Dispatchers.Default.asRdScheduler) { lifetime.launch(Dispatchers.EDT + ModalityState.any().asContextElement() + NonCancellable) { - LOG.info("Shutting down the application...") + LOG.info("Exiting the application...") app.exit(true, true, false) } } diff --git a/platform/remoteDev-util/src/com/intellij/remoteDev/tests/modelSources/DistributedTestModel.kt b/platform/remoteDev-util/src/com/intellij/remoteDev/tests/modelSources/DistributedTestModel.kt index f06760d0eb2e..d824c99f3571 100644 --- a/platform/remoteDev-util/src/com/intellij/remoteDev/tests/modelSources/DistributedTestModel.kt +++ b/platform/remoteDev-util/src/com/intellij/remoteDev/tests/modelSources/DistributedTestModel.kt @@ -58,7 +58,7 @@ object DistributedTestModel : Ext(TestRoot) { field("debugCategories", immutableList(string)) property("ready", bool.nullable) signal("sendException", RdTestSessionException).async - signal("shutdown", void).async + signal("exitApp", void).async signal("showNotification", string) call("closeProject", void, bool).async call("closeProjectIfOpened", void, bool).async