Merge pull request #30 from reportportal/develop

Release

.github/workflows/promote.yml

@@ -33,11 +33,6 @@ jobs:
 
     steps:
 
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
-        with:
-          java-version: 1.8
-
       - name: Get variables
         run: |
           echo "ARTIFACT=`echo ${{ github.repository }} | cut -d/ -f2- | awk '{print tolower($0)}'`" >> $GITHUB_ENV

CHANGELOG.md

@@ -1,6 +1,8 @@
 # Changelog
 
 ## [Unreleased]
+### Changed
+- Cucumber version updated on 7.2.3
 
 ## [5.1.0]
 ### Fixed

build.gradle

@@ -53,7 +53,7 @@ dependencies {
     testImplementation 'org.mockito:mockito-core:3.3.3'
     testImplementation 'org.mockito:mockito-junit-jupiter:3.3.3'
     testImplementation 'ch.qos.logback:logback-classic:1.2.10'
-    testImplementation 'com.epam.reportportal:logger-java-logback:5.1.0'
+    testImplementation 'com.epam.reportportal:logger-java-logback:5.1.1'
     testImplementation ("org.junit.platform:junit-platform-runner:${project.junit_runner_version}") {
         exclude module: 'junit'
     }

gradle.properties

@@ -1,6 +1,6 @@
 version=5.1.1-SNAPSHOT
 description=EPAM Report portal. Cucumber JVM version [6.0.0; ) adapter
-cucumber_version=7.2.0
+cucumber_version=7.2.3
 junit_version=5.6.3
 junit_runner_version=1.6.3
 scripts_url=https://raw.githubusercontent.com/reportportal/gradle-scripts

src/main/java/com/epam/reportportal/cucumber/AbstractReporter.java

@@ -282,7 +282,7 @@ protected StartTestItemRQ buildStartScenarioRequest(@Nonnull TestCase testCase,
 	 */
 	@Nonnull
 	protected Maybe<String> startScenario(@Nonnull Maybe<String> featureId, @Nonnull StartTestItemRQ startScenarioRq) {
-		return launch.get().startTestItem(featureId, startScenarioRq);
+		return getLaunch().startTestItem(featureId, startScenarioRq);
 	}
 
 	@FunctionalInterface
@@ -394,7 +394,7 @@ protected StartTestItemRQ buildStartStepRequest(@Nonnull TestStep testStep, @Nul
 	 */
 	@Nonnull
 	protected Maybe<String> startStep(@Nonnull Maybe<String> scenarioId, @Nonnull StartTestItemRQ startStepRq) {
-		return launch.get().startTestItem(scenarioId, startStepRq);
+		return getLaunch().startTestItem(scenarioId, startStepRq);
 	}
 
 	private void addToTree(@Nonnull TestCase scenario, @Nullable String text, @Nullable Maybe<String> stepId) {
@@ -417,7 +417,7 @@ protected void beforeStep(@Nonnull TestCase testCase, @Nonnull TestStep testStep
 				Maybe<String> stepId = startStep(s.getId(), rq);
 				s.setStepId(stepId);
 				String stepText = step.getStep().getText();
-				if (launch.get().getParameters().isCallbackReportingEnabled()) {
+				if (getLaunch().getParameters().isCallbackReportingEnabled()) {
 					addToTree(testCase, stepText, stepId);
 				}
 			}
@@ -498,7 +498,7 @@ protected StartTestItemRQ buildStartHookRequest(@Nonnull TestCase testCase, @Non
 	 */
 	@Nonnull
 	protected Maybe<String> startHook(@Nonnull Maybe<String> parentId, @Nonnull StartTestItemRQ rq) {
-		return launch.get().startTestItem(parentId, rq);
+		return getLaunch().startTestItem(parentId, rq);
 	}
 
 	/**
@@ -660,7 +660,7 @@ protected StartTestItemRQ buildStartRuleRequest(@Nonnull Node.Rule rule, @Nullab
 	 */
 	@Nonnull
 	protected Maybe<String> startRule(@Nonnull Maybe<String> featureId, @Nonnull StartTestItemRQ ruleRq) {
-		return launch.get().startTestItem(featureId, ruleRq);
+		return getLaunch().startTestItem(featureId, ruleRq);
 	}
 
 	/**
@@ -693,7 +693,7 @@ protected void beforeScenario(@Nonnull Feature feature, @Nonnull TestCase scenar
 			// If it's a ScenarioOutline use Example's line number as code reference to detach one Test Item from another
 			int codeLine = s.getExample().map(e -> e.getLocation().getLine()).orElse(s.getLine());
 			s.setId(startScenario(rootId, buildStartScenarioRequest(scenario, scenarioName, s.getUri(), codeLine)));
-			if (launch.get().getParameters().isCallbackReportingEnabled()) {
+			if (getLaunch().getParameters().isCallbackReportingEnabled()) {
 				addToTree(feature, scenario, s.getId());
 			}
 		});
@@ -729,7 +729,7 @@ protected StartTestItemRQ buildStartFeatureRequest(@Nonnull Feature feature, @No
 	@Nonnull
 	protected Maybe<String> startFeature(@Nonnull StartTestItemRQ startFeatureRq) {
 		Optional<Maybe<String>> root = getRootItemId();
-		return root.map(r -> launch.get().startTestItem(r, startFeatureRq)).orElseGet(() -> launch.get().startTestItem(startFeatureRq));
+		return root.map(r -> getLaunch().startTestItem(r, startFeatureRq)).orElseGet(() -> getLaunch().startTestItem(startFeatureRq));
 	}
 
 	private void addToTree(Feature feature, Maybe<String> featureId) {
@@ -745,11 +745,12 @@ protected void handleStartOfTestCase(@Nonnull TestCaseStarted event) {
 		TestCase testCase = event.getTestCase();
 		URI uri = testCase.getUri();
 		execute(uri, f -> {
+			//noinspection ReactiveStreamsUnusedPublisher
 			if (f.getId().equals(Maybe.empty())) {
 				getRootItemId(); // trigger root item creation
 				StartTestItemRQ featureRq = buildStartFeatureRequest(f.getFeature(), uri);
 				f.setId(startFeature(featureRq));
-				if (launch.get().getParameters().isCallbackReportingEnabled()) {
+				if (getLaunch().getParameters().isCallbackReportingEnabled()) {
 					addToTree(f.getFeature(), f.getId());
 				}
 			}
@@ -905,7 +906,8 @@ protected Date finishTestItem(@Nullable Maybe<String> itemId, @Nullable ItemStat
 			return null;
 		}
 		FinishTestItemRQ rq = buildFinishTestItemRequest(itemId, dateTime, status);
-		launch.get().finishTestItem(itemId, rq);
+		//noinspection ReactiveStreamsUnusedPublisher
+		getLaunch().finishTestItem(itemId, rq);
 		return rq.getEndTime();
 	}
 

src/test/java/com/epam/reportportal/cucumber/ParameterScenarioReporterTest.java

@@ -51,7 +51,6 @@
 /**
  * @author <a href="mailto:[email protected]">Ihar Kahadouski</a>
  */
-@SuppressWarnings("ReactiveStreamsUnusedPublisher")
 public class ParameterScenarioReporterTest {
 
 	@CucumberOptions(features = "src/test/resources/features/OneSimpleAndOneScenarioOutline.feature", glue = {