[#415]: Reverted aboslute WLP path modification

OpenLiberty · Apr 9, 2024 · 5666bce · 5666bce
1 parent 9d772c1
commit 5666bce
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 28 deletions.
diff --git a/src/test/java/io/openliberty/tools/intellij/it/GradleSingleModMPProjectTest.java b/src/test/java/io/openliberty/tools/intellij/it/GradleSingleModMPProjectTest.java
@@ -199,11 +199,6 @@ public void validateTestReportsExist() {
         TestUtils.validateTestReportExists(TEST_REPORT_PATH);
     }
 
-    @Override
-    public String getAbsoluteWLPPath() {
-        return Paths.get(PROJECTS_PATH, SM_MP_PROJECT_NAME, WLP_INSTALL_PATH).toString();
-    }
-
     @Override
     public String getCustomWLPPath() {
         String wlpPath = "";

diff --git a/src/test/java/io/openliberty/tools/intellij/it/MavenSingleModMPProjectTest.java b/src/test/java/io/openliberty/tools/intellij/it/MavenSingleModMPProjectTest.java
@@ -211,11 +211,6 @@ public void validateTestReportsExist() {
         TestUtils.validateTestReportExists(pathToUTReport);
     }
 
-    @Override
-    public String getAbsoluteWLPPath() {
-        return Paths.get(PROJECTS_PATH, SM_MP_PROJECT_NAME, WLP_INSTALL_PATH).toString();
-    }
-
     @Override
     public String getCustomWLPPath() {
         String wlpPath = "";

diff --git a/src/test/java/io/openliberty/tools/intellij/it/SingleModMPProjectTestCommon.java b/src/test/java/io/openliberty/tools/intellij/it/SingleModMPProjectTestCommon.java
@@ -101,7 +101,7 @@ public void testOpenBuildFileActionUsingPopUpMenu() {
     @Video
     public void testStartWithParamsActionUsingDropDownMenu() {
         String testName = "testStartWithParamsActionUsingDropDownMenu";
-        String absoluteWLPPath = getAbsoluteWLPPath();
+        String absoluteWLPPath = Paths.get(getProjectsDirPath(), getSmMPProjectName(), getWLPInstallPath()).toString();
 
         // Remove all other configurations first.
         UIBotTestUtils.deleteLibertyRunConfigurations(remoteRobot);
@@ -156,7 +156,7 @@ public void testStartWithParamsActionUsingDropDownMenu() {
     @Video
     public void testStartWithParamsActionUsingPlayToolbarButton() {
         String testName = "testStartWithParamsActionUsingPlayToolbarButton";
-        String absoluteWLPPath = getAbsoluteWLPPath();
+        String absoluteWLPPath = Paths.get(getProjectsDirPath(), getSmMPProjectName(), getWLPInstallPath()).toString();
 
         // Delete any existing test report files.
         deleteTestReports();
@@ -210,7 +210,7 @@ public void testStartWithParamsActionUsingPlayToolbarButton() {
     @Video
     public void testStartWithParamsActionUsingPopUpMenu() {
         String testName = "testStartWithParamsActionUsingPopUpMenu";
-        String absoluteWLPPath = getAbsoluteWLPPath();
+        String absoluteWLPPath = Paths.get(getProjectsDirPath(), getSmMPProjectName(), getWLPInstallPath()).toString();
 
         // Delete any existing test report files.
         deleteTestReports();
@@ -276,7 +276,7 @@ public void testStartWithParamsActionUsingSearch() {
 
         // Run the configuration dialog.
         UIBotTestUtils.runStartParamsConfigDialog(remoteRobot, getStartParams());
-        String absoluteWLPPath = getAbsoluteWLPPath();
+        String absoluteWLPPath = Paths.get(getProjectsDirPath(), getSmMPProjectName(), getWLPInstallPath()).toString();
 
         try {
             // Validate that the application started.
@@ -318,7 +318,7 @@ public void testStartWithParamsActionUsingSearch() {
     @Video
     public void testRunTestsActionUsingDropDownMenu() {
         String testName = "testRunTestsActionUsingDropDownMenu";
-        String absoluteWLPPath = getAbsoluteWLPPath();
+        String absoluteWLPPath = Paths.get(getProjectsDirPath(), getSmMPProjectName(), getWLPInstallPath()).toString();
 
         // Delete any existing test report files.
         deleteTestReports();
@@ -357,7 +357,7 @@ public void testRunTestsActionUsingDropDownMenu() {
     @Video
     public void testRunTestsActionUsingPlayToolbarButton() {
         String testName = "testRunTestsActionUsingPlayToolbarButton";
-        String absoluteWLPPath = getAbsoluteWLPPath();
+        String absoluteWLPPath = Paths.get(getProjectsDirPath(), getSmMPProjectName(), getWLPInstallPath()).toString();
 
         // Delete any existing test report files.
         deleteTestReports();
@@ -395,7 +395,7 @@ public void testRunTestsActionUsingPlayToolbarButton() {
     @Video
     public void testRunTestsActionUsingPopUpMenu() {
         String testName = "testRunTestsActionUsingPopUpMenu";
-        String absoluteWLPPath = getAbsoluteWLPPath();
+        String absoluteWLPPath = Paths.get(getProjectsDirPath(), getSmMPProjectName(), getWLPInstallPath()).toString();
 
         // Delete any existing test report files.
         deleteTestReports();
@@ -433,7 +433,7 @@ public void testRunTestsActionUsingPopUpMenu() {
     @Video
     public void testRunTestsActionUsingSearch() {
         String testName = "testRunTestsActionUsingSearch";
-        String absoluteWLPPath = getAbsoluteWLPPath();
+        String absoluteWLPPath = Paths.get(getProjectsDirPath(), getSmMPProjectName(), getWLPInstallPath()).toString();
 
         // Delete any existing test report files.
         deleteTestReports();
@@ -474,7 +474,7 @@ public void testRunTestsActionUsingSearch() {
     @Video
     public void testStartWithConfigInDebugModeUsingToolbar() {
         String testName = "testStartWithConfigInDebugModeUsingToolbar";
-        String absoluteWLPPath = getAbsoluteWLPPath();
+        String absoluteWLPPath = Paths.get(getProjectsDirPath(), getSmMPProjectName(), getWLPInstallPath()).toString();
 
         // Remove all other configurations first.
         UIBotTestUtils.deleteLibertyRunConfigurations(remoteRobot);
@@ -534,7 +534,7 @@ public void testStartWithConfigInDebugModeUsingToolbar() {
     @Video
     public void testStartWithConfigInDebugModeUsingMenu() {
         String testName = "testStartWithConfigInDebugModeUsingMenu";
-        String absoluteWLPPath = getAbsoluteWLPPath();
+        String absoluteWLPPath = Paths.get(getProjectsDirPath(), getSmMPProjectName(), getWLPInstallPath()).toString();
 
         // Remove all other configurations first.
         UIBotTestUtils.deleteLibertyRunConfigurations(remoteRobot);
@@ -686,7 +686,6 @@ public void testStartWithCustomConfigInDebugModeUsingMenu() {
         // Find the newly created config in the config selection box on the project frame.
         UIBotTestUtils.selectConfigUsingMenu(remoteRobot, configName, UIBotTestUtils.ExecMode.DEBUG);
 
-        //String absoluteWLPPath = getAbsoluteWLPPath();
         TestUtils.sleepAndIgnoreException(60);
 
         String customWLPPath = getCustomWLPPath();
@@ -738,7 +737,7 @@ public void testStartWithCustomConfigInDebugModeUsingMenu() {
     @Video
     public void testStartWithConfigInRunModeUsingToolbar() {
         String testName = "testStartWithConfigInRunModeUsingToolbar";
-        String absoluteWLPPath = getAbsoluteWLPPath();
+        String absoluteWLPPath = Paths.get(getProjectsDirPath(), getSmMPProjectName(), getWLPInstallPath()).toString();
 
         // Remove all other configurations first.
         UIBotTestUtils.deleteLibertyRunConfigurations(remoteRobot);
@@ -777,7 +776,7 @@ public void testStartWithConfigInRunModeUsingToolbar() {
     @Video
     public void testStartWithConfigInRunModeUsingMenu() {
         String testName = "testStartWithConfigInRunModeUsingMenu";
-        String absoluteWLPPath = getAbsoluteWLPPath();
+        String absoluteWLPPath = Paths.get(getProjectsDirPath(), getSmMPProjectName(), getWLPInstallPath()).toString();
 
         // Remove all other configurations first.
         UIBotTestUtils.deleteLibertyRunConfigurations(remoteRobot);
@@ -925,7 +924,7 @@ public void testMultipleConfigEditHistory() {
     @Disabled
     public void testStartInContainerActionUsingDropDownMenu() {
         String testName = "testStartInContainerActionUsingDropDownMenu";
-        String absoluteWLPPath = getAbsoluteWLPPath();
+        String absoluteWLPPath = Paths.get(getProjectsDirPath(), getSmMPProjectName(), getWLPInstallPath()).toString();
 
         // Start dev mode in a container.
         UIBotTestUtils.runLibertyActionFromLTWDropDownMenu(remoteRobot, "Start in container", false, 3);
@@ -990,7 +989,7 @@ public void testStartInContainerActionUsingPlayToolbarButton() {
     @Disabled
     public void testStartInContainerActionUsingPopUpMenu() {
         String testName = "testStartInContainerActionUsingPopUpMenu";
-        String absoluteWLPPath = getAbsoluteWLPPath();
+        String absoluteWLPPath = Paths.get(getProjectsDirPath(), getSmMPProjectName(), getWLPInstallPath()).toString();
 
         // Start dev mode in a container.
         UIBotTestUtils.runActionLTWPopupMenu(remoteRobot, getSmMPProjectName(), "Liberty: Start in container", 3);
@@ -1023,7 +1022,7 @@ public void testStartInContainerActionUsingPopUpMenu() {
     @Disabled
     public void testStartInContainerActionUsingSearch() {
         String testName = "testStartInContainerActionUsingSearch";
-        String absoluteWLPPath = getAbsoluteWLPPath();
+        String absoluteWLPPath = Paths.get(getProjectsDirPath(), getSmMPProjectName(), getWLPInstallPath()).toString();
 
         // Start dev mode in a container.
         UIBotTestUtils.runActionFromSearchEverywherePanel(remoteRobot, "Liberty: Start in container", 3);
@@ -1147,7 +1146,5 @@ public static void prepareEnv(String projectPath, String projectName) {
      */
     public abstract void validateTestReportsExist();
 
-    public abstract String getAbsoluteWLPPath();
-
     public abstract String getCustomWLPPath();
 }