From 33862924f058eed34b78c7358e8a0d24c37aaccc Mon Sep 17 00:00:00 2001 From: vaisakhkannan <133869023+vaisakhkannan@users.noreply.github.com> Date: Thu, 26 Sep 2024 15:27:59 +0530 Subject: [PATCH 1/3] Work around fix for server.env issue --- .../tools/intellij/it/SingleModLibertyLSTestCommon.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/test/java/io/openliberty/tools/intellij/it/SingleModLibertyLSTestCommon.java b/src/test/java/io/openliberty/tools/intellij/it/SingleModLibertyLSTestCommon.java index 0629fedcc..85948c8ae 100644 --- a/src/test/java/io/openliberty/tools/intellij/it/SingleModLibertyLSTestCommon.java +++ b/src/test/java/io/openliberty/tools/intellij/it/SingleModLibertyLSTestCommon.java @@ -335,6 +335,9 @@ public void testDiagnosticInServerEnv() { try { UIBotTestUtils.insertConfigIntoConfigFile(remoteRobot, "server.env", envCfgSnippet, envCfgNameChooserSnippet, incorrectValue, false); + // Close and reopen the server.env file as a workaround for the issue: https://github.com/OpenLiberty/liberty-tools-intellij/issues/945. Remove the two lines below once the root cause of the failure is fixed. + UIBotTestUtils.closeFileEditorTab(remoteRobot, "server.env", "5"); + UIBotTestUtils.openFile(remoteRobot, projectName, "server.env", projectName, "src", "main", "liberty", "config"); //move cursor to hover point UIBotTestUtils.hoverInAppServerCfgFile(remoteRobot, "NONE", "server.env", UIBotTestUtils.PopupType.DIAGNOSTIC); String foundHoverData = UIBotTestUtils.getHoverStringData(remoteRobot, UIBotTestUtils.PopupType.DIAGNOSTIC); From a210996a223c208f4884bf7fea218147f60510e0 Mon Sep 17 00:00:00 2001 From: vaisakhkannan <133869023+vaisakhkannan@users.noreply.github.com> Date: Thu, 3 Oct 2024 18:59:33 +0530 Subject: [PATCH 2/3] Added TODO in comment --- .../tools/intellij/it/SingleModLibertyLSTestCommon.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/io/openliberty/tools/intellij/it/SingleModLibertyLSTestCommon.java b/src/test/java/io/openliberty/tools/intellij/it/SingleModLibertyLSTestCommon.java index 85948c8ae..c41f00d76 100644 --- a/src/test/java/io/openliberty/tools/intellij/it/SingleModLibertyLSTestCommon.java +++ b/src/test/java/io/openliberty/tools/intellij/it/SingleModLibertyLSTestCommon.java @@ -335,7 +335,7 @@ public void testDiagnosticInServerEnv() { try { UIBotTestUtils.insertConfigIntoConfigFile(remoteRobot, "server.env", envCfgSnippet, envCfgNameChooserSnippet, incorrectValue, false); - // Close and reopen the server.env file as a workaround for the issue: https://github.com/OpenLiberty/liberty-tools-intellij/issues/945. Remove the two lines below once the root cause of the failure is fixed. + //TODO: Close and reopen the server.env file as a workaround for the issue: https://github.com/OpenLiberty/liberty-tools-intellij/issues/945. Remove the two lines below once the root cause of the failure is fixed. UIBotTestUtils.closeFileEditorTab(remoteRobot, "server.env", "5"); UIBotTestUtils.openFile(remoteRobot, projectName, "server.env", projectName, "src", "main", "liberty", "config"); //move cursor to hover point From 0f855e03268182451751d054b939a9d884fe5c71 Mon Sep 17 00:00:00 2001 From: vaisakhkannan <133869023+vaisakhkannan@users.noreply.github.com> Date: Mon, 14 Oct 2024 09:57:19 +0530 Subject: [PATCH 3/3] updated the comment Co-authored-by: Trevor Crawford --- .../tools/intellij/it/SingleModLibertyLSTestCommon.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/test/java/io/openliberty/tools/intellij/it/SingleModLibertyLSTestCommon.java b/src/test/java/io/openliberty/tools/intellij/it/SingleModLibertyLSTestCommon.java index c41f00d76..fffe66b73 100644 --- a/src/test/java/io/openliberty/tools/intellij/it/SingleModLibertyLSTestCommon.java +++ b/src/test/java/io/openliberty/tools/intellij/it/SingleModLibertyLSTestCommon.java @@ -335,7 +335,8 @@ public void testDiagnosticInServerEnv() { try { UIBotTestUtils.insertConfigIntoConfigFile(remoteRobot, "server.env", envCfgSnippet, envCfgNameChooserSnippet, incorrectValue, false); - //TODO: Close and reopen the server.env file as a workaround for the issue: https://github.com/OpenLiberty/liberty-tools-intellij/issues/945. Remove the two lines below once the root cause of the failure is fixed. + //Close and reopen the server.env file as a workaround for the issue: https://github.com/OpenLiberty/liberty-tools-intellij/issues/945. + //TODO: Remove the two lines below once the root cause of issue 945 is fixed. UIBotTestUtils.closeFileEditorTab(remoteRobot, "server.env", "5"); UIBotTestUtils.openFile(remoteRobot, projectName, "server.env", projectName, "src", "main", "liberty", "config"); //move cursor to hover point