From 7a56fcf5269f89369243b548b183269963b0aab3 Mon Sep 17 00:00:00 2001 From: savkk Date: Fri, 7 Jun 2024 23:05:12 +0300 Subject: [PATCH 1/2] [cucumber 7] fix npe when parsing a feature-file --- pom.xml | 2 +- .../java/io/qase/cucumber7/QaseEventListener.java | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 7a0d536..3f9b9d7 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ io.qase qase-java pom - 3.2.0 + 3.2.1 qase-api qase-testng diff --git a/qase-cucumber7-jvm/src/main/java/io/qase/cucumber7/QaseEventListener.java b/qase-cucumber7-jvm/src/main/java/io/qase/cucumber7/QaseEventListener.java index e836648..e011cd3 100644 --- a/qase-cucumber7-jvm/src/main/java/io/qase/cucumber7/QaseEventListener.java +++ b/qase-cucumber7-jvm/src/main/java/io/qase/cucumber7/QaseEventListener.java @@ -28,6 +28,7 @@ import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; +import java.net.URL; import java.nio.file.Path; import java.nio.file.Paths; import java.util.*; @@ -129,20 +130,28 @@ private void testRunFinished(TestRunFinished testRunFinished) { } private void testCaseStarted(TestCaseStarted event) { + parseGherkinFile(event); + getQaseTestCaseListener().onTestCaseStarted(); + } + + private void parseGherkinFile(TestCaseStarted event) { if (EXAMPLES.get(getHash(event.getTestCase().getUri(), (long) event.getTestCase().getLocation().getLine())) == null) { TestCase testCase = event.getTestCase(); URI uri = testCase.getUri(); GherkinParser gherkinParser = GherkinParser.builder().build(); try { - Path path = Paths.get(this.getClass().getClassLoader() - .getResource(uri.toString().replace("classpath:", "")).toURI()); + URL resource = this.getClass().getClassLoader() + .getResource(uri.toString().replace("classpath:", "")); + if (resource == null) { + return; + } + Path path = Paths.get(resource.toURI()); Stream envelopes = gherkinParser.parse(path); envelopes.forEach(e -> parseExamples(uri, e)); } catch (IOException | URISyntaxException e) { log.error(e.getMessage()); } } - getQaseTestCaseListener().onTestCaseStarted(); } private void testCaseFinished(TestCaseFinished event) { From 632c5d87b5ed821b231707be32d8cf4cf1d9f0b1 Mon Sep 17 00:00:00 2001 From: savkk Date: Fri, 7 Jun 2024 23:16:09 +0300 Subject: [PATCH 2/2] [all] increase version of release --- qase-api/README.md | 2 +- qase-api/pom.xml | 2 +- qase-cucumber3-jvm/README.md | 2 +- qase-cucumber3-jvm/pom.xml | 2 +- qase-cucumber4-jvm/README.md | 2 +- qase-cucumber4-jvm/pom.xml | 2 +- qase-cucumber5-jvm/README.md | 2 +- qase-cucumber5-jvm/pom.xml | 2 +- qase-cucumber6-jvm/README.md | 2 +- qase-cucumber6-jvm/pom.xml | 2 +- qase-cucumber7-jvm/README.md | 2 +- qase-cucumber7-jvm/pom.xml | 2 +- qase-junit4-aspect/pom.xml | 2 +- qase-junit4/README.md | 8 ++++---- qase-junit4/pom.xml | 2 +- qase-junit5/README.md | 4 ++-- qase-junit5/pom.xml | 2 +- qase-testng/README.md | 4 ++-- qase-testng/pom.xml | 2 +- 19 files changed, 24 insertions(+), 24 deletions(-) diff --git a/qase-api/README.md b/qase-api/README.md index 09ba300..39901db 100644 --- a/qase-api/README.md +++ b/qase-api/README.md @@ -8,7 +8,7 @@ Add the following dependency and repository to your pom.xml: io.qase qase-api - 3.2.0 + 3.2.1 ``` diff --git a/qase-api/pom.xml b/qase-api/pom.xml index 65c1648..d0e2fd4 100644 --- a/qase-api/pom.xml +++ b/qase-api/pom.xml @@ -5,7 +5,7 @@ qase-java io.qase - 3.2.0 + 3.2.1 4.0.0 diff --git a/qase-cucumber3-jvm/README.md b/qase-cucumber3-jvm/README.md index 0d03446..05b16ae 100644 --- a/qase-cucumber3-jvm/README.md +++ b/qase-cucumber3-jvm/README.md @@ -42,7 +42,7 @@ Add the following dependency and repository to your pom.xml: io.qase qase-cucumber3-jvm - 3.2.0 + 3.2.1 diff --git a/qase-cucumber3-jvm/pom.xml b/qase-cucumber3-jvm/pom.xml index 20c4cfe..3fbcb97 100644 --- a/qase-cucumber3-jvm/pom.xml +++ b/qase-cucumber3-jvm/pom.xml @@ -5,7 +5,7 @@ qase-java io.qase - 3.2.0 + 3.2.1 4.0.0 diff --git a/qase-cucumber4-jvm/README.md b/qase-cucumber4-jvm/README.md index 42b4f51..285f4b9 100644 --- a/qase-cucumber4-jvm/README.md +++ b/qase-cucumber4-jvm/README.md @@ -42,7 +42,7 @@ Add the following dependency and repository to your pom.xml: io.qase qase-cucumber4-jvm - 3.2.0 + 3.2.1 diff --git a/qase-cucumber4-jvm/pom.xml b/qase-cucumber4-jvm/pom.xml index 20474e8..e05241d 100644 --- a/qase-cucumber4-jvm/pom.xml +++ b/qase-cucumber4-jvm/pom.xml @@ -5,7 +5,7 @@ qase-java io.qase - 3.2.0 + 3.2.1 4.0.0 diff --git a/qase-cucumber5-jvm/README.md b/qase-cucumber5-jvm/README.md index 8a07653..9b92695 100644 --- a/qase-cucumber5-jvm/README.md +++ b/qase-cucumber5-jvm/README.md @@ -42,7 +42,7 @@ Add the following dependency and repository to your pom.xml: io.qase qase-cucumber5-jvm - 3.2.0 + 3.2.1 diff --git a/qase-cucumber5-jvm/pom.xml b/qase-cucumber5-jvm/pom.xml index a6dbc10..e11ade0 100644 --- a/qase-cucumber5-jvm/pom.xml +++ b/qase-cucumber5-jvm/pom.xml @@ -5,7 +5,7 @@ qase-java io.qase - 3.2.0 + 3.2.1 4.0.0 diff --git a/qase-cucumber6-jvm/README.md b/qase-cucumber6-jvm/README.md index 6ca3e2f..6b747b8 100644 --- a/qase-cucumber6-jvm/README.md +++ b/qase-cucumber6-jvm/README.md @@ -42,7 +42,7 @@ Add the following dependency and repository to your pom.xml: io.qase qase-cucumber6-jvm - 3.2.0 + 3.2.1 diff --git a/qase-cucumber6-jvm/pom.xml b/qase-cucumber6-jvm/pom.xml index d141eef..eb95754 100644 --- a/qase-cucumber6-jvm/pom.xml +++ b/qase-cucumber6-jvm/pom.xml @@ -5,7 +5,7 @@ qase-java io.qase - 3.2.0 + 3.2.1 4.0.0 diff --git a/qase-cucumber7-jvm/README.md b/qase-cucumber7-jvm/README.md index 03a8aee..4702334 100644 --- a/qase-cucumber7-jvm/README.md +++ b/qase-cucumber7-jvm/README.md @@ -42,7 +42,7 @@ Add the following dependency and repository to your pom.xml: io.qase qase-cucumber7-jvm - 3.2.0 + 3.2.1 diff --git a/qase-cucumber7-jvm/pom.xml b/qase-cucumber7-jvm/pom.xml index 4fb4cee..1794054 100644 --- a/qase-cucumber7-jvm/pom.xml +++ b/qase-cucumber7-jvm/pom.xml @@ -5,7 +5,7 @@ qase-java io.qase - 3.2.0 + 3.2.1 4.0.0 diff --git a/qase-junit4-aspect/pom.xml b/qase-junit4-aspect/pom.xml index 1ee7dff..91cb279 100644 --- a/qase-junit4-aspect/pom.xml +++ b/qase-junit4-aspect/pom.xml @@ -6,7 +6,7 @@ io.qase qase-java - 3.2.0 + 3.2.1 qase-junit4-aspect diff --git a/qase-junit4/README.md b/qase-junit4/README.md index 9bb51c4..73a78c6 100644 --- a/qase-junit4/README.md +++ b/qase-junit4/README.md @@ -12,7 +12,7 @@ Add the following dependency and repository to your pom.xml: io.qase qase-junit4 - 3.2.0 + 3.2.1 test @@ -63,9 +63,9 @@ configurations { dependencies { aspectjweaver "org.aspectj:aspectjweaver:1.9.8" - testImplementation 'io.qase:qase-api:3.2.0' - testImplementation 'io.qase:qase-junit4:3.2.0' - testImplementation 'io.qase:qase-junit4-aspect:3.2.0' + testImplementation 'io.qase:qase-api:3.2.1' + testImplementation 'io.qase:qase-junit4:3.2.1' + testImplementation 'io.qase:qase-junit4-aspect:3.2.1' testImplementation 'junit:junit:4.13.2' } diff --git a/qase-junit4/pom.xml b/qase-junit4/pom.xml index e34d759..0506d2c 100644 --- a/qase-junit4/pom.xml +++ b/qase-junit4/pom.xml @@ -5,7 +5,7 @@ qase-java io.qase - 3.2.0 + 3.2.1 4.0.0 diff --git a/qase-junit5/README.md b/qase-junit5/README.md index 21531b8..3d13048 100644 --- a/qase-junit5/README.md +++ b/qase-junit5/README.md @@ -12,7 +12,7 @@ Add the following dependency and repository to your pom.xml: io.qase qase-junit5 - 3.2.0 + 3.2.1 @@ -55,7 +55,7 @@ add the below code to build.gradle: ``` dependencies { ... - testImplementation 'io.qase:qase-junit5:3.2.0' + testImplementation 'io.qase:qase-junit5:3.2.1' } test { diff --git a/qase-junit5/pom.xml b/qase-junit5/pom.xml index 1a33b5b..ea0fd06 100644 --- a/qase-junit5/pom.xml +++ b/qase-junit5/pom.xml @@ -5,7 +5,7 @@ qase-java io.qase - 3.2.0 + 3.2.1 4.0.0 diff --git a/qase-testng/README.md b/qase-testng/README.md index ee4ac52..a48c1cd 100644 --- a/qase-testng/README.md +++ b/qase-testng/README.md @@ -22,7 +22,7 @@ Add the following dependency to your pom.xml: io.qase qase-testng - 3.2.0 + 3.2.1 test @@ -67,7 +67,7 @@ configurations { dependencies { aspectjweaver "org.aspectj:aspectjweaver:1.9.8" - testImplementation 'io.qase:qase-testng:3.2.0' + testImplementation 'io.qase:qase-testng:3.2.1' testImplementation 'org.testng:testng:7.1.0' } diff --git a/qase-testng/pom.xml b/qase-testng/pom.xml index 6b6cb90..af63697 100644 --- a/qase-testng/pom.xml +++ b/qase-testng/pom.xml @@ -5,7 +5,7 @@ qase-java io.qase - 3.2.0 + 3.2.1 4.0.0