From 1717d1ca420cbca6a036ecb90a573e5badda219c Mon Sep 17 00:00:00 2001 From: Stefan Ranoszek Date: Tue, 17 Dec 2024 12:19:14 +0000 Subject: [PATCH 01/13] fix: wait --- .../testing/framework/stepdefs/vol/InternalApplication.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/test/java/org/dvsa/testing/framework/stepdefs/vol/InternalApplication.java b/src/test/java/org/dvsa/testing/framework/stepdefs/vol/InternalApplication.java index f34b27b8e..07ca679a0 100644 --- a/src/test/java/org/dvsa/testing/framework/stepdefs/vol/InternalApplication.java +++ b/src/test/java/org/dvsa/testing/framework/stepdefs/vol/InternalApplication.java @@ -81,9 +81,8 @@ public void iGenerateALetter() { @Then("The pop up should contain letter details") public void thePopUpShouldContainLetterDetails() { waitForTextToBePresent("Amend letter"); - // waitForElementToBePresent("//*[@id='letter-link']"); if (isElementNotPresent("//*[@id='letter-link']", SelectorType.XPATH)) { - waitAndClick("GV - Blank letter to operator", SelectorType.LINKTEXT); + clickByLinkText("GV - Blank letter to operator"); ArrayList tabs = new ArrayList (getWindowHandles()); switchToWindow(tabs.get(0)); } From b5a6720a1388f5be353e0a1c5ad4440b66cff0c8 Mon Sep 17 00:00:00 2001 From: Stefan Ranoszek Date: Tue, 17 Dec 2024 14:58:16 +0000 Subject: [PATCH 02/13] fix: 5 runners --- .../java/org/dvsa/testing/framework/parallel/CustomRunner.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/org/dvsa/testing/framework/parallel/CustomRunner.java b/src/test/java/org/dvsa/testing/framework/parallel/CustomRunner.java index ee8b980d7..1e34ceb54 100644 --- a/src/test/java/org/dvsa/testing/framework/parallel/CustomRunner.java +++ b/src/test/java/org/dvsa/testing/framework/parallel/CustomRunner.java @@ -7,7 +7,7 @@ import java.util.concurrent.ForkJoinPool; import java.util.function.Predicate; public class CustomRunner implements ParallelExecutionConfiguration, ParallelExecutionConfigurationStrategy { - private static final int FIXED_PARALLELISM = 3; + private static final int FIXED_PARALLELISM = 5; static { System.out.println("THREADS: " + FIXED_PARALLELISM); From 1b9d4294af87d17a7c3ea53726057194b119eb80 Mon Sep 17 00:00:00 2001 From: Stefan Ranoszek Date: Tue, 17 Dec 2024 15:07:33 +0000 Subject: [PATCH 03/13] chore: snyk --- .snyk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.snyk b/.snyk index 4ff22bec6..ef13e2973 100644 --- a/.snyk +++ b/.snyk @@ -5,32 +5,32 @@ ignore: SNYK-JAVA-ORGBOUNCYCASTLE-6612984: - '*': reason: None Given - expires: 2024-12-10T:46:16.314Z + expires: 2025-12-10T:46:16.314Z created: 2024-05-09T15:46:16.322Z SNYK-JAVA-DOM4J-174153: - '*': reason: None Given - expires: 2024-12-17T13:36:08.904Z + expires: 2025-12-17T13:36:08.904Z created: 2024-05-08T13:36:08.910Z SNYK-JAVA-ORGYAML-2806360: - '*': reason: None Given - expires: 2024-12-17T13:49:35.026Z + expires: 2025-12-17T13:49:35.026Z created: 2024-05-08T13:49:35.034Z SNYK-JAVA-DOM4J-2812975: - '*': reason: None Given - expires: 2024-12-17T13:52:40.223Z + expires: 2025-12-17T13:52:40.223Z created: 2024-05-08T13:52:40.231Z SNYK-JAVA-ORGYAML-6056527: - '*': reason: None Given - expires: 2024-12-17T13:53:08.534Z + expires: 2025-12-17T13:53:08.534Z created: 2024-05-08T13:53:08.541Z SNYK-JAVA-SOFTWAREAMAZONION-6153869: - '*': reason: None Given - expires: 2024-12-17T13:53:47.241Z + expires: 2025-12-17T13:53:47.241Z created: 2024-05-08T13:53:47.250Z patch: {} From 9f3d1f0014f1caeeb4fcd620cc8b8a2705bcd51f Mon Sep 17 00:00:00 2001 From: Stefan Ranoszek Date: Tue, 17 Dec 2024 15:19:42 +0000 Subject: [PATCH 04/13] chore: wait and click --- .../testing/framework/stepdefs/vol/InternalApplication.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/test/java/org/dvsa/testing/framework/stepdefs/vol/InternalApplication.java b/src/test/java/org/dvsa/testing/framework/stepdefs/vol/InternalApplication.java index 07ca679a0..391a43db9 100644 --- a/src/test/java/org/dvsa/testing/framework/stepdefs/vol/InternalApplication.java +++ b/src/test/java/org/dvsa/testing/framework/stepdefs/vol/InternalApplication.java @@ -82,8 +82,7 @@ public void iGenerateALetter() { public void thePopUpShouldContainLetterDetails() { waitForTextToBePresent("Amend letter"); if (isElementNotPresent("//*[@id='letter-link']", SelectorType.XPATH)) { - clickByLinkText("GV - Blank letter to operator"); - ArrayList tabs = new ArrayList (getWindowHandles()); + waitAndClick("//*[contains(text(),'GV - Blank letter to operator')]", SelectorType.XPATH); ArrayList tabs = new ArrayList (getWindowHandles()); switchToWindow(tabs.get(0)); } String docStoreLink = getLink("//*[@id='letter-link']",SelectorType.XPATH); From d6d1d64e31e3601773bfcd33a5b5df1f3aeeed99 Mon Sep 17 00:00:00 2001 From: Stefan Ranoszek Date: Tue, 17 Dec 2024 15:48:55 +0000 Subject: [PATCH 05/13] chore: wait and click --- pom.xml | 2 +- .../java/org/dvsa/testing/framework/parallel/CustomRunner.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index ba4f1756b..b2a80b676 100644 --- a/pom.xml +++ b/pom.xml @@ -247,7 +247,7 @@ **/**.java - suites + methods 5 diff --git a/src/test/java/org/dvsa/testing/framework/parallel/CustomRunner.java b/src/test/java/org/dvsa/testing/framework/parallel/CustomRunner.java index 1e34ceb54..ee8b980d7 100644 --- a/src/test/java/org/dvsa/testing/framework/parallel/CustomRunner.java +++ b/src/test/java/org/dvsa/testing/framework/parallel/CustomRunner.java @@ -7,7 +7,7 @@ import java.util.concurrent.ForkJoinPool; import java.util.function.Predicate; public class CustomRunner implements ParallelExecutionConfiguration, ParallelExecutionConfigurationStrategy { - private static final int FIXED_PARALLELISM = 5; + private static final int FIXED_PARALLELISM = 3; static { System.out.println("THREADS: " + FIXED_PARALLELISM); From 4bea4e9053721fd721fe32f65ca444b351ff1c2f Mon Sep 17 00:00:00 2001 From: Stefan Ranoszek Date: Wed, 18 Dec 2024 11:34:44 +0000 Subject: [PATCH 06/13] chore: remove maven failsafe --- pom.xml | 90 +++++++++---------- .../stepdefs/vol/TestRunConfiguration.java | 7 +- 2 files changed, 43 insertions(+), 54 deletions(-) diff --git a/pom.xml b/pom.xml index b2a80b676..feedb0538 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.dvsa.testing.framework vol-functional-tests - 3.10.3-SNAPSHOT + 3.9.1-SNAPSHOT @@ -18,8 +18,8 @@ 2.11.0 - 2.20.1 - 2.25.0 + 2.27.0 + 2.27.0 2.22.0 2.22.0 @@ -37,7 +37,7 @@ 1.15 11 - 2048 + 4000 @@ -45,14 +45,14 @@ org.junit junit-bom - 5.10.1 + 5.10.2 pom import io.cucumber cucumber-bom - 7.15.0 + 7.18.0 pom import @@ -93,8 +93,22 @@ junit-platform-suite test - - + + io.cucumber + cucumber-picocontainer + test + + + io.qameta.allure + allure-cucumber7-jvm + ${allure-cucumber7-jvm.version} + test + + + io.qameta.allure + allure-attachments + ${allure-report.version} + org.dvsa.testing.lib active-support @@ -148,22 +162,6 @@ ${zt-zip.version} jar - - io.cucumber - cucumber-picocontainer - test - - - io.qameta.allure - allure-cucumber7-jvm - ${allure-cucumber7-jvm.version} - test - - - io.qameta.allure - allure-attachments - ${allure-report.version} - org.apache.commons commons-csv @@ -204,12 +202,28 @@ org.apache.maven.plugins maven-surefire-plugin ${maven-surefire-plugin.version} + + + integration-test + + test + + + + + **/**.java + -javaagent:"${settings.localRepository}/org/aspectj/aspectjweaver/${aspectj.version}/aspectjweaver-${aspectj.version}.jar" - -Dcucumber.options="--plugin io.qameta.allure.cucumber7jvm.AllureCucumber7Jvm" -Xmx${jvmMemory}m + true + 1 + 3 + suites + 5 + true