Merge pull request #19 from reportportal/develop

Release
reportportal · Apr 22, 2022 · c2ed9f9 · c2ed9f9
2 parents 400a2d6 + ee12b95
commit c2ed9f9
Show file tree

Hide file tree

Showing 24 changed files with 115 additions and 13 deletions.
diff --git a/agent-allure-cucumber/CHANGELOG.md b/agent-allure-cucumber/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Changelog
 
 ## [Unreleased]
+### Added
+- `@Step` annotation templating, by @HardNorth
 
 ## [5.1.0-BETA-2]
 ### Added

diff --git a/agent-allure-cucumber/build.gradle b/agent-allure-cucumber/build.gradle
@@ -15,7 +15,10 @@
  */
 
 dependencies {
-    api 'com.epam.reportportal:agent-java-cucumber:5.1.2'
+    api ('com.epam.reportportal:agent-java-cucumber:5.1.2') {
+        exclude module: 'client-java'
+    }
+    api 'com.epam.reportportal:client-java:5.1.10'
 
     testImplementation "io.cucumber:cucumber-java:${project.cucumber_version}"
     testImplementation "io.cucumber:cucumber-testng:${project.cucumber_version}"

diff --git a/agent-allure-cucumber2/CHANGELOG.md b/agent-allure-cucumber2/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Changelog
 
 ## [Unreleased]
+### Added
+- `@Step` annotation templating, by @HardNorth
 
 ## [5.1.0-BETA-2]
 ### Added

diff --git a/agent-allure-cucumber2/build.gradle b/agent-allure-cucumber2/build.gradle
@@ -15,7 +15,10 @@
  */
 
 dependencies {
-    api 'com.epam.reportportal:agent-java-cucumber2:5.1.3'
+    api ('com.epam.reportportal:agent-java-cucumber2:5.1.3') {
+        exclude module: 'client-java'
+    }
+    api 'com.epam.reportportal:client-java:5.1.10'
 
     testImplementation "io.cucumber:cucumber-java:${project.cucumber_version}"
     testImplementation "io.cucumber:cucumber-testng:${project.cucumber_version}"

diff --git a/agent-allure-cucumber4/CHANGELOG.md b/agent-allure-cucumber4/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Changelog
 
 ## [Unreleased]
+### Added
+- `@Step` annotation templating, by @HardNorth
 
 ## [5.1.0-BETA-2]
 ### Added

diff --git a/agent-allure-cucumber4/build.gradle b/agent-allure-cucumber4/build.gradle
@@ -15,7 +15,10 @@
  */
 
 dependencies {
-    api 'com.epam.reportportal:agent-java-cucumber4:5.1.2'
+    api ('com.epam.reportportal:agent-java-cucumber4:5.1.2') {
+        exclude module: 'client-java'
+    }
+    api 'com.epam.reportportal:client-java:5.1.10'
 
     testImplementation "io.cucumber:cucumber-java:${project.cucumber_version}"
     testImplementation "io.cucumber:cucumber-testng:${project.cucumber_version}"

diff --git a/agent-allure-cucumber5/CHANGELOG.md b/agent-allure-cucumber5/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Changelog
 
 ## [Unreleased]
+### Added
+- `@Step` annotation templating, by @HardNorth
 
 ## [5.1.0-BETA-2]
 ### Added

diff --git a/agent-allure-cucumber5/build.gradle b/agent-allure-cucumber5/build.gradle
@@ -15,7 +15,10 @@
  */
 
 dependencies {
-    api 'com.epam.reportportal:agent-java-cucumber5:5.1.2'
+    api ('com.epam.reportportal:agent-java-cucumber5:5.1.2') {
+        exclude module: 'client-java'
+    }
+    api 'com.epam.reportportal:client-java:5.1.10'
 
     testImplementation "io.cucumber:cucumber-java:${project.cucumber_version}"
     testImplementation "io.cucumber:cucumber-testng:${project.cucumber_version}"

diff --git a/agent-allure-cucumber6/CHANGELOG.md b/agent-allure-cucumber6/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Changelog
 
 ## [Unreleased]
+### Added
+- `@Step` annotation templating, by @HardNorth
 
 ## [5.1.0-BETA-3]
 ### Added

diff --git a/agent-allure-cucumber6/build.gradle b/agent-allure-cucumber6/build.gradle
@@ -15,8 +15,11 @@
  */
 
 dependencies {
-    api 'com.epam.reportportal:agent-java-cucumber6:5.1.2'
-    implementation 'io.cucumber:cucumber-gherkin:6.0.0'
+    api ('com.epam.reportportal:agent-java-cucumber6:5.1.2') {
+        exclude module: 'client-java'
+    }
+    api 'com.epam.reportportal:client-java:5.1.10'
+    implementation "io.cucumber:cucumber-gherkin:${project.cucumber_version}"
 
     testImplementation "io.cucumber:cucumber-java:${project.cucumber_version}"
     testImplementation "io.cucumber:cucumber-testng:${project.cucumber_version}"

diff --git a/agent-allure-cucumber6/gradle.properties b/agent-allure-cucumber6/gradle.properties
@@ -1,4 +1,4 @@
 name=agent-allure-cucumber6
 version=5.1.0-BETA-4-SNAPSHOT
 description=Report Portal - Allure integrations for Cucumber 6
-cucumber_version=5.0.0
+cucumber_version=7.2.3
diff --git a/agent-allure-jbehave/CHANGELOG.md b/agent-allure-jbehave/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Changelog
 
 ## [Unreleased]
+### Added
+- `@Step` annotation templating, by @HardNorth
 
 ## [5.1.0-BETA-2]
 ### Added

diff --git a/agent-allure-jbehave/build.gradle b/agent-allure-jbehave/build.gradle
@@ -15,5 +15,8 @@
  */
 
 dependencies {
-    api 'com.epam.reportportal:agent-java-jbehave:5.1.2'
+    api ('com.epam.reportportal:agent-java-jbehave:5.1.2') {
+        exclude module: 'client-java'
+    }
+    api 'com.epam.reportportal:client-java:5.1.10'
 }
diff --git a/agent-allure-junit/CHANGELOG.md b/agent-allure-junit/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Changelog
 
 ## [Unreleased]
+### Added
+- `@Step` annotation templating, by @HardNorth
 
 ## [5.1.0-BETA-2]
 ### Added

diff --git a/agent-allure-junit/build.gradle b/agent-allure-junit/build.gradle
@@ -15,7 +15,10 @@
  */
 
 dependencies {
-    api 'com.epam.reportportal:agent-java-junit:5.1.1'
+    api ('com.epam.reportportal:agent-java-junit:5.1.1') {
+        exclude module: 'client-java'
+    }
+    api 'com.epam.reportportal:client-java:5.1.10'
 }
 
 jar {

diff --git a/agent-allure-junit5/CHANGELOG.md b/agent-allure-junit5/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Changelog
 
 ## [Unreleased]
+### Added
+- `@Step` annotation templating, by @HardNorth
 
 ## [5.1.0-BETA-2]
 ### Added

diff --git a/agent-allure-junit5/build.gradle b/agent-allure-junit5/build.gradle
@@ -15,7 +15,10 @@
  */
 
 dependencies {
-    api 'com.epam.reportportal:agent-java-junit5:5.1.2'
+    api ('com.epam.reportportal:agent-java-junit5:5.1.2') {
+        exclude module: 'client-java'
+    }
+    api 'com.epam.reportportal:client-java:5.1.10'
 }
 
 jar {

diff --git a/agent-allure-spock/CHANGELOG.md b/agent-allure-spock/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Changelog
 
 ## [Unreleased]
+### Added
+- `@Step` annotation templating, by @HardNorth
 
 ## [5.1.0-BETA-2]
 ### Added

diff --git a/agent-allure-spock/build.gradle b/agent-allure-spock/build.gradle
@@ -15,7 +15,10 @@
  */
 
 dependencies {
-    api 'com.epam.reportportal:agent-java-spock:5.1.0-RC-5'
+    api ('com.epam.reportportal:agent-java-spock:5.1.0-RC-5') {
+        exclude module: 'client-java'
+    }
+    api 'com.epam.reportportal:client-java:5.1.10'
 
     testImplementation 'org.codehaus.groovy:groovy:2.5.14'
 }

diff --git a/agent-allure-testng/CHANGELOG.md b/agent-allure-testng/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Changelog
 
 ## [Unreleased]
+### Added
+- `@Step` annotation templating, by @HardNorth
 
 ## [5.1.0-BETA-2]
 ### Added

diff --git a/agent-allure-testng/build.gradle b/agent-allure-testng/build.gradle
@@ -15,7 +15,10 @@
  */
 
 dependencies {
-    api 'com.epam.reportportal:agent-java-testng:5.1.2'
+    api ('com.epam.reportportal:agent-java-testng:5.1.2') {
+        exclude module: 'client-java'
+    }
+    api 'com.epam.reportportal:client-java:5.1.10'
 }
 
 jar {

diff --git a/agent-allure-testng/src/test/java/com/epam/reportportal/testng/MethodNestedStepsTest.java b/agent-allure-testng/src/test/java/com/epam/reportportal/testng/MethodNestedStepsTest.java
@@ -203,4 +203,20 @@ public void test_two_levels_method_step() {
 		FinishTestItemRQ finishStep2 = finishNestedStepCapture2.getValue();
 		assertThat(finishStep2.getStatus(), equalTo(ItemStatus.PASSED.name()));
 	}
+
+	@Test
+	void test_verify_steps_support_templating_with_self_reference() {
+		mockNestedSteps(client, nestedStepLinks.get(0));
+		runTests(MethodStepTemplate.class);
+
+		ArgumentCaptor<StartTestItemRQ> startNestedStepCapture = ArgumentCaptor.forClass(StartTestItemRQ.class);
+		verify(client).startTestItem(same(stepUuid), startNestedStepCapture.capture());
+
+		StartTestItemRQ startStep = startNestedStepCapture.getValue();
+		assertThat(
+				startStep.getName(),
+				equalTo(MethodStepTemplate.STEP_TEMPLATE_VALUE.replace("{this.FIELD}", MethodStepTemplate.FIELD)
+						.replace("{0}", MethodStepTemplate.PARAMETER))
+		);
+	}
 }
diff --git a/...-testng/src/test/java/com/epam/reportportal/testng/features/steps/MethodStepTemplate.java b/...-testng/src/test/java/com/epam/reportportal/testng/features/steps/MethodStepTemplate.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2022 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.
+ */
+
+package com.epam.reportportal.testng.features.steps;
+
+import io.qameta.allure.Step;
+import org.testng.annotations.Test;
+
+public class MethodStepTemplate {
+	public static final String FIELD = "template";
+	public static final String PARAMETER = "parameter";
+
+	public static final String STEP_TEMPLATE_VALUE = "allure-step-{this.FIELD}-{0}";
+
+	@Step(STEP_TEMPLATE_VALUE)
+	public void step(String param) {
+	}
+
+	@Test
+	void test() {
+		step(PARAMETER);
+	}
+}
diff --git a/build.gradle b/build.gradle
@@ -47,7 +47,7 @@ configure(allprojects - project('allure-common')) {
     targetCompatibility = JavaVersion.VERSION_1_8
 
     dependencies {
-        implementation 'com.epam.reportportal:allure-common:5.1.0-BETA-4'
+        implementation 'com.epam.reportportal:allure-common:5.1.0-BETA-5'
 
         testImplementation ('io.qameta.allure:allure-java-commons:2.17.3') {
             exclude group: 'org.slf4j'