diff --git a/pom.xml b/pom.xml index 6b1b45c..f89dc50 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ org.scadalts scada-lts-e2e Scada-LTS-E2E - 23.0.7-SNAPSHOT + 23.0.9-SNAPSHOT pom @@ -43,7 +43,7 @@ ${project.version} ${project.version} - 6.14.1 + 6.17.1 4.4.0 4.13.1 1.18.24 @@ -635,7 +635,7 @@ true ${start-class} - ${project.artifactId}-${project.version}-${test.e2e.env}-${test.e2e.browser-ref}${test.e2e.custom-name} + ${project.artifactId}-${project.version}-${test.e2e.env}-${test.e2e.browser-ref} diff --git a/scada-lts-e2e-app/pom.xml b/scada-lts-e2e-app/pom.xml index 30b8f44..8624009 100644 --- a/scada-lts-e2e-app/pom.xml +++ b/scada-lts-e2e-app/pom.xml @@ -5,7 +5,7 @@ org.scadalts scada-lts-e2e - 23.0.7-SNAPSHOT + 23.0.9-SNAPSHOT 4.0.0 diff --git a/scada-lts-e2e-cli/pom.xml b/scada-lts-e2e-cli/pom.xml index 214e4d3..29763f2 100644 --- a/scada-lts-e2e-cli/pom.xml +++ b/scada-lts-e2e-cli/pom.xml @@ -5,7 +5,7 @@ org.scadalts scada-lts-e2e - 23.0.7-SNAPSHOT + 23.0.9-SNAPSHOT 4.0.0 diff --git a/scada-lts-e2e-common/pom.xml b/scada-lts-e2e-common/pom.xml index a58c206..a6409f6 100644 --- a/scada-lts-e2e-common/pom.xml +++ b/scada-lts-e2e-common/pom.xml @@ -6,7 +6,7 @@ scada-lts-e2e org.scadalts - 23.0.7-SNAPSHOT + 23.0.9-SNAPSHOT 4.0.0 scada-lts-e2e-common diff --git a/scada-lts-e2e-common/scada-lts-e2e-common-api/pom.xml b/scada-lts-e2e-common/scada-lts-e2e-common-api/pom.xml index cad5e82..6b0ad3c 100644 --- a/scada-lts-e2e-common/scada-lts-e2e-common-api/pom.xml +++ b/scada-lts-e2e-common/scada-lts-e2e-common-api/pom.xml @@ -5,7 +5,7 @@ scada-lts-e2e-common org.scadalts - 23.0.7-SNAPSHOT + 23.0.9-SNAPSHOT 4.0.0 jar diff --git a/scada-lts-e2e-common/scada-lts-e2e-common-core/pom.xml b/scada-lts-e2e-common/scada-lts-e2e-common-core/pom.xml index cf1cbcb..e679402 100644 --- a/scada-lts-e2e-common/scada-lts-e2e-common-core/pom.xml +++ b/scada-lts-e2e-common/scada-lts-e2e-common-core/pom.xml @@ -5,7 +5,7 @@ scada-lts-e2e-common org.scadalts - 23.0.7-SNAPSHOT + 23.0.9-SNAPSHOT 4.0.0 jar diff --git a/scada-lts-e2e-common/scada-lts-e2e-common-core/src/main/java/org/scadalts/e2e/common/core/config/E2eConfig.java b/scada-lts-e2e-common/scada-lts-e2e-common-core/src/main/java/org/scadalts/e2e/common/core/config/E2eConfig.java index 9277032..74b3bb3 100644 --- a/scada-lts-e2e-common/scada-lts-e2e-common-core/src/main/java/org/scadalts/e2e/common/core/config/E2eConfig.java +++ b/scada-lts-e2e-common/scada-lts-e2e-common-core/src/main/java/org/scadalts/e2e/common/core/config/E2eConfig.java @@ -98,6 +98,7 @@ public interface E2eConfig { boolean isScreenshotMode(); + @Deprecated boolean isDriverManagerMode(); boolean isContinuousMode(); diff --git a/scada-lts-e2e-common/scada-lts-e2e-common-impl/pom.xml b/scada-lts-e2e-common/scada-lts-e2e-common-impl/pom.xml index 5462321..b325086 100644 --- a/scada-lts-e2e-common/scada-lts-e2e-common-impl/pom.xml +++ b/scada-lts-e2e-common/scada-lts-e2e-common-impl/pom.xml @@ -5,7 +5,7 @@ scada-lts-e2e-common org.scadalts - 23.0.7-SNAPSHOT + 23.0.9-SNAPSHOT 4.0.0 jar diff --git a/scada-lts-e2e-page/pom.xml b/scada-lts-e2e-page/pom.xml index aa99dc7..aa218a7 100644 --- a/scada-lts-e2e-page/pom.xml +++ b/scada-lts-e2e-page/pom.xml @@ -6,7 +6,7 @@ scada-lts-e2e org.scadalts - 23.0.7-SNAPSHOT + 23.0.9-SNAPSHOT 4.0.0 diff --git a/scada-lts-e2e-page/scada-lts-e2e-page-api/pom.xml b/scada-lts-e2e-page/scada-lts-e2e-page-api/pom.xml index e394dc6..a7c5406 100644 --- a/scada-lts-e2e-page/scada-lts-e2e-page-api/pom.xml +++ b/scada-lts-e2e-page/scada-lts-e2e-page-api/pom.xml @@ -5,7 +5,7 @@ scada-lts-e2e-page org.scadalts - 23.0.7-SNAPSHOT + 23.0.9-SNAPSHOT 4.0.0 scada-lts-e2e-page-api diff --git a/scada-lts-e2e-page/scada-lts-e2e-page-core/pom.xml b/scada-lts-e2e-page/scada-lts-e2e-page-core/pom.xml index b0627be..b3112eb 100644 --- a/scada-lts-e2e-page/scada-lts-e2e-page-core/pom.xml +++ b/scada-lts-e2e-page/scada-lts-e2e-page-core/pom.xml @@ -5,7 +5,7 @@ scada-lts-e2e-page org.scadalts - 23.0.7-SNAPSHOT + 23.0.9-SNAPSHOT 4.0.0 diff --git a/scada-lts-e2e-page/scada-lts-e2e-page-core/src/main/java/org/scadalts/e2e/page/core/config/PageObjectConfigurator.java b/scada-lts-e2e-page/scada-lts-e2e-page-core/src/main/java/org/scadalts/e2e/page/core/config/PageObjectConfigurator.java index 6fff7cc..8fa04ac 100644 --- a/scada-lts-e2e-page/scada-lts-e2e-page-core/src/main/java/org/scadalts/e2e/page/core/config/PageObjectConfigurator.java +++ b/scada-lts-e2e-page/scada-lts-e2e-page-core/src/main/java/org/scadalts/e2e/page/core/config/PageObjectConfigurator.java @@ -33,7 +33,7 @@ public static void init(E2eConfig config) { Configuration.baseUrl = config.getUrlAppBeingTested().toString(); Configuration.browser = config.getBrowserRef().name().toLowerCase(); Configuration.pageLoadStrategy = config.getPageLoadStrategy().name().toLowerCase(); - Configuration.driverManagerEnabled = config.isDriverManagerMode(); + //Configuration.driverManagerEnabled = config.isDriverManagerMode(); Configuration.screenshots = config.isScreenshotMode(); Configuration.headless = config.isHeadlessMode(); Configuration.reportsUrl = config.getReportsUrl() == null ? null : config.getReportsUrl().toString(); @@ -104,7 +104,7 @@ private static void _initDefault() { Configuration.baseUrl = E2eConfiguration.baseUrl.toString(); Configuration.browser = "chrome"; Configuration.pageLoadStrategy = "normal"; - Configuration.driverManagerEnabled = false; + //Configuration.driverManagerEnabled = false; Configuration.screenshots = true; Configuration.headless = false; Configuration.reportsUrl = ""; diff --git a/scada-lts-e2e-page/scada-lts-e2e-page-impl/pom.xml b/scada-lts-e2e-page/scada-lts-e2e-page-impl/pom.xml index 76543ea..732c934 100644 --- a/scada-lts-e2e-page/scada-lts-e2e-page-impl/pom.xml +++ b/scada-lts-e2e-page/scada-lts-e2e-page-impl/pom.xml @@ -5,7 +5,7 @@ scada-lts-e2e-page org.scadalts - 23.0.7-SNAPSHOT + 23.0.9-SNAPSHOT 4.0.0 scada-lts-e2e-page-impl diff --git a/scada-lts-e2e-page/scada-lts-e2e-page-impl/src/main/java/org/scadalts/e2e/page/impl/pages/LoginPage.java b/scada-lts-e2e-page/scada-lts-e2e-page-impl/src/main/java/org/scadalts/e2e/page/impl/pages/LoginPage.java index c8b9e5e..eef205b 100644 --- a/scada-lts-e2e-page/scada-lts-e2e-page-impl/src/main/java/org/scadalts/e2e/page/impl/pages/LoginPage.java +++ b/scada-lts-e2e-page/scada-lts-e2e-page-impl/src/main/java/org/scadalts/e2e/page/impl/pages/LoginPage.java @@ -71,7 +71,8 @@ public LoginPage setPassword(String password) { public NavigationPage login() { this.loginButton.click(); - return page(NavigationPage.openPage()); + printCurrentUrl(); + return NavigationPage.openPage(getCurrentUrl()); } public static String getUrlRef() { diff --git a/scada-lts-e2e-page/scada-lts-e2e-page-impl/src/main/java/org/scadalts/e2e/page/impl/pages/navigation/NavigationPage.java b/scada-lts-e2e-page/scada-lts-e2e-page-impl/src/main/java/org/scadalts/e2e/page/impl/pages/navigation/NavigationPage.java index 33b6eea..26c008c 100644 --- a/scada-lts-e2e-page/scada-lts-e2e-page-impl/src/main/java/org/scadalts/e2e/page/impl/pages/navigation/NavigationPage.java +++ b/scada-lts-e2e-page/scada-lts-e2e-page-impl/src/main/java/org/scadalts/e2e/page/impl/pages/navigation/NavigationPage.java @@ -88,7 +88,10 @@ public interface NavigationPage extends PageObject, PageClosable static NavigationPage openPage() { return open(URL_REF, NavigationPageImpl.class); - // .acceptAlertOnPage(); + } + + static NavigationPage openPage(String url) { + return open(url, NavigationPageImpl.class); } static NavigationPage openRootPage() { diff --git a/scada-lts-e2e-service/pom.xml b/scada-lts-e2e-service/pom.xml index d55b780..72e1d66 100644 --- a/scada-lts-e2e-service/pom.xml +++ b/scada-lts-e2e-service/pom.xml @@ -5,7 +5,7 @@ scada-lts-e2e org.scadalts - 23.0.7-SNAPSHOT + 23.0.9-SNAPSHOT 4.0.0 diff --git a/scada-lts-e2e-service/scada-lts-e2e-service-api/pom.xml b/scada-lts-e2e-service/scada-lts-e2e-service-api/pom.xml index 5e013b7..11e7232 100644 --- a/scada-lts-e2e-service/scada-lts-e2e-service-api/pom.xml +++ b/scada-lts-e2e-service/scada-lts-e2e-service-api/pom.xml @@ -5,7 +5,7 @@ scada-lts-e2e-service org.scadalts - 23.0.7-SNAPSHOT + 23.0.9-SNAPSHOT 4.0.0 diff --git a/scada-lts-e2e-service/scada-lts-e2e-service-core/pom.xml b/scada-lts-e2e-service/scada-lts-e2e-service-core/pom.xml index 0a9dfe6..d104af3 100644 --- a/scada-lts-e2e-service/scada-lts-e2e-service-core/pom.xml +++ b/scada-lts-e2e-service/scada-lts-e2e-service-core/pom.xml @@ -5,7 +5,7 @@ scada-lts-e2e-service org.scadalts - 23.0.7-SNAPSHOT + 23.0.9-SNAPSHOT 4.0.0 diff --git a/scada-lts-e2e-service/scada-lts-e2e-service-impl/pom.xml b/scada-lts-e2e-service/scada-lts-e2e-service-impl/pom.xml index 2600c9b..e8a5d9d 100644 --- a/scada-lts-e2e-service/scada-lts-e2e-service-impl/pom.xml +++ b/scada-lts-e2e-service/scada-lts-e2e-service-impl/pom.xml @@ -5,7 +5,7 @@ scada-lts-e2e-service org.scadalts - 23.0.7-SNAPSHOT + 23.0.9-SNAPSHOT 4.0.0 diff --git a/scada-lts-e2e-test/pom.xml b/scada-lts-e2e-test/pom.xml index 1ae5c77..f46809c 100644 --- a/scada-lts-e2e-test/pom.xml +++ b/scada-lts-e2e-test/pom.xml @@ -6,7 +6,7 @@ scada-lts-e2e org.scadalts - 23.0.7-SNAPSHOT + 23.0.9-SNAPSHOT 4.0.0 diff --git a/scada-lts-e2e-test/scada-lts-e2e-test-api/pom.xml b/scada-lts-e2e-test/scada-lts-e2e-test-api/pom.xml index c7039d5..a5f7ef8 100644 --- a/scada-lts-e2e-test/scada-lts-e2e-test-api/pom.xml +++ b/scada-lts-e2e-test/scada-lts-e2e-test-api/pom.xml @@ -5,7 +5,7 @@ org.scadalts scada-lts-e2e-test - 23.0.7-SNAPSHOT + 23.0.9-SNAPSHOT 4.0.0 diff --git a/scada-lts-e2e-test/scada-lts-e2e-test-core/pom.xml b/scada-lts-e2e-test/scada-lts-e2e-test-core/pom.xml index 367a1af..5500718 100644 --- a/scada-lts-e2e-test/scada-lts-e2e-test-core/pom.xml +++ b/scada-lts-e2e-test/scada-lts-e2e-test-core/pom.xml @@ -5,7 +5,7 @@ scada-lts-e2e-test org.scadalts - 23.0.7-SNAPSHOT + 23.0.9-SNAPSHOT 4.0.0 diff --git a/scada-lts-e2e-test/scada-lts-e2e-test-impl/pom.xml b/scada-lts-e2e-test/scada-lts-e2e-test-impl/pom.xml index 34e5de2..4e521c9 100644 --- a/scada-lts-e2e-test/scada-lts-e2e-test-impl/pom.xml +++ b/scada-lts-e2e-test/scada-lts-e2e-test-impl/pom.xml @@ -5,7 +5,7 @@ scada-lts-e2e-test org.scadalts - 23.0.7-SNAPSHOT + 23.0.9-SNAPSHOT 4.0.0 diff --git a/scada-lts-e2e-test/scada-lts-e2e-test-impl/src/main/java/org/scadalts/e2e/test/impl/groovy/GroovyEngine.java b/scada-lts-e2e-test/scada-lts-e2e-test-impl/src/main/java/org/scadalts/e2e/test/impl/groovy/GroovyEngine.java index 8cff2b8..a2a843a 100644 --- a/scada-lts-e2e-test/scada-lts-e2e-test-impl/src/main/java/org/scadalts/e2e/test/impl/groovy/GroovyEngine.java +++ b/scada-lts-e2e-test/scada-lts-e2e-test-impl/src/main/java/org/scadalts/e2e/test/impl/groovy/GroovyEngine.java @@ -59,7 +59,11 @@ public void after() { @AfterClass public static void clean() { - _clean(); + try { + _clean(); + } finally { + System.gc(); + } } private static void _clean() { @@ -73,7 +77,6 @@ private static void _clean() { if(TestWithoutPageUtil.isApiLogged()) TestWithoutPageUtil.close(); } - System.gc(); } private void _preconfig(GroovyExecute execute) { diff --git a/scada-lts-e2e-test/scada-lts-e2e-test-impl/src/main/java/org/scadalts/e2e/test/impl/tests/check/login/LoginCheckTest.java b/scada-lts-e2e-test/scada-lts-e2e-test-impl/src/main/java/org/scadalts/e2e/test/impl/tests/check/login/LoginCheckTest.java index 63e85f1..a61e725 100644 --- a/scada-lts-e2e-test/scada-lts-e2e-test-impl/src/main/java/org/scadalts/e2e/test/impl/tests/check/login/LoginCheckTest.java +++ b/scada-lts-e2e-test/scada-lts-e2e-test-impl/src/main/java/org/scadalts/e2e/test/impl/tests/check/login/LoginCheckTest.java @@ -26,7 +26,7 @@ public void clean() { public void test_login() { //when: - NavigationPage navigationPage = TestWithPageUtil.openNavigationPage(); + NavigationPage navigationPage = TestWithPageUtil.openNavigationPage().acceptAlertOnPageSlow().waitOnPage(500); //and: String userName = navigationPage.getUserName();