From a4575e9684f489262cc18571b4ad9d348931d685 Mon Sep 17 00:00:00 2001 From: Iliyan Velichkov Date: Fri, 31 Jan 2025 13:52:16 +0200 Subject: [PATCH] fix tests execution - run them with the old UI until adapted Signed-off-by: Iliyan Velichkov --- .../integration/tests/api/java/CsvimIT.java | 6 +++++- .../CamelDirigibleJavaScriptComponentIT.java | 5 +++++ .../CamelDirigibleTwoStepsJSInvokerIT.java | 5 +++++ .../tests/ui/tests/BPMStarterTemplateIT.java | 6 +++++- .../tests/ui/tests/CreateNewProjectIT.java | 5 +++++ .../integration/tests/ui/tests/CustomSecurityIT.java | 7 +++++-- .../tests/ui/tests/DirigibleHomepageIT.java | 5 +++++ .../dirigible/integration/tests/ui/tests/MailIT.java | 4 ++++ .../integration/tests/ui/tests/MultitenancyIT.java | 12 +++++++----- 9 files changed, 46 insertions(+), 9 deletions(-) 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 38f1647a6d8..e41fe3fdcd5 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; @@ -37,11 +38,14 @@ public class CsvimIT extends UserInterfaceIntegrationTest { private static final Logger LOGGER = LoggerFactory.getLogger(CsvimIT.class); - private static final String UNDEFINIED_TABLE_NAME = "TEST_TABLE_READERS2"; 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 3f4bec16309..87d7cca0793 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; 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 43258d406ff..e529375be48 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; 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 221481d4bfd..73f56153105 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; @@ -34,7 +35,6 @@ class BPMStarterTemplateIT extends UserInterfaceIntegrationTest { private static final String TRIGGER_PROCESS_FORM_FILENAME = "trigger-new-process.form"; private static final String TRIGGER_PROCESS_FORM_PATH = "/services/web/" + TEST_PROJECT + "/gen/trigger-new-process/forms/trigger-new-process/index.html"; - private static final String PARAM_1_ID = "param1Id"; private static final String PARAM_2_ID = "param2Id"; private static final String PARAM_1_VALUE = "string-param-value"; @@ -43,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 72c76fbc2d8..bf3be314dc5 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 @@ -9,10 +9,15 @@ */ package org.eclipse.dirigible.integration.tests.ui.tests; +import org.eclipse.dirigible.commons.config.Configuration; import org.junit.jupiter.api.Test; class CreateNewProjectIT extends UserInterfaceIntegrationTest { + static { + Configuration.set("DIRIGIBLE_HOME_URL", "services/web/ide/"); + } + @Test void testCreateNewBlankProject() { ide.createNewBlankProject("create-project-ui-test"); 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 97571d88080..b102900a05e 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; @@ -24,13 +25,15 @@ class CustomSecurityIT extends UserInterfaceIntegrationTest { private static final String EMPLOYEE_ROLE = "employee"; private static final String EMPLOYEE_USERNAME = "test-employee"; - private static final String EMPLOYEE_MANAGER_ROLE = "employee-manager"; private static final String EMPLOYEE_MANAGER_USERNAME = "test-employee-manager"; - private static final String PROTECTED_PAGE_PATH = "/services/web/dirigible-test-project/security/protected_page.html"; private static final String PROTECTED_PAGE_HEADER = "This is a protected page"; + static { + Configuration.set("DIRIGIBLE_HOME_URL", "services/web/ide/"); + } + @Autowired private TestProject testProject; diff --git a/tests/tests-integrations/src/test/java/org/eclipse/dirigible/integration/tests/ui/tests/DirigibleHomepageIT.java b/tests/tests-integrations/src/test/java/org/eclipse/dirigible/integration/tests/ui/tests/DirigibleHomepageIT.java index 91f3ada3d54..6328de5206b 100644 --- a/tests/tests-integrations/src/test/java/org/eclipse/dirigible/integration/tests/ui/tests/DirigibleHomepageIT.java +++ b/tests/tests-integrations/src/test/java/org/eclipse/dirigible/integration/tests/ui/tests/DirigibleHomepageIT.java @@ -9,6 +9,7 @@ */ package org.eclipse.dirigible.integration.tests.ui.tests; +import org.eclipse.dirigible.commons.config.Configuration; import org.eclipse.dirigible.tests.framework.HtmlElementType; import org.junit.jupiter.api.Test; @@ -16,6 +17,10 @@ class DirigibleHomepageIT extends UserInterfaceIntegrationTest { private static final String ECLIPSE_DIRIGIBLE_HEADER = "Eclipse Dirigible"; + static { + Configuration.set("DIRIGIBLE_HOME_URL", "services/web/ide/"); + } + @Test void testOpenHomepage() { ide.openHomePage(); 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 ae337737ac2..bb9e00a4139 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); diff --git a/tests/tests-integrations/src/test/java/org/eclipse/dirigible/integration/tests/ui/tests/MultitenancyIT.java b/tests/tests-integrations/src/test/java/org/eclipse/dirigible/integration/tests/ui/tests/MultitenancyIT.java index 8d08a618ea2..dc858ed1201 100644 --- a/tests/tests-integrations/src/test/java/org/eclipse/dirigible/integration/tests/ui/tests/MultitenancyIT.java +++ b/tests/tests-integrations/src/test/java/org/eclipse/dirigible/integration/tests/ui/tests/MultitenancyIT.java @@ -26,21 +26,23 @@ class MultitenancyIT extends UserInterfaceIntegrationTest { - @BeforeAll - public static void setUp() { - Configuration.set(DirigibleConfig.MULTI_TENANT_MODE_ENABLED.getKey(), "true"); + static { + Configuration.set("DIRIGIBLE_HOME_URL", "services/web/ide/"); } @Autowired private TestProject testProject; - @Autowired @DefaultTenant private Tenant defTenant; - @Autowired private BrowserFactory browserFactory; + @BeforeAll + public static void setUp() { + Configuration.set(DirigibleConfig.MULTI_TENANT_MODE_ENABLED.getKey(), "true"); + } + @Test void testOpenNotRegisteredTenant() { Browser browser = browserFactory.createBySubdomain("unregistered-tenant");