diff --git a/pom.xml b/pom.xml index d238b4c9fe..44c1e17a3a 100644 --- a/pom.xml +++ b/pom.xml @@ -281,6 +281,10 @@ org.apache.maven.plugins maven-surefire-plugin + + false + true + ${maven-surefire-plugin.version} diff --git a/tests/tests-framework/src/main/java/org/eclipse/dirigible/tests/IDE.java b/tests/tests-framework/src/main/java/org/eclipse/dirigible/tests/IDE.java index 62ac17421d..b9d265f1d0 100644 --- a/tests/tests-framework/src/main/java/org/eclipse/dirigible/tests/IDE.java +++ b/tests/tests-framework/src/main/java/org/eclipse/dirigible/tests/IDE.java @@ -67,12 +67,24 @@ public void assertPublishingProjectMessage(String projectName) { } public void assertStatusBarMessage(String expectedMessage) { - browser.assertElementExistsByTypeAndText(HtmlElementType.SPAN, expectedMessage); + String homeValue = Configuration.get("DIRIGIBLE_HOME_URL"); + if (null != homeValue && homeValue.contains("services/web/ide")) { + browser.assertElementExistsByTypeAndText(HtmlElementType.SPAN, expectedMessage); + } else { + browser.assertElementExistsByTypeAndText(HtmlElementType.STATUS_MESSAGE, expectedMessage); + + } } public void assertPublishedProjectMessage(String projectName) { - String publishedMessage = "Published '/" + projectName + "'"; - assertStatusBarMessage(publishedMessage); + String homeValue = Configuration.get("DIRIGIBLE_HOME_URL"); + if (null != homeValue && homeValue.contains("services/web/ide")) { + String publishedMessage = "Published '/" + projectName + "'"; + assertStatusBarMessage(publishedMessage); + } else { + String publishedMessage = "Published '/workspace/" + projectName + "'"; + assertStatusBarMessage(publishedMessage); + } } public void assertJSHttpResponse(String projectName, String fileRelativePath, int expectedStatusCode, String expectedBody) { @@ -149,7 +161,8 @@ public void createNewBlankProject(String projectName) { workbench.createNewProject(projectName); - assertCreatedProject(projectName); + // assertCreatedProject(projectName); + assertPublishedProjectMessage(projectName); } public void assertCreatedProject(String projectName) { diff --git a/tests/tests-framework/src/main/java/org/eclipse/dirigible/tests/Workbench.java b/tests/tests-framework/src/main/java/org/eclipse/dirigible/tests/Workbench.java index aa091be1bf..1cd50dd642 100644 --- a/tests/tests-framework/src/main/java/org/eclipse/dirigible/tests/Workbench.java +++ b/tests/tests-framework/src/main/java/org/eclipse/dirigible/tests/Workbench.java @@ -19,7 +19,7 @@ @Component public class Workbench { - public static final String PROJECTS_VIEW_ID = "dgProjects"; + public static final String PROJECTS_VIEW_ID = "pvtree"; public static final String PROJECT_NAME_INPUT_ID = "pgfi1"; private static final String PROJECTS_CONTEXT_MENU_NEW_PROJECT = "New Project"; private static final String CREATE_PROJECT_BUTTON_TEXT = "Create"; diff --git a/tests/tests-framework/src/main/java/org/eclipse/dirigible/tests/framework/HtmlElementType.java b/tests/tests-framework/src/main/java/org/eclipse/dirigible/tests/framework/HtmlElementType.java index 974cea58ac..6e4eb25a3f 100644 --- a/tests/tests-framework/src/main/java/org/eclipse/dirigible/tests/framework/HtmlElementType.java +++ b/tests/tests-framework/src/main/java/org/eclipse/dirigible/tests/framework/HtmlElementType.java @@ -24,7 +24,9 @@ public enum HtmlElementType { SPAN("span"), // DIV("div"), // LI("li"), // - FD_MESSAGE_PAGE_TITLE("bk-message-page-title"); + FD_MESSAGE_PAGE_TITLE("bk-message-page-title"), STATUS_MESSAGE(".statusbar-message"),; + + private final String type; diff --git a/tests/tests-framework/src/main/java/org/eclipse/dirigible/tests/framework/impl/BrowserImpl.java b/tests/tests-framework/src/main/java/org/eclipse/dirigible/tests/framework/impl/BrowserImpl.java index c6e21cbea9..caf2b8d375 100644 --- a/tests/tests-framework/src/main/java/org/eclipse/dirigible/tests/framework/impl/BrowserImpl.java +++ b/tests/tests-framework/src/main/java/org/eclipse/dirigible/tests/framework/impl/BrowserImpl.java @@ -17,8 +17,10 @@ import org.eclipse.dirigible.tests.framework.HtmlElementType; import org.eclipse.dirigible.tests.util.SleepUtil; import org.openqa.selenium.By; +import org.openqa.selenium.WebElement; import org.openqa.selenium.StaleElementReferenceException; import org.openqa.selenium.chrome.ChromeOptions; +import org.openqa.selenium.interactions.Actions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -44,7 +46,8 @@ class BrowserImpl implements Browser { private static final long SELENIDE_TIMEOUT_MILLIS = TimeUnit.SECONDS.toMillis(15); private static final String PATH_SEPARATOR = "/"; private static final int TOTAL_ELEMENT_SEARCH_TIMEOUT = 60 * 1000; - private static final long ELEMENT_SEARCH_IN_FRAME_MILLIS = 100; + private static final long ELEMENT_SEARCH_IN_FRAME_MILLIS = 200; + static { Configuration.timeout = SELENIDE_TIMEOUT_MILLIS; @@ -244,7 +247,10 @@ private Optional findSingleElement(By by, WebElementCondition.. } try { - foundElements.shouldHave(CollectionCondition.size(1), Duration.ofMillis(ELEMENT_SEARCH_IN_FRAME_MILLIS)); + // foundElements.shouldHave(CollectionCondition.size(1), + // Duration.ofMillis(ELEMENT_SEARCH_IN_FRAME_MILLIS)); + foundElements.shouldHave(CollectionCondition.sizeGreaterThan(0), Duration.ofMillis(ELEMENT_SEARCH_IN_FRAME_MILLIS)); + return Optional.of(foundElements.first()); } catch (ListSizeMismatch ex) { LOGGER.debug( @@ -336,7 +342,13 @@ private SelenideElement getElementByAttributeAndContainsText(String elementType, } private By constructCssSelectorByType(String elementType) { - return Selectors.byTagName(elementType); + String homeValue = org.eclipse.dirigible.commons.config.Configuration.get("DIRIGIBLE_HOME_URL"); + if (null != homeValue && homeValue.contains("services/web/ide")) { + return Selectors.byTagName(elementType); + } else { + return By.cssSelector(elementType); + } + } private SelenideElement getElementByAttributeAndText(String elementType, String text) { diff --git a/tests/tests-integrations/pom.xml b/tests/tests-integrations/pom.xml index 3e73f621ac..01c717d1d7 100644 --- a/tests/tests-integrations/pom.xml +++ b/tests/tests-integrations/pom.xml @@ -82,7 +82,7 @@ org.apache.maven.plugins maven-surefire-plugin - true + false diff --git a/tests/tests-integrations/src/test/java/org/eclipse/dirigible/integration/tests/api/java/CsvimIT.java b/tests/tests-integrations/src/test/java/org/eclipse/dirigible/integration/tests/api/java/CsvimIT.java index 206d173521..e41fe3fdcd 100644 --- a/tests/tests-integrations/src/test/java/org/eclipse/dirigible/integration/tests/api/java/CsvimIT.java +++ b/tests/tests-integrations/src/test/java/org/eclipse/dirigible/integration/tests/api/java/CsvimIT.java @@ -9,6 +9,7 @@ */ package org.eclipse.dirigible.integration.tests.api.java; +import org.eclipse.dirigible.commons.config.Configuration; import org.eclipse.dirigible.components.data.sources.manager.DataSourcesManager; import org.eclipse.dirigible.components.database.DirigibleDataSource; import org.eclipse.dirigible.database.sql.DataType; @@ -41,6 +42,10 @@ public class CsvimIT extends UserInterfaceIntegrationTest { private static final String TEST_PROJECT_FOLDER_PATH = "CsvimIT/csvim-test-project"; private static final List CSV_READERS = List.of(new Reader(1, "Ivan", "Ivanov"), new Reader(2, "Maria", "Petrova")); + static { + Configuration.set("DIRIGIBLE_HOME_URL", "services/web/ide/"); + } + @Autowired private DataSourcesManager dataSourcesManager; diff --git a/tests/tests-integrations/src/test/java/org/eclipse/dirigible/integration/tests/services/integrations/CamelDirigibleJavaScriptComponentIT.java b/tests/tests-integrations/src/test/java/org/eclipse/dirigible/integration/tests/services/integrations/CamelDirigibleJavaScriptComponentIT.java index 68493b7b7d..c677be66b8 100644 --- a/tests/tests-integrations/src/test/java/org/eclipse/dirigible/integration/tests/services/integrations/CamelDirigibleJavaScriptComponentIT.java +++ b/tests/tests-integrations/src/test/java/org/eclipse/dirigible/integration/tests/services/integrations/CamelDirigibleJavaScriptComponentIT.java @@ -10,6 +10,7 @@ package org.eclipse.dirigible.integration.tests.services.integrations; import ch.qos.logback.classic.Level; +import org.eclipse.dirigible.commons.config.Configuration; import org.eclipse.dirigible.integration.tests.ui.tests.UserInterfaceIntegrationTest; import org.eclipse.dirigible.tests.logging.LogsAsserter; import org.eclipse.dirigible.tests.restassured.RestAssuredExecutor; @@ -25,6 +26,10 @@ class CamelDirigibleJavaScriptComponentIT extends UserInterfaceIntegrationTest { + static { + Configuration.set("DIRIGIBLE_HOME_URL", "services/web/ide/"); + } + @Autowired private RestAssuredExecutor restAssuredExecutor; private LogsAsserter logsAsserter; diff --git a/tests/tests-integrations/src/test/java/org/eclipse/dirigible/integration/tests/services/integrations/CamelDirigibleTwoStepsJSInvokerIT.java b/tests/tests-integrations/src/test/java/org/eclipse/dirigible/integration/tests/services/integrations/CamelDirigibleTwoStepsJSInvokerIT.java index 3ee1a9cfee..99ec07fa1a 100644 --- a/tests/tests-integrations/src/test/java/org/eclipse/dirigible/integration/tests/services/integrations/CamelDirigibleTwoStepsJSInvokerIT.java +++ b/tests/tests-integrations/src/test/java/org/eclipse/dirigible/integration/tests/services/integrations/CamelDirigibleTwoStepsJSInvokerIT.java @@ -10,6 +10,7 @@ package org.eclipse.dirigible.integration.tests.services.integrations; import ch.qos.logback.classic.Level; +import org.eclipse.dirigible.commons.config.Configuration; import org.eclipse.dirigible.integration.tests.ui.tests.UserInterfaceIntegrationTest; import org.eclipse.dirigible.tests.logging.LogsAsserter; import org.eclipse.dirigible.tests.restassured.RestAssuredExecutor; @@ -25,6 +26,10 @@ class CamelDirigibleTwoStepsJSInvokerIT extends UserInterfaceIntegrationTest { + static { + Configuration.set("DIRIGIBLE_HOME_URL", "services/web/ide/"); + } + @Autowired private RestAssuredExecutor restAssuredExecutor; private LogsAsserter logsAsserter; diff --git a/tests/tests-integrations/src/test/java/org/eclipse/dirigible/integration/tests/ui/tests/BPMStarterTemplateIT.java b/tests/tests-integrations/src/test/java/org/eclipse/dirigible/integration/tests/ui/tests/BPMStarterTemplateIT.java index db6f5885ee..73f5615310 100644 --- a/tests/tests-integrations/src/test/java/org/eclipse/dirigible/integration/tests/ui/tests/BPMStarterTemplateIT.java +++ b/tests/tests-integrations/src/test/java/org/eclipse/dirigible/integration/tests/ui/tests/BPMStarterTemplateIT.java @@ -11,6 +11,7 @@ package org.eclipse.dirigible.integration.tests.ui.tests; import ch.qos.logback.classic.Level; +import org.eclipse.dirigible.commons.config.Configuration; import org.eclipse.dirigible.components.api.bpm.BpmFacade; import org.eclipse.dirigible.tests.FormView; import org.eclipse.dirigible.tests.WelcomeView; @@ -42,6 +43,10 @@ class BPMStarterTemplateIT extends UserInterfaceIntegrationTest { "Hello World! Process variables: {param1=" + PARAM_1_VALUE + ", param2=" + PARAM_2_VALUE + ".0}"; private static final String TRIGGER_BUTTON_TEXT = "Trigger"; + static { + Configuration.set("DIRIGIBLE_HOME_URL", "services/web/ide/"); + } + private LogsAsserter consoleLogAsserter; @BeforeEach diff --git a/tests/tests-integrations/src/test/java/org/eclipse/dirigible/integration/tests/ui/tests/CreateNewProjectIT.java b/tests/tests-integrations/src/test/java/org/eclipse/dirigible/integration/tests/ui/tests/CreateNewProjectIT.java index bf3be314dc..38d39476aa 100644 --- a/tests/tests-integrations/src/test/java/org/eclipse/dirigible/integration/tests/ui/tests/CreateNewProjectIT.java +++ b/tests/tests-integrations/src/test/java/org/eclipse/dirigible/integration/tests/ui/tests/CreateNewProjectIT.java @@ -14,9 +14,9 @@ class CreateNewProjectIT extends UserInterfaceIntegrationTest { - static { - Configuration.set("DIRIGIBLE_HOME_URL", "services/web/ide/"); - } + // static { + // Configuration.set("DIRIGIBLE_HOME_URL", "services/web/ide/"); + // } @Test void testCreateNewBlankProject() { diff --git a/tests/tests-integrations/src/test/java/org/eclipse/dirigible/integration/tests/ui/tests/CustomSecurityIT.java b/tests/tests-integrations/src/test/java/org/eclipse/dirigible/integration/tests/ui/tests/CustomSecurityIT.java index cf41644a68..b4d437a6a4 100644 --- a/tests/tests-integrations/src/test/java/org/eclipse/dirigible/integration/tests/ui/tests/CustomSecurityIT.java +++ b/tests/tests-integrations/src/test/java/org/eclipse/dirigible/integration/tests/ui/tests/CustomSecurityIT.java @@ -10,6 +10,7 @@ */ package org.eclipse.dirigible.integration.tests.ui.tests; +import org.eclipse.dirigible.commons.config.Configuration; import org.eclipse.dirigible.integration.tests.ui.TestProject; import org.eclipse.dirigible.tests.IDE; import org.eclipse.dirigible.tests.IDEFactory; diff --git a/tests/tests-integrations/src/test/java/org/eclipse/dirigible/integration/tests/ui/tests/MailIT.java b/tests/tests-integrations/src/test/java/org/eclipse/dirigible/integration/tests/ui/tests/MailIT.java index 78f703dcce..929724f770 100644 --- a/tests/tests-integrations/src/test/java/org/eclipse/dirigible/integration/tests/ui/tests/MailIT.java +++ b/tests/tests-integrations/src/test/java/org/eclipse/dirigible/integration/tests/ui/tests/MailIT.java @@ -35,6 +35,10 @@ class MailIT extends UserInterfaceIntegrationTest { private static final String PASSWORD = "password"; private static final int PORT = PortUtil.getFreeRandomPort(); + static { + Configuration.set("DIRIGIBLE_HOME_URL", "services/web/ide/"); + } + static { Configuration.set("DIRIGIBLE_MAIL_USERNAME", USER); Configuration.set("DIRIGIBLE_MAIL_PASSWORD", PASSWORD);