Add constants for string literals in UI test classes

src/test/java/io/openliberty/tools/intellij/it/SingleModJakartaLSTestCommon.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2023, 2024 IBM Corporation.
+ * Copyright (c) 2023, 2025 IBM Corporation.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -20,6 +20,8 @@
 import java.time.Duration;
 
 import static com.intellij.remoterobot.utils.RepeatUtilsKt.waitForIgnoringError;
+import static io.openliberty.tools.intellij.it.Utils.ItConstants.*;
+import static io.openliberty.tools.intellij.it.TestUtils.*;
 
 public abstract class SingleModJakartaLSTestCommon {
     public static final String REMOTEBOT_URL = "http://localhost:8082";
@@ -61,8 +63,8 @@ public void afterEach(TestInfo info) {
     public static void cleanup() {
         ProjectFrameFixture projectFrame = remoteRobot.find(ProjectFrameFixture.class, Duration.ofMinutes(2));
 
-        UIBotTestUtils.closeFileEditorTab(remoteRobot, "SystemResource.java", "5");
-        UIBotTestUtils.closeFileEditorTab(remoteRobot, "SystemResource2.java", "5");
+        UIBotTestUtils.closeFileEditorTab(remoteRobot, SYSTEM_RESOURCE_JAVA, "5");
+        UIBotTestUtils.closeFileEditorTab(remoteRobot, SYSTEM_RESOURCE_2_JAVA, "5");
 
         UIBotTestUtils.closeProjectView(remoteRobot);
         UIBotTestUtils.closeProjectFrame(remoteRobot);
@@ -80,7 +82,7 @@ public void testInsertJakartaCodeSnippetIntoJavaPart() {
         String insertedCode = "public String methodname() {";
 
         // get focus on file tab prior to copy
-        UIBotTestUtils.clickOnFileTab(remoteRobot, "SystemResource.java");
+        UIBotTestUtils.clickOnFileTab(remoteRobot, SYSTEM_RESOURCE_JAVA);
 
         // Save the current content.
         UIBotTestUtils.copyWindowContent(remoteRobot);
@@ -90,8 +92,8 @@ public void testInsertJakartaCodeSnippetIntoJavaPart() {
 
         // Insert a code snippet into java part
         try {
-            UIBotTestUtils.insertCodeSnippetIntoSourceFile(remoteRobot, "SystemResource.java", snippetStr, snippetChooser);
-            Path pathToSrc = Paths.get(projectsPath, projectName, "src", "main", "java", "io", "openliberty", "mp", "sample", "system", "SystemResource.java");
+            UIBotTestUtils.insertCodeSnippetIntoSourceFile(remoteRobot, SYSTEM_RESOURCE_JAVA, snippetStr, snippetChooser);
+            Path pathToSrc = Paths.get(projectsPath, combinePath(projectName, buildPathArray(SYSTEM_DIR_PATH, SYSTEM_RESOURCE_JAVA)));
             TestUtils.validateCodeInJavaSrc(pathToSrc.toString(), insertedCode);
         }
         finally {
@@ -109,28 +111,28 @@ public void testJakartaDiagnosticsInJavaPart() {
         String privateString = "private Response getProperties() {";
         String flaggedString = "getProperties";
         String expectedHoverData = "Only public methods can be exposed as resource methods";
-        Path pathToSrc = Paths.get(projectsPath, projectName, "src", "main", "java", "io", "openliberty", "mp", "sample", "system", "SystemResource2.java");
+        Path pathToSrc = Paths.get(projectsPath, combinePath(projectName, buildPathArray(SYSTEM_DIR_PATH, SYSTEM_RESOURCE_2_JAVA)));
 
         // get focus on file tab prior to copy
-        UIBotTestUtils.clickOnFileTab(remoteRobot, "SystemResource2.java");
+        UIBotTestUtils.clickOnFileTab(remoteRobot, SYSTEM_RESOURCE_2_JAVA);
 
         // Modify the method signature
-        UIBotTestUtils.selectAndModifyTextInJavaPart(remoteRobot, "SystemResource2.java", publicString, privateString);
+        UIBotTestUtils.selectAndModifyTextInJavaPart(remoteRobot, SYSTEM_RESOURCE_2_JAVA, publicString, privateString);
 
         try {
             // validate the method signature is no longer set to public
             TestUtils.validateStringNotInFile(pathToSrc.toString(), publicString);
 
             //there should be a diagnostic for "private" on method signature - move cursor to hover point
-            UIBotTestUtils.hoverInAppServerCfgFile(remoteRobot, flaggedString, "SystemResource2.java", UIBotTestUtils.PopupType.DIAGNOSTIC);
+            UIBotTestUtils.hoverInAppServerCfgFile(remoteRobot, flaggedString, SYSTEM_RESOURCE_2_JAVA, UIBotTestUtils.PopupType.DIAGNOSTIC);
 
             String foundHoverData = UIBotTestUtils.getHoverStringData(remoteRobot, UIBotTestUtils.PopupType.DIAGNOSTIC);
             TestUtils.validateHoverData(expectedHoverData, foundHoverData);
-            UIBotTestUtils.clickOnFileTab(remoteRobot, "SystemResource2.java");
+            UIBotTestUtils.clickOnFileTab(remoteRobot, SYSTEM_RESOURCE_2_JAVA);
 
         } finally {
             // Replace modified content with the original content
-            UIBotTestUtils.selectAndModifyTextInJavaPart(remoteRobot, "SystemResource2.java", privateString, publicString);
+            UIBotTestUtils.selectAndModifyTextInJavaPart(remoteRobot, SYSTEM_RESOURCE_2_JAVA, privateString, publicString);
         }
     }
 
@@ -144,24 +146,24 @@ public void testJakartaQuickFixInJavaPart() {
         String privateString = "private Response getProperties() {";
         String flaggedString = "getProperties";
 
-        Path pathToSrc = Paths.get(projectsPath, projectName, "src", "main", "java", "io", "openliberty", "mp", "sample", "system", "SystemResource2.java");
+        Path pathToSrc = Paths.get(projectsPath, combinePath(projectName, buildPathArray(SYSTEM_DIR_PATH, SYSTEM_RESOURCE_2_JAVA)));
         String quickfixChooserString = "Make method public";
 
         // get focus on file tab prior to copy
-        UIBotTestUtils.clickOnFileTab(remoteRobot, "SystemResource2.java");
+        UIBotTestUtils.clickOnFileTab(remoteRobot, SYSTEM_RESOURCE_2_JAVA);
 
         // Save the current content.
         UIBotTestUtils.copyWindowContent(remoteRobot);
 
         // Modify the method signature
-        UIBotTestUtils.selectAndModifyTextInJavaPart(remoteRobot, "SystemResource2.java", publicString, privateString);
+        UIBotTestUtils.selectAndModifyTextInJavaPart(remoteRobot, SYSTEM_RESOURCE_2_JAVA, publicString, privateString);
 
         try {
             // validate public signature no longer found in java part
             TestUtils.validateStringNotInFile(pathToSrc.toString(), publicString);
 
             //there should be a diagnostic - move cursor to hover point
-            UIBotTestUtils.hoverForQuickFixInAppFile(remoteRobot, flaggedString, "SystemResource2.java", quickfixChooserString);
+            UIBotTestUtils.hoverForQuickFixInAppFile(remoteRobot, flaggedString, SYSTEM_RESOURCE_2_JAVA, quickfixChooserString);
 
             // trigger and use the quickfix popup attached to the diagnostic
             UIBotTestUtils.chooseQuickFix(remoteRobot, quickfixChooserString);
@@ -198,11 +200,11 @@ public static void prepareEnv(String projectPath, String projectName) {
 
         // expand project directories that are specific to this test app being used by these testcases
         // must be expanded here before trying to open specific files
-        projTree.expand(projectName, "src", "main", "java", "io.openliberty.mp.sample", "system");
-
-        UIBotTestUtils.openFile(remoteRobot, projectName, "SystemResource", projectName, "src", "main", "java", "io.openliberty.mp.sample", "system");
-        UIBotTestUtils.openFile(remoteRobot, projectName, "SystemResource2", projectName, "src", "main", "java", "io.openliberty.mp.sample", "system");
+        projTree.expand(combinePath(projectName, SYSTEM_DIR_PATH_FOR_EXPAND));
 
+        String[] systemDirPath = combinePath(projectName, SYSTEM_DIR_PATH_FOR_EXPAND);
+        UIBotTestUtils.openFile(remoteRobot, projectName, SYSTEM_RESOURCE, systemDirPath);
+        UIBotTestUtils.openFile(remoteRobot, projectName, SYSTEM_RESOURCE_2, systemDirPath);
 
         // Removes the build tool window if it is opened. This prevents text to be hidden by it.
         UIBotTestUtils.removeToolWindow(remoteRobot, "Build:");