From a7c46866356e3b2623cd6dcc60f90646295c8837 Mon Sep 17 00:00:00 2001 From: Dmitry Baev Date: Tue, 30 Jul 2024 17:04:51 +0100 Subject: [PATCH] drop unsupported cucumber versions (via #117) --- .../DeprecatedAllureAdapterExtensions.kt | 63 ------------------- .../gradle/adapter/config/AdapterHandler.kt | 4 +- .../adapter/config/AllureJavaAdapter.kt | 4 +- .../allure/gradle/adapter/AdaptersTest.kt | 6 +- .../src/it/cucumber-jvm/build.gradle | 29 --------- .../src/test/java/tests/CucumberJvmTest.java | 12 ---- .../src/test/java/tests/Steps.java | 34 ---------- .../src/it/cucumber2-jvm/build.gradle | 27 -------- .../src/test/java/tests/Cucumber2JvmTest.java | 12 ---- .../src/test/java/tests/Steps.java | 34 ---------- .../src/test/resources/features/test.feature | 5 -- .../src/it/cucumber7-jvm/build.gradle | 30 +++++++++ .../src/test/java/tests/Cucumber7JvmTest.java | 12 ++++ .../src/test/java/tests/Steps.java | 24 +++++++ .../src/test/resources/features/test.feature | 0 .../src/it/full-dsl-groovy/build.gradle | 1 - .../src/it/full-dsl-kotlin/build.gradle.kts | 1 - .../src/it/junit4-kotlin/build.gradle.kts | 8 ++- allure-plugin/src/it/junit4/build.gradle | 8 ++- .../gradle/allure/DependenciesTest.java | 3 +- 20 files changed, 84 insertions(+), 233 deletions(-) delete mode 100644 allure-adapter-plugin/src/main/kotlin/DeprecatedAllureAdapterExtensions.kt delete mode 100644 allure-plugin/src/it/cucumber-jvm/build.gradle delete mode 100644 allure-plugin/src/it/cucumber-jvm/src/test/java/tests/CucumberJvmTest.java delete mode 100644 allure-plugin/src/it/cucumber-jvm/src/test/java/tests/Steps.java delete mode 100644 allure-plugin/src/it/cucumber2-jvm/build.gradle delete mode 100644 allure-plugin/src/it/cucumber2-jvm/src/test/java/tests/Cucumber2JvmTest.java delete mode 100644 allure-plugin/src/it/cucumber2-jvm/src/test/java/tests/Steps.java delete mode 100644 allure-plugin/src/it/cucumber2-jvm/src/test/resources/features/test.feature create mode 100644 allure-plugin/src/it/cucumber7-jvm/build.gradle create mode 100644 allure-plugin/src/it/cucumber7-jvm/src/test/java/tests/Cucumber7JvmTest.java create mode 100644 allure-plugin/src/it/cucumber7-jvm/src/test/java/tests/Steps.java rename allure-plugin/src/it/{cucumber-jvm => cucumber7-jvm}/src/test/resources/features/test.feature (100%) diff --git a/allure-adapter-plugin/src/main/kotlin/DeprecatedAllureAdapterExtensions.kt b/allure-adapter-plugin/src/main/kotlin/DeprecatedAllureAdapterExtensions.kt deleted file mode 100644 index 1b10ae5..0000000 --- a/allure-adapter-plugin/src/main/kotlin/DeprecatedAllureAdapterExtensions.kt +++ /dev/null @@ -1,63 +0,0 @@ -import io.qameta.allure.gradle.base.AllureExtension -import io.qameta.allure.gradle.adapter.config.AdapterConfig -import org.gradle.api.Action - -@Deprecated( - level = DeprecationLevel.WARNING, message = "Use frameworks.cucumberJvm", - replaceWith = ReplaceWith("frameworks.cucumberJvm.configure(action)") -) -fun AllureExtension.useCucumberJVM(action: Action) { - adapter.frameworks { - action.execute(cucumberJvm) - } -} - -@Deprecated( - level = DeprecationLevel.WARNING, message = "Use frameworks.cucumber2Jvm", - replaceWith = ReplaceWith("frameworks.cucumber2Jvm { }") -) -fun AllureExtension.useCucumber2JVM(action: Action) { - adapter.frameworks { - action.execute(cucumber2Jvm) - } -} - -@Deprecated( - level = DeprecationLevel.WARNING, message = "Use frameworks.junit4", - replaceWith = ReplaceWith("frameworks.junit4 { }") -) -fun AllureExtension.useJUnit4(action: Action) { - adapter.frameworks { - action.execute(junit4) - } -} - -@Deprecated( - level = DeprecationLevel.WARNING, message = "Use frameworks.junit4", - replaceWith = ReplaceWith("frameworks.junit5 { }") -) -fun AllureExtension.useJUnit5(action: Action) { - adapter.frameworks { - action.execute(junit5) - } -} - -@Deprecated( - level = DeprecationLevel.WARNING, message = "Use frameworks.testng", - replaceWith = ReplaceWith("frameworks.testng { }") -) -fun AllureExtension.useTestNG(action: Action) { - adapter.frameworks { - action.execute(testng) - } -} - -@Deprecated( - level = DeprecationLevel.WARNING, message = "Use frameworks.spock", - replaceWith = ReplaceWith("frameworks.spock { }") -) -fun AllureExtension.useSpock(action: Action) { - adapter.frameworks { - action.execute(spock) - } -} diff --git a/allure-adapter-plugin/src/main/kotlin/io/qameta/allure/gradle/adapter/config/AdapterHandler.kt b/allure-adapter-plugin/src/main/kotlin/io/qameta/allure/gradle/adapter/config/AdapterHandler.kt index a4e3f37..39db695 100644 --- a/allure-adapter-plugin/src/main/kotlin/io/qameta/allure/gradle/adapter/config/AdapterHandler.kt +++ b/allure-adapter-plugin/src/main/kotlin/io/qameta/allure/gradle/adapter/config/AdapterHandler.kt @@ -14,12 +14,10 @@ open class AdapterHandler @Inject constructor( val junit5 by lazyCreating val testng by lazyCreating val spock by lazyCreating - val cucumberJvm by lazyCreating - val cucumber2Jvm by lazyCreating - val cucumber3Jvm by lazyCreating val cucumber4Jvm by lazyCreating val cucumber5Jvm by lazyCreating val cucumber6Jvm by lazyCreating + val cucumber7Jvm by lazyCreating fun cucumberJvm(majorVersion: Int) = maybeCreate( if (majorVersion == 1) "cucumberJvm" else "cucumber${majorVersion}Jvm" diff --git a/allure-adapter-plugin/src/main/kotlin/io/qameta/allure/gradle/adapter/config/AllureJavaAdapter.kt b/allure-adapter-plugin/src/main/kotlin/io/qameta/allure/gradle/adapter/config/AllureJavaAdapter.kt index 4c40593..5db227f 100644 --- a/allure-adapter-plugin/src/main/kotlin/io/qameta/allure/gradle/adapter/config/AllureJavaAdapter.kt +++ b/allure-adapter-plugin/src/main/kotlin/io/qameta/allure/gradle/adapter/config/AllureJavaAdapter.kt @@ -32,12 +32,10 @@ internal enum class AllureJavaAdapter( spock("spock", { activateOn("org.spockframework:spock-core") }), - cucumberJvm("cucumber-jvm", cucumberJvm(1)), - cucumber2Jvm("cucumber2-jvm", cucumberJvm(2)), - cucumber3Jvm("cucumber3-jvm", cucumberJvm(3)), cucumber4Jvm("cucumber4-jvm", cucumberJvm(4)), cucumber5Jvm("cucumber5-jvm", cucumberJvm(5)), cucumber6Jvm("cucumber6-jvm", cucumberJvm(6)), + cucumber7Jvm("cucumber7-jvm", cucumberJvm(7)), ; companion object { diff --git a/allure-adapter-plugin/src/test/kotlin/io/qameta/allure/gradle/adapter/AdaptersTest.kt b/allure-adapter-plugin/src/test/kotlin/io/qameta/allure/gradle/adapter/AdaptersTest.kt index 3fb4355..2e88165 100644 --- a/allure-adapter-plugin/src/test/kotlin/io/qameta/allure/gradle/adapter/AdaptersTest.kt +++ b/allure-adapter-plugin/src/test/kotlin/io/qameta/allure/gradle/adapter/AdaptersTest.kt @@ -55,19 +55,19 @@ class AdaptersTest { "7.5.1", "src/it/adapter-all", arrayOf("printAdapters"), - "[AdapterConfig{cucumber2Jvm}, AdapterConfig{cucumber3Jvm}, AdapterConfig{cucumber4Jvm}, AdapterConfig{cucumber5Jvm}, AdapterConfig{cucumber6Jvm}, AdapterConfig{cucumberJvm}, AdapterConfig{junit4}, AdapterConfig{junit5}, AdapterConfig{spock}, AdapterConfig{testng}]" + "[AdapterConfig{cucumber4Jvm}, AdapterConfig{cucumber5Jvm}, AdapterConfig{cucumber6Jvm}, AdapterConfig{cucumber7Jvm}, AdapterConfig{junit4}, AdapterConfig{junit5}, AdapterConfig{spock}, AdapterConfig{testng}]" ), arrayOf( "7.0", "src/it/adapter-all", arrayOf("printAdapters"), - "[AdapterConfig{cucumber2Jvm}, AdapterConfig{cucumber3Jvm}, AdapterConfig{cucumber4Jvm}, AdapterConfig{cucumber5Jvm}, AdapterConfig{cucumber6Jvm}, AdapterConfig{cucumberJvm}, AdapterConfig{junit4}, AdapterConfig{junit5}, AdapterConfig{spock}, AdapterConfig{testng}]" + "[AdapterConfig{cucumber4Jvm}, AdapterConfig{cucumber5Jvm}, AdapterConfig{cucumber6Jvm}, AdapterConfig{cucumber7Jvm}, AdapterConfig{junit4}, AdapterConfig{junit5}, AdapterConfig{spock}, AdapterConfig{testng}]" ), arrayOf( "6.0", "src/it/adapter-all", arrayOf("printAdapters"), - "[AdapterConfig{cucumber2Jvm}, AdapterConfig{cucumber3Jvm}, AdapterConfig{cucumber4Jvm}, AdapterConfig{cucumber5Jvm}, AdapterConfig{cucumber6Jvm}, AdapterConfig{cucumberJvm}, AdapterConfig{junit4}, AdapterConfig{junit5}, AdapterConfig{spock}, AdapterConfig{testng}]" + "[AdapterConfig{cucumber4Jvm}, AdapterConfig{cucumber5Jvm}, AdapterConfig{cucumber6Jvm}, AdapterConfig{cucumber7Jvm}, AdapterConfig{junit4}, AdapterConfig{junit5}, AdapterConfig{spock}, AdapterConfig{testng}]" ) ) } diff --git a/allure-plugin/src/it/cucumber-jvm/build.gradle b/allure-plugin/src/it/cucumber-jvm/build.gradle deleted file mode 100644 index 0b5d195..0000000 --- a/allure-plugin/src/it/cucumber-jvm/build.gradle +++ /dev/null @@ -1,29 +0,0 @@ -plugins { - id 'java' - id 'io.qameta.allure' -} - -allure { - aspectjweaver = true - - useCucumberJVM { - } -} - -repositories { - mavenCentral() -} - -dependencies { - implementation 'commons-io:commons-io:2.5' - implementation 'info.cukes:gherkin:2.12.2' - implementation 'info.cukes:cucumber-core:1.2.5' - implementation 'info.cukes:cucumber-java:1.2.5' - implementation 'info.cukes:cucumber-junit:1.2.5' - - testImplementation 'junit:junit:4.12' -} - -test { - useJUnit() -} diff --git a/allure-plugin/src/it/cucumber-jvm/src/test/java/tests/CucumberJvmTest.java b/allure-plugin/src/it/cucumber-jvm/src/test/java/tests/CucumberJvmTest.java deleted file mode 100644 index 4573edb..0000000 --- a/allure-plugin/src/it/cucumber-jvm/src/test/java/tests/CucumberJvmTest.java +++ /dev/null @@ -1,12 +0,0 @@ -package tests; - -import cucumber.api.CucumberOptions; -import cucumber.api.junit.Cucumber; -import org.junit.runner.RunWith; - -@RunWith(Cucumber.class) -@CucumberOptions( - features = {"src/test/resources/features"}, - plugin = {"io.qameta.allure.cucumberjvm.AllureCucumberJvm"}) -public class CucumberJvmTest { -} \ No newline at end of file diff --git a/allure-plugin/src/it/cucumber-jvm/src/test/java/tests/Steps.java b/allure-plugin/src/it/cucumber-jvm/src/test/java/tests/Steps.java deleted file mode 100644 index 3ebb928..0000000 --- a/allure-plugin/src/it/cucumber-jvm/src/test/java/tests/Steps.java +++ /dev/null @@ -1,34 +0,0 @@ -package tests; - -import cucumber.api.java.After; -import cucumber.api.java.Before; -import cucumber.api.java.en.Given; -import cucumber.api.java.en.Then; -import cucumber.api.java.en.When; -import io.qameta.allure.Attachment; -import org.apache.commons.io.IOUtils; - -import java.awt.AWTException; -import java.awt.Rectangle; -import java.awt.Robot; -import java.awt.Toolkit; -import java.awt.image.BufferedImage; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import javax.imageio.ImageIO; - -import org.junit.Assert; - -public class Steps { - - @Given("step") - public void stepMethod() { - attachment(); - } - - @Attachment(value = "attachment", type = "text/plain") - public String attachment() { - return "

HELLO

"; - } - -} diff --git a/allure-plugin/src/it/cucumber2-jvm/build.gradle b/allure-plugin/src/it/cucumber2-jvm/build.gradle deleted file mode 100644 index 9dc212d..0000000 --- a/allure-plugin/src/it/cucumber2-jvm/build.gradle +++ /dev/null @@ -1,27 +0,0 @@ -plugins { - id 'java' - id 'io.qameta.allure' -} - -allure { - useCucumber2JVM { - } -} - -repositories { - mavenCentral() -} - -dependencies { - implementation 'commons-io:commons-io:2.5' - implementation 'info.cukes:gherkin:2.12.2' - implementation 'io.cucumber:cucumber-core:2.3.1' - implementation 'io.cucumber:cucumber-java:2.3.1' - implementation 'io.cucumber:cucumber-junit:2.3.1' - - testImplementation 'junit:junit:4.12' -} - -test { - useJUnit() -} diff --git a/allure-plugin/src/it/cucumber2-jvm/src/test/java/tests/Cucumber2JvmTest.java b/allure-plugin/src/it/cucumber2-jvm/src/test/java/tests/Cucumber2JvmTest.java deleted file mode 100644 index 0b16efa..0000000 --- a/allure-plugin/src/it/cucumber2-jvm/src/test/java/tests/Cucumber2JvmTest.java +++ /dev/null @@ -1,12 +0,0 @@ -package tests; - -import cucumber.api.CucumberOptions; -import cucumber.api.junit.Cucumber; -import org.junit.runner.RunWith; - -@RunWith(Cucumber.class) -@CucumberOptions( - features = {"src/test/resources/features"}, - plugin = {"io.qameta.allure.cucumber2jvm.AllureCucumber2Jvm"}) -public class Cucumber2JvmTest { -} \ No newline at end of file diff --git a/allure-plugin/src/it/cucumber2-jvm/src/test/java/tests/Steps.java b/allure-plugin/src/it/cucumber2-jvm/src/test/java/tests/Steps.java deleted file mode 100644 index 3ebb928..0000000 --- a/allure-plugin/src/it/cucumber2-jvm/src/test/java/tests/Steps.java +++ /dev/null @@ -1,34 +0,0 @@ -package tests; - -import cucumber.api.java.After; -import cucumber.api.java.Before; -import cucumber.api.java.en.Given; -import cucumber.api.java.en.Then; -import cucumber.api.java.en.When; -import io.qameta.allure.Attachment; -import org.apache.commons.io.IOUtils; - -import java.awt.AWTException; -import java.awt.Rectangle; -import java.awt.Robot; -import java.awt.Toolkit; -import java.awt.image.BufferedImage; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import javax.imageio.ImageIO; - -import org.junit.Assert; - -public class Steps { - - @Given("step") - public void stepMethod() { - attachment(); - } - - @Attachment(value = "attachment", type = "text/plain") - public String attachment() { - return "

HELLO

"; - } - -} diff --git a/allure-plugin/src/it/cucumber2-jvm/src/test/resources/features/test.feature b/allure-plugin/src/it/cucumber2-jvm/src/test/resources/features/test.feature deleted file mode 100644 index 682b807..0000000 --- a/allure-plugin/src/it/cucumber2-jvm/src/test/resources/features/test.feature +++ /dev/null @@ -1,5 +0,0 @@ -@tag -Feature: Test one - - Scenario: Outline - Given step diff --git a/allure-plugin/src/it/cucumber7-jvm/build.gradle b/allure-plugin/src/it/cucumber7-jvm/build.gradle new file mode 100644 index 0000000..97cb630 --- /dev/null +++ b/allure-plugin/src/it/cucumber7-jvm/build.gradle @@ -0,0 +1,30 @@ +plugins { + id 'java' + id 'io.qameta.allure' +} + +allure { + adapter { + frameworks { + cucumber7jvm { + version = "2.28.0" + } + } + } +} + +repositories { + mavenCentral() +} + +dependencies { + testImplementation platform('io.cucumber:cucumber-bom:7.13.0') + testImplementation 'io.cucumber:cucumber-junit' + testImplementation 'io.cucumber:cucumber-java' + + testImplementation 'junit:junit:4.12' +} + +test { + useJUnit() +} diff --git a/allure-plugin/src/it/cucumber7-jvm/src/test/java/tests/Cucumber7JvmTest.java b/allure-plugin/src/it/cucumber7-jvm/src/test/java/tests/Cucumber7JvmTest.java new file mode 100644 index 0000000..01aeadb --- /dev/null +++ b/allure-plugin/src/it/cucumber7-jvm/src/test/java/tests/Cucumber7JvmTest.java @@ -0,0 +1,12 @@ +package tests; + +import io.cucumber.junit.Cucumber; +import io.cucumber.junit.CucumberOptions; +import org.junit.runner.RunWith; + +@RunWith(Cucumber.class) +@CucumberOptions( + features = {"src/test/resources/features"}, + plugin = {"io.qameta.allure.cucumber7jvm.AllureCucumber7Jvm"}) +public class Cucumber7JvmTest { +} diff --git a/allure-plugin/src/it/cucumber7-jvm/src/test/java/tests/Steps.java b/allure-plugin/src/it/cucumber7-jvm/src/test/java/tests/Steps.java new file mode 100644 index 0000000..4de326c --- /dev/null +++ b/allure-plugin/src/it/cucumber7-jvm/src/test/java/tests/Steps.java @@ -0,0 +1,24 @@ +package tests; + +import io.cucumber.java.After; +import io.cucumber.java.Before; +import io.cucumber.java.en.Given; +import io.cucumber.java.en.Then; +import io.cucumber.java.en.When; +import io.qameta.allure.Attachment; + +import org.junit.Assert; + +public class Steps { + + @Given("step") + public void stepMethod() { + attachment(); + } + + @Attachment(value = "attachment", type = "text/plain") + public String attachment() { + return "

HELLO

"; + } + +} diff --git a/allure-plugin/src/it/cucumber-jvm/src/test/resources/features/test.feature b/allure-plugin/src/it/cucumber7-jvm/src/test/resources/features/test.feature similarity index 100% rename from allure-plugin/src/it/cucumber-jvm/src/test/resources/features/test.feature rename to allure-plugin/src/it/cucumber7-jvm/src/test/resources/features/test.feature diff --git a/allure-plugin/src/it/full-dsl-groovy/build.gradle b/allure-plugin/src/it/full-dsl-groovy/build.gradle index 2c0bff2..e1631a1 100644 --- a/allure-plugin/src/it/full-dsl-groovy/build.gradle +++ b/allure-plugin/src/it/full-dsl-groovy/build.gradle @@ -48,7 +48,6 @@ allure { report.reportDir = file("$buildDir/allure/reports") report.dependsOnTests = true } -allure.adapter.frameworks.cucumberJvm.enabled = true allure.commandline.downloadUrlPattern = "localhost" allure.report.dependsOnTests = true diff --git a/allure-plugin/src/it/full-dsl-kotlin/build.gradle.kts b/allure-plugin/src/it/full-dsl-kotlin/build.gradle.kts index 92ebe64..76de662 100644 --- a/allure-plugin/src/it/full-dsl-kotlin/build.gradle.kts +++ b/allure-plugin/src/it/full-dsl-kotlin/build.gradle.kts @@ -47,7 +47,6 @@ allure { report.reportDir.set(buildDir.resolve("allure/reports")) report.dependsOnTests.set(true) } -allure.adapter.frameworks.cucumberJvm.enabled.set(true) allure.commandline.downloadUrlPattern.set("localhost") allure.report.dependsOnTests.set(true) diff --git a/allure-plugin/src/it/junit4-kotlin/build.gradle.kts b/allure-plugin/src/it/junit4-kotlin/build.gradle.kts index 17bdf7b..05ca189 100644 --- a/allure-plugin/src/it/junit4-kotlin/build.gradle.kts +++ b/allure-plugin/src/it/junit4-kotlin/build.gradle.kts @@ -6,8 +6,12 @@ plugins { allure { version.set("2.8.1") - useJUnit4 { - version = "2.9.0" + adapter { + frameworks { + junit4 { + adapterVersion.set("2.9.0") + } + } } } diff --git a/allure-plugin/src/it/junit4/build.gradle b/allure-plugin/src/it/junit4/build.gradle index feb87f6..40a1238 100644 --- a/allure-plugin/src/it/junit4/build.gradle +++ b/allure-plugin/src/it/junit4/build.gradle @@ -7,8 +7,12 @@ allure { version = '2.8.0' aspectjweaver = true - useJUnit4 { - version = "2.9.0" + adapter { + frameworks { + junit4 { + version = "2.9.0" + } + } } } diff --git a/allure-plugin/src/test/java/io/qameta/allure/gradle/allure/DependenciesTest.java b/allure-plugin/src/test/java/io/qameta/allure/gradle/allure/DependenciesTest.java index f81513a..bfc7bf2 100644 --- a/allure-plugin/src/test/java/io/qameta/allure/gradle/allure/DependenciesTest.java +++ b/allure-plugin/src/test/java/io/qameta/allure/gradle/allure/DependenciesTest.java @@ -28,8 +28,7 @@ public class DependenciesTest { // The order of versions is newest, oldest, rest private static final String[][] IT_MATRIX = { - { "src/it/cucumber-jvm", "7.5.1", "7.0", "6.0" }, - { "src/it/cucumber2-jvm", "7.5.1", "7.0", "6.0" }, + { "src/it/cucumber7-jvm", "7.5.1", "7.0", "6.0" }, { "src/it/junit4", "7.5.1", "7.0", "6.0" }, { "src/it/junit4-autoconfigure", "7.5.1", "7.0", "6.0" }, { "src/it/junit4-kotlin", "7.5.1", "7.0", "6.0" },