Merge pull request #78 from reportportal/develop

Release

CHANGELOG.md

@@ -1,6 +1,8 @@
 # Changelog
 
 ## [Unreleased]
+### Changed
+- Client version updated on [5.1.0-RC-12](https://github.com/reportportal/client-java/releases/tag/5.1.0-RC-12)
 
 ## [5.1.0-RC-3]
 ### Fixed

build.gradle

@@ -38,7 +38,7 @@ repositories {
 }
 
 dependencies {
-    api 'com.epam.reportportal:client-java:5.1.0-RC-6'
+    api 'com.epam.reportportal:client-java:5.1.0-RC-12'
     api 'com.epam.reportportal:commons-model:5.0.0'
     api 'com.google.code.findbugs:jsr305:3.0.2'
     api 'info.cukes:gherkin:2.12.2'

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

@@ -351,7 +351,6 @@ protected void beforeStep(Step step, Match match) {
 	protected void afterStep(Result result) {
 		reportResult(result, null);
 		RunningContext.ScenarioContext context = getCurrentScenarioContext();
-		launch.get().getStepReporter().finishPreviousStep();
 		finishTestItem(context.getCurrentStepId(), mapStatus(result.getStatus()));
 		context.setCurrentStepId(null);
 	}
@@ -391,7 +390,6 @@ protected void beforeHooks(boolean isBefore) {
 	@SuppressWarnings("unused")
 	protected void afterHooks(Boolean isBefore) {
 		RunningContext.ScenarioContext context = getCurrentScenarioContext();
-		launch.get().getStepReporter().finishPreviousStep();
 		finishTestItem(context.getHookStepId(), context.getHookStatus());
 		context.setHookStepId(null);
 	}
@@ -711,9 +709,9 @@ protected String getCodeRef(Match match) {
 			Method getLocationMethod = javaStepDefinition.getClass().getDeclaredMethod(GET_LOCATION_METHOD_NAME, boolean.class);
 			getLocationMethod.setAccessible(true);
 			String fullCodeRef = String.valueOf(getLocationMethod.invoke(javaStepDefinition, true));
-			if(!fullCodeRef.isEmpty()) {
+			if (!fullCodeRef.isEmpty()) {
 				int openingBracketIndex = fullCodeRef.indexOf(METHOD_OPENING_BRACKET);
-				if(openingBracketIndex > 0) {
+				if (openingBracketIndex > 0) {
 					return fullCodeRef.substring(0, fullCodeRef.indexOf(METHOD_OPENING_BRACKET));
 				} else {
 					return fullCodeRef;

src/main/resources/META-INF/aop-ajc.xml

@@ -0,0 +1,21 @@
+<!--
+  ~ Copyright 2021 EPAM Systems
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<aspectj>
+    <aspects>
+        <aspect name="com.epam.reportportal.aspect.StepAspect"/>
+    </aspects>
+</aspectj>