drop unsupported cucumber versions (via #117)

allure-framework · Jul 30, 2024 · a7c4686 · a7c4686
1 parent 54eb05b
commit a7c4686
Show file tree

Hide file tree

Showing 20 changed files with 84 additions and 233 deletions.
diff --git a/allure-adapter-plugin/src/main/kotlin/DeprecatedAllureAdapterExtensions.kt b/allure-adapter-plugin/src/main/kotlin/DeprecatedAllureAdapterExtensions.kt
diff --git a/...e-adapter-plugin/src/main/kotlin/io/qameta/allure/gradle/adapter/config/AdapterHandler.kt b/...e-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/...dapter-plugin/src/main/kotlin/io/qameta/allure/gradle/adapter/config/AllureJavaAdapter.kt b/...dapter-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
@@ -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
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
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
diff --git a/allure-plugin/src/it/cucumber2-jvm/build.gradle b/allure-plugin/src/it/cucumber2-jvm/build.gradle
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
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
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
diff --git a/allure-plugin/src/it/cucumber7-jvm/build.gradle 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
@@ -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
@@ -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 "<p>HELLO</p>";
+    }
+
+}
diff --git a/.../src/test/resources/features/test.feature → .../src/test/resources/features/test.feature b/.../src/test/resources/features/test.feature → .../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
@@ -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
@@ -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
@@ -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
@@ -7,8 +7,12 @@ allure {
     version = '2.8.0'
     aspectjweaver = true
 
-    useJUnit4 {
-        version = "2.9.0"
+    adapter {
+        frameworks {
+            junit4 {
+                version = "2.9.0"
+            }
+        }
     }
 }