From e45db67b1f728adf335404d1a1026852847d7a68 Mon Sep 17 00:00:00 2001 From: qameta-ci Date: Thu, 28 Oct 2021 15:57:33 +0000 Subject: [PATCH 1/5] set next development version 2.17 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 10e8f71af..c34fa2e10 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version=2.16.0 +version=2.17-SNAPSHOT org.gradle.daemon=true org.gradle.parallel=true From 2e38ce28b700c08c58a5b4ee87a268f673d7e5ee Mon Sep 17 00:00:00 2001 From: Dmitry Baev Date: Mon, 1 Nov 2021 19:09:42 +0300 Subject: [PATCH 2/5] use allure gradle plugin (via #673) --- allure-assertj/build.gradle.kts | 6 ---- allure-attachments/build.gradle.kts | 6 ---- allure-citrus/build.gradle.kts | 6 ---- allure-cucumber-jvm/build.gradle.kts | 6 ---- allure-cucumber2-jvm/build.gradle.kts | 6 ---- allure-cucumber3-jvm/build.gradle.kts | 6 ---- allure-cucumber4-jvm/build.gradle.kts | 6 ---- allure-cucumber5-jvm/build.gradle.kts | 6 ---- allure-cucumber6-jvm/build.gradle.kts | 6 ---- allure-descriptions-javadoc/build.gradle.kts | 4 --- allure-hamcrest/build.gradle.kts | 8 +---- allure-httpclient/build.gradle.kts | 6 ---- allure-java-commons/build.gradle.kts | 6 ---- allure-java-migration/build.gradle.kts | 6 ---- allure-jax-rs/build.gradle.kts | 6 ---- allure-jbehave/build.gradle.kts | 6 ---- allure-jsonunit/build.gradle.kts | 6 ---- allure-junit-platform/build.gradle.kts | 6 ---- allure-junit4-aspect/build.gradle.kts | 3 -- allure-junit4/build.gradle.kts | 6 ---- allure-junit5-assert/build.gradle.kts | 6 ---- allure-junit5/build.gradle.kts | 6 ---- allure-model/build.gradle.kts | 6 ---- allure-okhttp/build.gradle.kts | 6 ---- allure-okhttp3/build.gradle.kts | 6 ---- allure-reader/build.gradle.kts | 6 ---- allure-rest-assured/build.gradle.kts | 6 ---- allure-scalatest/build.gradle.kts | 6 ---- allure-selenide/build.gradle.kts | 6 ---- allure-spock/build.gradle.kts | 6 ---- allure-spring-web/build.gradle.kts | 6 ---- allure-test-filter/build.gradle.kts | 6 ---- allure-testng/build.gradle.kts | 6 ---- build.gradle.kts | 38 +++++++++++--------- settings.gradle.kts | 5 ++- 35 files changed, 26 insertions(+), 212 deletions(-) diff --git a/allure-assertj/build.gradle.kts b/allure-assertj/build.gradle.kts index e8e064ed9..e38cca0ea 100644 --- a/allure-assertj/build.gradle.kts +++ b/allure-assertj/build.gradle.kts @@ -1,9 +1,6 @@ description = "Allure AssertJ Integration" -val agent: Configuration by configurations.creating - dependencies { - agent("org.aspectj:aspectjweaver") api(project(":allure-java-commons")) compileOnly("org.aspectj:aspectjrt") compileOnly("org.assertj:assertj-core") @@ -25,7 +22,4 @@ tasks.jar { tasks.test { useJUnitPlatform() - doFirst { - jvmArgs("-javaagent:${agent.singleFile}") - } } diff --git a/allure-attachments/build.gradle.kts b/allure-attachments/build.gradle.kts index bfbe95e7c..c5010a3c0 100644 --- a/allure-attachments/build.gradle.kts +++ b/allure-attachments/build.gradle.kts @@ -1,9 +1,6 @@ description = "Allure Attachments" -val agent: Configuration by configurations.creating - dependencies { - agent("org.aspectj:aspectjweaver") api(project(":allure-java-commons")) implementation("org.freemarker:freemarker") testImplementation("org.apache.commons:commons-lang3") @@ -26,7 +23,4 @@ tasks.jar { tasks.test { useJUnitPlatform() - doFirst { - jvmArgs("-javaagent:${agent.singleFile}") - } } diff --git a/allure-citrus/build.gradle.kts b/allure-citrus/build.gradle.kts index bd740f9a7..dbad67a9c 100644 --- a/allure-citrus/build.gradle.kts +++ b/allure-citrus/build.gradle.kts @@ -1,11 +1,8 @@ description = "Allure Citrus Integration" -val agent: Configuration by configurations.creating - val citrusVersion = "2.8.0" dependencies { - agent("org.aspectj:aspectjweaver") api(project(":allure-java-commons")) compileOnly("com.consol.citrus:citrus-core:$citrusVersion") testImplementation("com.consol.citrus:citrus-http:$citrusVersion") @@ -32,7 +29,4 @@ tasks.jar { tasks.test { useJUnitPlatform() exclude("**/samples/*") - doFirst { - jvmArgs("-javaagent:${agent.singleFile}") - } } diff --git a/allure-cucumber-jvm/build.gradle.kts b/allure-cucumber-jvm/build.gradle.kts index 3bde4ddfc..e8922f691 100644 --- a/allure-cucumber-jvm/build.gradle.kts +++ b/allure-cucumber-jvm/build.gradle.kts @@ -1,11 +1,8 @@ description = "Allure CucumberJVM Integration" -val agent: Configuration by configurations.creating - val cucumberVersion = "1.2.6" dependencies { - agent("org.aspectj:aspectjweaver") api(project(":allure-java-commons")) implementation("info.cukes:cucumber-core:$cucumberVersion") implementation("info.cukes:cucumber-java:$cucumberVersion") @@ -30,7 +27,4 @@ tasks.jar { tasks.test { useJUnitPlatform() - doFirst { - jvmArgs("-javaagent:${agent.singleFile}") - } } diff --git a/allure-cucumber2-jvm/build.gradle.kts b/allure-cucumber2-jvm/build.gradle.kts index 3201d1c25..1ce0094c1 100644 --- a/allure-cucumber2-jvm/build.gradle.kts +++ b/allure-cucumber2-jvm/build.gradle.kts @@ -1,11 +1,8 @@ description = "Allure CucumberJVM 2.0 Integration" -val agent: Configuration by configurations.creating - val cucumberVersion = "2.4.0" dependencies { - agent("org.aspectj:aspectjweaver") api(project(":allure-java-commons")) implementation("io.cucumber:cucumber-core:$cucumberVersion") implementation("io.cucumber:cucumber-java:$cucumberVersion") @@ -29,7 +26,4 @@ tasks.jar { tasks.test { useJUnitPlatform() - doFirst { - jvmArgs("-javaagent:${agent.singleFile}") - } } diff --git a/allure-cucumber3-jvm/build.gradle.kts b/allure-cucumber3-jvm/build.gradle.kts index 681f1ab7c..0bc20295e 100644 --- a/allure-cucumber3-jvm/build.gradle.kts +++ b/allure-cucumber3-jvm/build.gradle.kts @@ -1,11 +1,8 @@ description = "Allure CucumberJVM 3.0 Integration" -val agent: Configuration by configurations.creating - val cucumberVersion = "3.0.2" dependencies { - agent("org.aspectj:aspectjweaver") api(project(":allure-java-commons")) implementation("io.cucumber:cucumber-core:$cucumberVersion") implementation("io.cucumber:cucumber-java:$cucumberVersion") @@ -29,7 +26,4 @@ tasks.jar { tasks.test { useJUnitPlatform() - doFirst { - jvmArgs("-javaagent:${agent.singleFile}") - } } diff --git a/allure-cucumber4-jvm/build.gradle.kts b/allure-cucumber4-jvm/build.gradle.kts index 28e68c347..37b660454 100644 --- a/allure-cucumber4-jvm/build.gradle.kts +++ b/allure-cucumber4-jvm/build.gradle.kts @@ -1,11 +1,8 @@ description = "Allure CucumberJVM 4.0" -val agent: Configuration by configurations.creating - val cucumberVersion = "4.8.0" dependencies { - agent("org.aspectj:aspectjweaver") api(project(":allure-java-commons")) implementation("io.cucumber:cucumber-core:$cucumberVersion") implementation("io.cucumber:cucumber-java:$cucumberVersion") @@ -29,7 +26,4 @@ tasks.jar { tasks.test { useJUnitPlatform() - doFirst { - jvmArgs("-javaagent:${agent.singleFile}") - } } diff --git a/allure-cucumber5-jvm/build.gradle.kts b/allure-cucumber5-jvm/build.gradle.kts index 3899bbf31..e39b579e4 100644 --- a/allure-cucumber5-jvm/build.gradle.kts +++ b/allure-cucumber5-jvm/build.gradle.kts @@ -1,12 +1,9 @@ description = "Allure CucumberJVM 5.0" -val agent: Configuration by configurations.creating - val cucumberVersion = "5.1.2" val cucumberGherkinVersion = "5.1.0" dependencies { - agent("org.aspectj:aspectjweaver") api(project(":allure-java-commons")) compileOnly("io.cucumber:cucumber-plugin:$cucumberVersion") implementation("io.cucumber:gherkin:$cucumberGherkinVersion") @@ -32,7 +29,4 @@ tasks.jar { tasks.test { useJUnitPlatform() - doFirst { - jvmArgs("-javaagent:${agent.singleFile}") - } } diff --git a/allure-cucumber6-jvm/build.gradle.kts b/allure-cucumber6-jvm/build.gradle.kts index c2553e5c7..a0dd9cb50 100644 --- a/allure-cucumber6-jvm/build.gradle.kts +++ b/allure-cucumber6-jvm/build.gradle.kts @@ -1,12 +1,9 @@ description = "Allure CucumberJVM 6.0" -val agent: Configuration by configurations.creating - val cucumberVersion = "6.10.2" val cucumberGherkinVersion = "18.0.0" dependencies { - agent("org.aspectj:aspectjweaver") api(project(":allure-java-commons")) compileOnly("io.cucumber:cucumber-plugin:$cucumberVersion") implementation("io.cucumber:gherkin:$cucumberGherkinVersion") @@ -32,7 +29,4 @@ tasks.jar { tasks.test { useJUnitPlatform() - doFirst { - jvmArgs("-javaagent:${agent.singleFile}") - } } diff --git a/allure-descriptions-javadoc/build.gradle.kts b/allure-descriptions-javadoc/build.gradle.kts index 8735dc765..4ec8e85c2 100644 --- a/allure-descriptions-javadoc/build.gradle.kts +++ b/allure-descriptions-javadoc/build.gradle.kts @@ -3,7 +3,6 @@ description = "Allure Javadoc Descriptions" val agent: Configuration by configurations.creating dependencies { - agent("org.aspectj:aspectjweaver") api("commons-io:commons-io") api(project(":allure-java-commons")) testImplementation("com.google.testing.compile:compile-testing") @@ -26,7 +25,4 @@ tasks.jar { tasks.test { useJUnitPlatform() - doFirst { - jvmArgs("-javaagent:${agent.singleFile}") - } } diff --git a/allure-hamcrest/build.gradle.kts b/allure-hamcrest/build.gradle.kts index 3907ff9a9..8ccb0ee47 100644 --- a/allure-hamcrest/build.gradle.kts +++ b/allure-hamcrest/build.gradle.kts @@ -1,9 +1,6 @@ description = "Allure Hamcrest Assertions Integration" -val agent: Configuration by configurations.creating - dependencies { - agent("org.aspectj:aspectjweaver") api(project(":allure-java-commons")) compileOnly("org.aspectj:aspectjrt") implementation("org.hamcrest:hamcrest") @@ -26,7 +23,4 @@ tasks.jar { tasks.test { useJUnitPlatform() - doFirst { - jvmArgs("-javaagent:${agent.singleFile}") - } -} \ No newline at end of file +} diff --git a/allure-httpclient/build.gradle.kts b/allure-httpclient/build.gradle.kts index bb9cbcc46..087e00bfb 100644 --- a/allure-httpclient/build.gradle.kts +++ b/allure-httpclient/build.gradle.kts @@ -1,9 +1,6 @@ description = "Allure Apache HttpClient Integration" -val agent: Configuration by configurations.creating - dependencies { - agent("org.aspectj:aspectjweaver") api(project(":allure-attachments")) implementation("org.apache.httpcomponents:httpclient") testImplementation("com.github.tomakehurst:wiremock") @@ -27,7 +24,4 @@ tasks.jar { tasks.test { useJUnitPlatform() - doFirst { - jvmArgs("-javaagent:${agent.singleFile}") - } } diff --git a/allure-java-commons/build.gradle.kts b/allure-java-commons/build.gradle.kts index 0c4f06028..65c5ae82d 100644 --- a/allure-java-commons/build.gradle.kts +++ b/allure-java-commons/build.gradle.kts @@ -4,10 +4,7 @@ plugins { description = "Allure Java Commons" -val agent: Configuration by configurations.creating - dependencies { - agent("org.aspectj:aspectjweaver") api("org.slf4j:slf4j-api") api(project(":allure-model")) compileOnly("org.aspectj:aspectjrt") @@ -68,8 +65,5 @@ tasks { test { dependsOn(shadowJar) useJUnitPlatform() - doFirst { - jvmArgs("-javaagent:${agent.singleFile}") - } } } diff --git a/allure-java-migration/build.gradle.kts b/allure-java-migration/build.gradle.kts index c31df1fa6..f6a0f755e 100644 --- a/allure-java-migration/build.gradle.kts +++ b/allure-java-migration/build.gradle.kts @@ -1,12 +1,9 @@ description = "Allure Java Migration Utils" -val agent: Configuration by configurations.creating - val junitVersion = "4.13.2" val testNgVersion = "6.14.3" dependencies { - agent("org.aspectj:aspectjweaver") api("org.apache.commons:commons-lang3") api("org.aspectj:aspectjrt") api(project(":allure-java-commons")) @@ -35,7 +32,4 @@ tasks.jar { tasks.test { useJUnitPlatform() - doFirst { - jvmArgs("-javaagent:${agent.singleFile}") - } } diff --git a/allure-jax-rs/build.gradle.kts b/allure-jax-rs/build.gradle.kts index 441bb7573..4e1e965e8 100644 --- a/allure-jax-rs/build.gradle.kts +++ b/allure-jax-rs/build.gradle.kts @@ -1,11 +1,8 @@ description = "Allure JAX-RS Filter Integration" -val agent: Configuration by configurations.creating - val javaxWsRsApiVersion = "2.1.1" dependencies { - agent("org.aspectj:aspectjweaver") api(project(":allure-attachments")) implementation("javax.ws.rs:javax.ws.rs-api:$javaxWsRsApiVersion") testImplementation("com.github.tomakehurst:wiremock") @@ -29,7 +26,4 @@ tasks.jar { tasks.test { useJUnitPlatform() - doFirst { - jvmArgs("-javaagent:${agent.singleFile}") - } } diff --git a/allure-jbehave/build.gradle.kts b/allure-jbehave/build.gradle.kts index 36edee469..a5270026f 100644 --- a/allure-jbehave/build.gradle.kts +++ b/allure-jbehave/build.gradle.kts @@ -1,11 +1,8 @@ description = "Allure JBehave Integration" -val agent: Configuration by configurations.creating - val jbehaveVersion = "4.8.2" dependencies { - agent("org.aspectj:aspectjweaver") api(project(":allure-java-commons")) implementation("org.jbehave:jbehave-core:$jbehaveVersion") testImplementation("org.assertj:assertj-core") @@ -27,7 +24,4 @@ tasks.jar { tasks.test { useJUnitPlatform() - doFirst { - jvmArgs("-javaagent:${agent.singleFile}") - } } diff --git a/allure-jsonunit/build.gradle.kts b/allure-jsonunit/build.gradle.kts index 355cfea5d..9fbf8bba8 100644 --- a/allure-jsonunit/build.gradle.kts +++ b/allure-jsonunit/build.gradle.kts @@ -1,11 +1,8 @@ description = "Allure JsonUnit Integration" -val agent: Configuration by configurations.creating - val jsonUnitVersion = "2.28.0" dependencies { - agent("org.aspectj:aspectjweaver") api(project(":allure-attachments")) implementation("com.fasterxml.jackson.core:jackson-databind") implementation("net.javacrumbs.json-unit:json-unit:$jsonUnitVersion") @@ -29,8 +26,5 @@ tasks.jar { tasks.test { useJUnitPlatform() - doFirst { - jvmArgs("-javaagent:${agent.singleFile}") - } } diff --git a/allure-junit-platform/build.gradle.kts b/allure-junit-platform/build.gradle.kts index 417709e6b..4cf244bf2 100644 --- a/allure-junit-platform/build.gradle.kts +++ b/allure-junit-platform/build.gradle.kts @@ -1,9 +1,6 @@ description = "Allure JUnit Platform Integration" -val agent: Configuration by configurations.creating - dependencies { - agent("org.aspectj:aspectjweaver") api(project(":allure-java-commons")) implementation("org.junit.jupiter:junit-jupiter-api") implementation("org.junit.platform:junit-platform-launcher") @@ -35,9 +32,6 @@ tasks.test { systemProperty("junit.jupiter.execution.parallel.enabled", "false") useJUnitPlatform() exclude("**/features/*") - doFirst { - jvmArgs("-javaagent:${agent.singleFile}") - } } val spiOffJar: Jar by tasks.creating(Jar::class) { diff --git a/allure-junit4-aspect/build.gradle.kts b/allure-junit4-aspect/build.gradle.kts index 9b002dbd4..3f9bb39c6 100644 --- a/allure-junit4-aspect/build.gradle.kts +++ b/allure-junit4-aspect/build.gradle.kts @@ -1,11 +1,8 @@ description = "Allure JUnit 4 Aspect HACK" -val agent: Configuration by configurations.creating - val junitVersion = "4.13.2" dependencies { - agent("org.aspectj:aspectjweaver") api(project(":allure-junit4")) implementation("junit:junit:$junitVersion") implementation("org.aspectj:aspectjrt") diff --git a/allure-junit4/build.gradle.kts b/allure-junit4/build.gradle.kts index 08eddfe47..9e026c739 100644 --- a/allure-junit4/build.gradle.kts +++ b/allure-junit4/build.gradle.kts @@ -1,11 +1,8 @@ description = "Allure JUnit 4 Integration" -val agent: Configuration by configurations.creating - val junitVersion = "4.13.2" dependencies { - agent("org.aspectj:aspectjweaver") api(project(":allure-java-commons")) implementation("junit:junit:$junitVersion") testImplementation("org.assertj:assertj-core") @@ -28,7 +25,4 @@ tasks.jar { tasks.test { useJUnitPlatform() exclude("**/samples/*", "SampleTestInDefaultPackage.java") - doFirst { - jvmArgs("-javaagent:${agent.singleFile}") - } } diff --git a/allure-junit5-assert/build.gradle.kts b/allure-junit5-assert/build.gradle.kts index d7584fa3c..047084bd4 100644 --- a/allure-junit5-assert/build.gradle.kts +++ b/allure-junit5-assert/build.gradle.kts @@ -1,9 +1,6 @@ description = "Allure Junit5 Assertions Integration" -val agent: Configuration by configurations.creating - dependencies { - agent("org.aspectj:aspectjweaver") api(project(":allure-junit5")) compileOnly("org.aspectj:aspectjrt") implementation("org.junit.jupiter:junit-jupiter-api") @@ -24,8 +21,5 @@ tasks.jar { tasks.test { useJUnitPlatform() - doFirst { - jvmArgs("-javaagent:${agent.singleFile}") - } } diff --git a/allure-junit5/build.gradle.kts b/allure-junit5/build.gradle.kts index 0b63accf3..7b15f0fd4 100644 --- a/allure-junit5/build.gradle.kts +++ b/allure-junit5/build.gradle.kts @@ -1,9 +1,6 @@ description = "Allure JUnit 5 Integration" -val agent: Configuration by configurations.creating - dependencies { - agent("org.aspectj:aspectjweaver") api(project(":allure-junit-platform")) implementation("org.junit.jupiter:junit-jupiter-api") implementation("org.junit.platform:junit-platform-launcher") @@ -33,9 +30,6 @@ tasks.test { systemProperty("junit.jupiter.execution.parallel.enabled", "false") useJUnitPlatform() exclude("**/features/*") - doFirst { - jvmArgs("-javaagent:${agent.singleFile}") - } } val spiOffJar: Jar by tasks.creating(Jar::class) { diff --git a/allure-model/build.gradle.kts b/allure-model/build.gradle.kts index dcc2389fc..056557707 100644 --- a/allure-model/build.gradle.kts +++ b/allure-model/build.gradle.kts @@ -1,9 +1,6 @@ description = "Allure Model Integration" -val agent: Configuration by configurations.creating - dependencies { - agent("org.aspectj:aspectjweaver") testImplementation("io.github.benas:random-beans") testImplementation("org.assertj:assertj-core") testImplementation("org.junit.jupiter:junit-jupiter-api") @@ -22,7 +19,4 @@ tasks.jar { tasks.test { useJUnitPlatform() - doFirst { - jvmArgs("-javaagent:${agent.singleFile}") - } } diff --git a/allure-okhttp/build.gradle.kts b/allure-okhttp/build.gradle.kts index 2cd38e5f3..7a4f3a92f 100644 --- a/allure-okhttp/build.gradle.kts +++ b/allure-okhttp/build.gradle.kts @@ -1,11 +1,8 @@ description = "Allure OkHttp Integration" -val agent: Configuration by configurations.creating - val okhttpVersion = "2.7.5" dependencies { - agent("org.aspectj:aspectjweaver") api(project(":allure-attachments")) implementation("com.squareup.okhttp:okhttp:$okhttpVersion") testImplementation("com.github.tomakehurst:wiremock") @@ -29,7 +26,4 @@ tasks.jar { tasks.test { useJUnitPlatform() - doFirst { - jvmArgs("-javaagent:${agent.singleFile}") - } } diff --git a/allure-okhttp3/build.gradle.kts b/allure-okhttp3/build.gradle.kts index 249b74867..b6a123e5f 100644 --- a/allure-okhttp3/build.gradle.kts +++ b/allure-okhttp3/build.gradle.kts @@ -1,11 +1,8 @@ description = "Allure OkHttp3 Integration" -val agent: Configuration by configurations.creating - val okhttpVersion = "3.14.9" dependencies { - agent("org.aspectj:aspectjweaver") api(project(":allure-attachments")) implementation("com.squareup.okhttp3:okhttp:$okhttpVersion") testImplementation("com.github.tomakehurst:wiremock") @@ -29,7 +26,4 @@ tasks.jar { tasks.test { useJUnitPlatform() - doFirst { - jvmArgs("-javaagent:${agent.singleFile}") - } } diff --git a/allure-reader/build.gradle.kts b/allure-reader/build.gradle.kts index 73ca0bf02..432fd8158 100644 --- a/allure-reader/build.gradle.kts +++ b/allure-reader/build.gradle.kts @@ -1,9 +1,6 @@ description = "Allure Model Reader Module" -val agent: Configuration by configurations.creating - dependencies { - agent("org.aspectj:aspectjweaver") api(project(":allure-model")) implementation("com.fasterxml.jackson.core:jackson-databind") testImplementation("org.assertj:assertj-core") @@ -23,7 +20,4 @@ tasks.jar { tasks.test { useJUnitPlatform() - doFirst { - jvmArgs("-javaagent:${agent.singleFile}") - } } diff --git a/allure-rest-assured/build.gradle.kts b/allure-rest-assured/build.gradle.kts index 70620242a..8c01ecf40 100644 --- a/allure-rest-assured/build.gradle.kts +++ b/allure-rest-assured/build.gradle.kts @@ -1,11 +1,8 @@ description = "Allure Rest-Assured Integration" -val agent: Configuration by configurations.creating - val restAssuredVersion = "4.4.0" dependencies { - agent("org.aspectj:aspectjweaver") api(project(":allure-attachments")) implementation("io.rest-assured:rest-assured:$restAssuredVersion") testImplementation("com.github.tomakehurst:wiremock") @@ -30,7 +27,4 @@ tasks.jar { tasks.test { useJUnitPlatform() - doFirst { - jvmArgs("-javaagent:${agent.singleFile}") - } } diff --git a/allure-scalatest/build.gradle.kts b/allure-scalatest/build.gradle.kts index 037863975..382bbfbf5 100644 --- a/allure-scalatest/build.gradle.kts +++ b/allure-scalatest/build.gradle.kts @@ -78,10 +78,7 @@ val installAll by tasks.creating { dependsOn(availableScalaVersions.map { "installScala_${it.replace('.', '_')}" }) } -val agent: Configuration by configurations.creating - dependencies { - agent("org.aspectj:aspectjweaver") api(project(":allure-java-commons")) implementation("org.scalatest:scalatest_$baseScalaVersion:3.1.1") implementation("org.scala-lang.modules:scala-collection-compat_$baseScalaVersion:2.1.4") @@ -116,7 +113,4 @@ tasks.test { systemProperty("junit.jupiter.execution.parallel.enabled", "false") useJUnitPlatform() exclude("**/testdata/*") - doFirst { - jvmArgs("-javaagent:${agent.singleFile}") - } } diff --git a/allure-selenide/build.gradle.kts b/allure-selenide/build.gradle.kts index c7e05cf52..13ebdc1e4 100644 --- a/allure-selenide/build.gradle.kts +++ b/allure-selenide/build.gradle.kts @@ -1,11 +1,8 @@ description = "Allure Selenide Integration" -val agent: Configuration by configurations.creating - val selenideVersion = "6.0.3" dependencies { - agent("org.aspectj:aspectjweaver") api(project(":allure-java-commons")) compileOnly("com.codeborne:selenide:$selenideVersion") testImplementation("com.codeborne:selenide:$selenideVersion") @@ -28,7 +25,4 @@ tasks.jar { tasks.test { useJUnitPlatform() - doFirst { - jvmArgs("-javaagent:${agent.singleFile}") - } } diff --git a/allure-spock/build.gradle.kts b/allure-spock/build.gradle.kts index 60bea8f12..d0315fd85 100644 --- a/allure-spock/build.gradle.kts +++ b/allure-spock/build.gradle.kts @@ -2,12 +2,9 @@ description = "Allure Spock Framework Integration" apply(plugin = "groovy") -val agent: Configuration by configurations.creating - val spockFrameworkVersion = "1.3-groovy-2.5" dependencies { - agent("org.aspectj:aspectjweaver") api(project(":allure-java-commons")) implementation("org.spockframework:spock-core:$spockFrameworkVersion") testImplementation("org.assertj:assertj-core") @@ -31,7 +28,4 @@ tasks.jar { tasks.test { useJUnitPlatform() exclude("**/samples/*") - doFirst { - jvmArgs("-javaagent:${agent.singleFile}") - } } diff --git a/allure-spring-web/build.gradle.kts b/allure-spring-web/build.gradle.kts index a2a23e9f3..b8f3eac3c 100644 --- a/allure-spring-web/build.gradle.kts +++ b/allure-spring-web/build.gradle.kts @@ -1,11 +1,8 @@ description = "Allure Spring Web Integration" -val agent: Configuration by configurations.creating - val springWebVersion = "5.3.12" dependencies { - agent("org.aspectj:aspectjweaver") api(project(":allure-attachments")) implementation("org.springframework:spring-web:$springWebVersion") testImplementation("com.github.tomakehurst:wiremock") @@ -30,7 +27,4 @@ tasks.jar { tasks.test { useJUnitPlatform() - doFirst { - jvmArgs("-javaagent:${agent.singleFile}") - } } diff --git a/allure-test-filter/build.gradle.kts b/allure-test-filter/build.gradle.kts index 86c73354c..547df0125 100644 --- a/allure-test-filter/build.gradle.kts +++ b/allure-test-filter/build.gradle.kts @@ -4,10 +4,7 @@ plugins { description = "Allure Test Filter" -val agent: Configuration by configurations.creating - dependencies { - agent("org.aspectj:aspectjweaver") implementation(project(":allure-java-commons")) internal("com.fasterxml.jackson.core:jackson-databind") testAnnotationProcessor("org.slf4j:slf4j-simple") @@ -69,9 +66,6 @@ tasks { systemProperty("junit.jupiter.execution.parallel.enabled", "false") useJUnitPlatform() exclude("**/features/*") - doFirst { - jvmArgs("-javaagent:${agent.singleFile}") - } } } diff --git a/allure-testng/build.gradle.kts b/allure-testng/build.gradle.kts index f6b2d0107..54b744093 100644 --- a/allure-testng/build.gradle.kts +++ b/allure-testng/build.gradle.kts @@ -1,11 +1,8 @@ description = "Allure TestNG Integration" -val agent: Configuration by configurations.creating - val testNgVersion = "6.14.3" dependencies { - agent("org.aspectj:aspectjweaver") api(project(":allure-java-commons")) implementation("org.testng:testng:$testNgVersion") implementation(project(":allure-test-filter")) @@ -34,9 +31,6 @@ tasks.test { suites("src/test/resources/testng.xml") }) exclude("**/samples/*") - doFirst { - jvmArgs("-javaagent:${agent.singleFile}") - } } val spiOffJar: Jar by tasks.creating(Jar::class) { diff --git a/build.gradle.kts b/build.gradle.kts index f397ba00b..983261822 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,3 @@ -import io.qameta.allure.gradle.task.AllureReport - val linkHomepage by extra("https://qameta.io/allure") val linkCi by extra("https://ci.qameta.in/job/allure-java_deploy/") val linkScmUrl by extra("https://github.com/allure-framework/allure-java") @@ -23,7 +21,8 @@ plugins { signing id("com.diffplug.spotless") id("io.github.gradle-nexus.publish-plugin") - id("io.qameta.allure") + id("io.qameta.allure-adapter") apply false + id("io.qameta.allure-report") id("io.spring.dependency-management") id("ru.vyarus.quality") } @@ -121,12 +120,13 @@ configure(subprojects) { configure(libs) { val project = this + apply(plugin = "com.diffplug.spotless") + apply(plugin = "io.qameta.allure-report") + apply(plugin = "io.qameta.allure-adapter") + apply(plugin = "io.spring.dependency-management") apply(plugin = "java") apply(plugin = "java-library") - apply(plugin = "io.qameta.allure") apply(plugin = "ru.vyarus.quality") - apply(plugin = "com.diffplug.spotless") - apply(plugin = "io.spring.dependency-management") dependencyManagement { imports { @@ -215,6 +215,17 @@ configure(libs) { } } + allure { + adapter { + autoconfigure.set(false) + aspectjWeaver.set(true) + aspectjVersion.set("1.9.7") + + // in order to disable dependencySubstitution (spi-off classifier) + autoconfigureListeners.set(true) + } + } + quality { configDir = qualityConfigsDir checkstyleVersion = "8.36.1" @@ -274,11 +285,6 @@ configure(libs) { encoding("UTF-8") } - allure { - autoconfigure = false - aspectjweaver = false - } - java { withJavadocJar() withSourcesJar() @@ -296,12 +302,10 @@ configure(libs) { } allure { - version = "2.13.5" - autoconfigure = false - aspectjweaver = false + version.set("2.16.0") } -val aggregatedReport by tasks.creating(AllureReport::class) { - clean = true - resultsDirs = subprojects.map { file("${it.buildDir}/allure-results") }.filter { it.exists() } +repositories { + mavenLocal() + mavenCentral() } diff --git a/settings.gradle.kts b/settings.gradle.kts index f0b8302ea..c8e819b22 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -46,7 +46,10 @@ pluginManagement { id("com.github.johnrengelman.shadow") version "7.0.0" id("com.gradle.enterprise") version "3.6.2" id("io.github.gradle-nexus.publish-plugin") version "1.1.0" - id("io.qameta.allure") version "2.8.1" + id("io.qameta.allure-adapter") version "2.9.6" + id("io.qameta.allure-aggregate-report") version "2.9.6" + id("io.qameta.allure-download") version "2.9.6" + id("io.qameta.allure-report") version "2.9.6" id("io.spring.dependency-management") version "1.0.11.RELEASE" id("ru.vyarus.quality") version "4.6.0" kotlin("jvm") version "1.5.0" From 9f693791b01f2dc0d84ceb3c9e1bfec19947790b Mon Sep 17 00:00:00 2001 From: Dmitry Baev Date: Tue, 2 Nov 2021 14:23:24 +0300 Subject: [PATCH 3/5] add support for provided labels for cucumber-jvm integrations (via #674) --- .../allure/cucumberjvm/LabelBuilder.java | 1 + .../cucumberjvm/AllureCucumberJvmTest.java | 19 ++++++++++++++++++ .../allure/cucumber2jvm/LabelBuilder.java | 2 ++ .../cucumber2jvm/AllureCucumber2JvmTest.java | 18 +++++++++++++++++ .../allure/cucumber3jvm/LabelBuilder.java | 2 ++ .../cucumber3jvm/AllureCucumber3JvmTest.java | 19 ++++++++++++++++++ .../allure/cucumber4jvm/LabelBuilder.java | 1 + .../cucumber4jvm/AllureCucumber4JvmTest.java | 20 +++++++++++++++++++ .../allure/cucumber5jvm/LabelBuilder.java | 1 + .../cucumber5jvm/AllureCucumber5JvmTest.java | 20 +++++++++++++++++++ .../allure/cucumber6jvm/LabelBuilder.java | 1 + .../cucumber6jvm/AllureCucumber6JvmTest.java | 20 +++++++++++++++++++ 12 files changed, 124 insertions(+) diff --git a/allure-cucumber-jvm/src/main/java/io/qameta/allure/cucumberjvm/LabelBuilder.java b/allure-cucumber-jvm/src/main/java/io/qameta/allure/cucumberjvm/LabelBuilder.java index 8acfe213d..c022b8531 100644 --- a/allure-cucumber-jvm/src/main/java/io/qameta/allure/cucumberjvm/LabelBuilder.java +++ b/allure-cucumber-jvm/src/main/java/io/qameta/allure/cucumberjvm/LabelBuilder.java @@ -112,6 +112,7 @@ class LabelBuilder { } } + getScenarioLabels().addAll(ResultsUtils.getProvidedLabels()); getScenarioLabels().addAll(Arrays.asList( createHostLabel(), createThreadLabel(), diff --git a/allure-cucumber-jvm/src/test/java/io/qameta/allure/cucumberjvm/AllureCucumberJvmTest.java b/allure-cucumber-jvm/src/test/java/io/qameta/allure/cucumberjvm/AllureCucumberJvmTest.java index ea5db2632..e5274cbef 100644 --- a/allure-cucumber-jvm/src/test/java/io/qameta/allure/cucumberjvm/AllureCucumberJvmTest.java +++ b/allure-cucumber-jvm/src/test/java/io/qameta/allure/cucumberjvm/AllureCucumberJvmTest.java @@ -41,6 +41,7 @@ import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.jupiter.api.parallel.ResourceLock; import java.nio.charset.StandardCharsets; import java.time.Instant; @@ -55,6 +56,8 @@ import static java.util.Objects.nonNull; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.tuple; +import static org.junit.jupiter.api.parallel.ResourceAccessMode.READ_WRITE; +import static org.junit.jupiter.api.parallel.Resources.SYSTEM_PROPERTIES; /** * @author charlie (Dmitry Baev). @@ -404,6 +407,22 @@ void shouldUseUuid() { .allMatch(uuid -> nonNull(uuid) && uuid.matches("[\\-a-z0-9]+"), "UUID"); } + @ResourceLock(value = SYSTEM_PROPERTIES, mode = READ_WRITE) + @SystemProperty(name = "allure.label.x-provided", value = "cucumberjvm1-test-provided") + @Test + void shouldSupportProvidedLabels() { + final AllureResults results = runFeature("features/simple.feature"); + + final List testResults = results.getTestResults(); + assertThat(testResults) + .hasSize(1) + .flatExtracting(TestResult::getLabels) + .extracting(Label::getName, Label::getValue) + .contains( + tuple("x-provided", "cucumberjvm1-test-provided") + ); + } + private AllureResults runFeature(final String featureResource, final String... moreOptions) { final AllureResultsWriterStub writer = new AllureResultsWriterStub(); diff --git a/allure-cucumber2-jvm/src/main/java/io/qameta/allure/cucumber2jvm/LabelBuilder.java b/allure-cucumber2-jvm/src/main/java/io/qameta/allure/cucumber2jvm/LabelBuilder.java index b222a988a..18b36ae0a 100644 --- a/allure-cucumber2-jvm/src/main/java/io/qameta/allure/cucumber2jvm/LabelBuilder.java +++ b/allure-cucumber2-jvm/src/main/java/io/qameta/allure/cucumber2jvm/LabelBuilder.java @@ -20,6 +20,7 @@ import gherkin.pickles.PickleTag; import io.qameta.allure.model.Label; import io.qameta.allure.model.Link; +import io.qameta.allure.util.ResultsUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -114,6 +115,7 @@ class LabelBuilder { } } + getScenarioLabels().addAll(ResultsUtils.getProvidedLabels()); getScenarioLabels().addAll(Arrays.asList( createHostLabel(), createThreadLabel(), diff --git a/allure-cucumber2-jvm/src/test/java/io/qameta/allure/cucumber2jvm/AllureCucumber2JvmTest.java b/allure-cucumber2-jvm/src/test/java/io/qameta/allure/cucumber2jvm/AllureCucumber2JvmTest.java index 10498f014..55c217cb5 100644 --- a/allure-cucumber2-jvm/src/test/java/io/qameta/allure/cucumber2jvm/AllureCucumber2JvmTest.java +++ b/allure-cucumber2-jvm/src/test/java/io/qameta/allure/cucumber2jvm/AllureCucumber2JvmTest.java @@ -45,6 +45,7 @@ import org.apache.commons.io.IOUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.jupiter.api.parallel.ResourceLock; import java.io.IOException; import java.io.InputStream; @@ -61,6 +62,8 @@ import static java.util.Objects.nonNull; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.tuple; +import static org.junit.jupiter.api.parallel.ResourceAccessMode.READ_WRITE; +import static org.junit.jupiter.api.parallel.Resources.SYSTEM_PROPERTIES; /** * @author charlie (Dmitry Baev). @@ -555,6 +558,21 @@ void shouldSetStatusFailedOnFailedAndUndefinedSteps() { .containsExactlyInAnyOrder(Status.FAILED); } + @ResourceLock(value = SYSTEM_PROPERTIES, mode = READ_WRITE) + @SystemProperty(name = "allure.label.x-provided", value = "cucumberjvm2-test-provided") + @Test + void shouldSupportProvidedLabels() { + final AllureResults results = runFeature("features/simple.feature"); + + final List testResults = results.getTestResults(); + assertThat(testResults) + .hasSize(1) + .flatExtracting(TestResult::getLabels) + .extracting(Label::getName, Label::getValue) + .contains( + tuple("x-provided", "cucumberjvm2-test-provided") + ); + } private String readResource(final String resourceName) { try (InputStream is = currentThread().getContextClassLoader().getResourceAsStream(resourceName)) { diff --git a/allure-cucumber3-jvm/src/main/java/io/qameta/allure/cucumber3jvm/LabelBuilder.java b/allure-cucumber3-jvm/src/main/java/io/qameta/allure/cucumber3jvm/LabelBuilder.java index 2401d6481..e73fc9c41 100644 --- a/allure-cucumber3-jvm/src/main/java/io/qameta/allure/cucumber3jvm/LabelBuilder.java +++ b/allure-cucumber3-jvm/src/main/java/io/qameta/allure/cucumber3jvm/LabelBuilder.java @@ -20,6 +20,7 @@ import gherkin.pickles.PickleTag; import io.qameta.allure.model.Label; import io.qameta.allure.model.Link; +import io.qameta.allure.util.ResultsUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -114,6 +115,7 @@ class LabelBuilder { } } + getScenarioLabels().addAll(ResultsUtils.getProvidedLabels()); getScenarioLabels().addAll(Arrays.asList( createHostLabel(), createThreadLabel(), diff --git a/allure-cucumber3-jvm/src/test/java/io/qameta/allure/cucumber3jvm/AllureCucumber3JvmTest.java b/allure-cucumber3-jvm/src/test/java/io/qameta/allure/cucumber3jvm/AllureCucumber3JvmTest.java index d6aaf4e46..29b64f837 100644 --- a/allure-cucumber3-jvm/src/test/java/io/qameta/allure/cucumber3jvm/AllureCucumber3JvmTest.java +++ b/allure-cucumber3-jvm/src/test/java/io/qameta/allure/cucumber3jvm/AllureCucumber3JvmTest.java @@ -45,6 +45,7 @@ import org.apache.commons.io.IOUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.jupiter.api.parallel.ResourceLock; import java.io.IOException; import java.io.InputStream; @@ -61,6 +62,8 @@ import static java.util.Objects.nonNull; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.tuple; +import static org.junit.jupiter.api.parallel.ResourceAccessMode.READ_WRITE; +import static org.junit.jupiter.api.parallel.Resources.SYSTEM_PROPERTIES; /** * @author charlie (Dmitry Baev). @@ -568,6 +571,22 @@ void shouldSetStatusFailedOnFailedAndUndefinedSteps() { .containsExactlyInAnyOrder(Status.FAILED); } + @ResourceLock(value = SYSTEM_PROPERTIES, mode = READ_WRITE) + @SystemProperty(name = "allure.label.x-provided", value = "cucumberjvm3-test-provided") + @Test + void shouldSupportProvidedLabels() { + final AllureResults results = runFeature("features/simple.feature"); + + final List testResults = results.getTestResults(); + assertThat(testResults) + .hasSize(1) + .flatExtracting(TestResult::getLabels) + .extracting(Label::getName, Label::getValue) + .contains( + tuple("x-provided", "cucumberjvm3-test-provided") + ); + } + private String readResource(final String resourceName) { try (InputStream is = currentThread().getContextClassLoader().getResourceAsStream(resourceName)) { return IOUtils.toString(is, StandardCharsets.UTF_8); diff --git a/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/LabelBuilder.java b/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/LabelBuilder.java index ef7dcf7f1..9958e8e85 100644 --- a/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/LabelBuilder.java +++ b/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/LabelBuilder.java @@ -115,6 +115,7 @@ class LabelBuilder { final String featureName = feature.getName(); final String uri = scenario.getUri(); + getScenarioLabels().addAll(ResultsUtils.getProvidedLabels()); getScenarioLabels().addAll(Arrays.asList( createHostLabel(), createThreadLabel(), diff --git a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/AllureCucumber4JvmTest.java b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/AllureCucumber4JvmTest.java index 4ddbb50eb..95d08f2f8 100644 --- a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/AllureCucumber4JvmTest.java +++ b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/AllureCucumber4JvmTest.java @@ -49,6 +49,7 @@ import org.apache.commons.io.IOUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.jupiter.api.parallel.ResourceLock; import java.io.IOException; import java.io.InputStream; @@ -70,6 +71,8 @@ import static java.lang.Thread.currentThread; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.tuple; +import static org.junit.jupiter.api.parallel.ResourceAccessMode.READ_WRITE; +import static org.junit.jupiter.api.parallel.Resources.SYSTEM_PROPERTIES; /** * @author charlie (Dmitry Baev). @@ -730,6 +733,23 @@ void shouldHandleAmbigiousStepsExceptions() { ); } + @ResourceLock(value = SYSTEM_PROPERTIES, mode = READ_WRITE) + @SystemProperty(name = "allure.label.x-provided", value = "cucumberjvm4-test-provided") + @Test + void shouldSupportProvidedLabels() { + final AllureResultsWriterStub results = new AllureResultsWriterStub(); + runFeature(results, "features/simple.feature"); + + final List testResults = results.getTestResults(); + assertThat(testResults) + .hasSize(1) + .flatExtracting(TestResult::getLabels) + .extracting(Label::getName, Label::getValue) + .contains( + tuple("x-provided", "cucumberjvm4-test-provided") + ); + } + private byte runFeature(final AllureResultsWriterStub writer, final String featureResource, final String... moreOptions) { diff --git a/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/LabelBuilder.java b/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/LabelBuilder.java index 68063215e..d888a5c1e 100644 --- a/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/LabelBuilder.java +++ b/allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/LabelBuilder.java @@ -112,6 +112,7 @@ class LabelBuilder { final String featureName = feature.getName(); final URI uri = scenario.getUri(); + getScenarioLabels().addAll(ResultsUtils.getProvidedLabels()); getScenarioLabels().addAll(Arrays.asList( createHostLabel(), createThreadLabel(), diff --git a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/AllureCucumber5JvmTest.java b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/AllureCucumber5JvmTest.java index afd6c9567..6541f639b 100644 --- a/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/AllureCucumber5JvmTest.java +++ b/allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/AllureCucumber5JvmTest.java @@ -41,6 +41,7 @@ import io.qameta.allure.test.AllureResultsWriterStub; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.jupiter.api.parallel.ResourceLock; import java.nio.charset.StandardCharsets; import java.time.Clock; @@ -55,6 +56,8 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.tuple; +import static org.junit.jupiter.api.parallel.ResourceAccessMode.READ_WRITE; +import static org.junit.jupiter.api.parallel.Resources.SYSTEM_PROPERTIES; /** * @author charlie (Dmitry Baev). @@ -713,6 +716,23 @@ void shouldHandleAmbigiousStepsExceptions() { ); } + @ResourceLock(value = SYSTEM_PROPERTIES, mode = READ_WRITE) + @SystemProperty(name = "allure.label.x-provided", value = "cucumberjvm5-test-provided") + @Test + void shouldSupportProvidedLabels() { + final AllureResultsWriterStub results = new AllureResultsWriterStub(); + runFeature(results, "features/simple.feature"); + + final List testResults = results.getTestResults(); + assertThat(testResults) + .hasSize(1) + .flatExtracting(TestResult::getLabels) + .extracting(Label::getName, Label::getValue) + .contains( + tuple("x-provided", "cucumberjvm5-test-provided") + ); + } + private byte runFeature(final AllureResultsWriterStub writer, final String featureResource, final String... moreOptions) { diff --git a/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/LabelBuilder.java b/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/LabelBuilder.java index 3a51a15dc..7058c714b 100644 --- a/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/LabelBuilder.java +++ b/allure-cucumber6-jvm/src/main/java/io/qameta/allure/cucumber6jvm/LabelBuilder.java @@ -112,6 +112,7 @@ class LabelBuilder { final String featureName = feature.getName(); final URI uri = scenario.getUri(); + getScenarioLabels().addAll(ResultsUtils.getProvidedLabels()); getScenarioLabels().addAll(Arrays.asList( createHostLabel(), createThreadLabel(), diff --git a/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/AllureCucumber6JvmTest.java b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/AllureCucumber6JvmTest.java index fdc541590..98c79cce8 100644 --- a/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/AllureCucumber6JvmTest.java +++ b/allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/AllureCucumber6JvmTest.java @@ -41,6 +41,7 @@ import io.qameta.allure.test.AllureResultsWriterStub; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.jupiter.api.parallel.ResourceLock; import java.nio.charset.StandardCharsets; import java.time.Clock; @@ -55,6 +56,8 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.tuple; +import static org.junit.jupiter.api.parallel.ResourceAccessMode.READ_WRITE; +import static org.junit.jupiter.api.parallel.Resources.SYSTEM_PROPERTIES; /** * @author charlie (Dmitry Baev). @@ -713,6 +716,23 @@ void shouldHandleAmbigiousStepsExceptions() { ); } + @ResourceLock(value = SYSTEM_PROPERTIES, mode = READ_WRITE) + @SystemProperty(name = "allure.label.x-provided", value = "cucumberjvm6-test-provided") + @Test + void shouldSupportProvidedLabels() { + final AllureResultsWriterStub results = new AllureResultsWriterStub(); + runFeature(results, "features/simple.feature"); + + final List testResults = results.getTestResults(); + assertThat(testResults) + .hasSize(1) + .flatExtracting(TestResult::getLabels) + .extracting(Label::getName, Label::getValue) + .contains( + tuple("x-provided", "cucumberjvm6-test-provided") + ); + } + private byte runFeature(final AllureResultsWriterStub writer, final String featureResource, final String... moreOptions) { From 2e5e43359d852488e32d0c1ffe27c438be6264d0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Nov 2021 15:44:59 +0300 Subject: [PATCH 4/5] bump actions/checkout from 2.3.5 to 2.4.0 (via #675) --- .github/workflows/build.yml | 2 +- .github/workflows/publish.yml | 2 +- .github/workflows/release.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fc3e01626..76fe22870 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,7 @@ jobs: matrix: java-version: [ '8.0.x', '11.0.x' ] steps: - - uses: actions/checkout@v2.3.5 + - uses: actions/checkout@v2.4.0 - name: Set up JDK ${{ matrix.java-version }} uses: actions/setup-java@v2 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 1ffdb053c..79868e2a2 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -8,7 +8,7 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2.3.5 + - uses: actions/checkout@v2.4.0 - name: Set up JDK 1.8 uses: actions/setup-java@v2 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 52a66524b..10a55d378 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,7 +20,7 @@ jobs: - name: "Check next version" run: | expr "${{ github.event.inputs.nextVersion }}" : '[[:digit:]][[:digit:]]*\.[[:digit:]][[:digit:]]*$' - - uses: actions/checkout@v2.3.5 + - uses: actions/checkout@v2.4.0 with: token: ${{ secrets.QAMETA_CI }} From dff0563e086552b234ca90561b6ac881cc1403b7 Mon Sep 17 00:00:00 2001 From: qameta-ci Date: Wed, 3 Nov 2021 12:53:20 +0000 Subject: [PATCH 5/5] release 2.16.1 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index c34fa2e10..20b6ae314 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version=2.17-SNAPSHOT +version=2.16.1 org.gradle.daemon=true org.gradle.parallel=true