update cucumber-jvm (via allure-framework#392)

jsa34 · baev · commit fd0be8cdad16 · 2019-10-09T17:09:04.000+03:00
diff --git a/allure-cucumber3-jvm/build.gradle.kts b/allure-cucumber3-jvm/build.gradle.kts
@@ -2,7 +2,7 @@ description = "Allure CucumberJVM 3.0 Integration"
 
 val agent: Configuration by configurations.creating
 
-val cucumberVersion = "3.0.0"
+val cucumberVersion = "3.0.2"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")
diff --git a/allure-cucumber4-jvm/build.gradle.kts b/allure-cucumber4-jvm/build.gradle.kts
@@ -2,7 +2,7 @@ description = "Allure CucumberJVM 4.0"
 
 val agent: Configuration by configurations.creating
 
-val cucumberVersion = "4.3.1"
+val cucumberVersion = "4.7.2"
 
 dependencies {
     agent("org.aspectj:aspectjweaver")
diff --git a/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/AllureCucumber4Jvm.java b/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/AllureCucumber4Jvm.java
@@ -52,7 +52,6 @@
 import io.qameta.allure.model.TestResultContainer;
 
 import java.io.ByteArrayInputStream;
-import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.Collections;
 import java.util.Deque;
@@ -71,7 +70,7 @@
 import static io.qameta.allure.util.ResultsUtils.md5;
 
 /**
- * Allure plugin for Cucumber JVM 3.0.
+ * Allure plugin for Cucumber JVM 4.0.
  */
 @SuppressWarnings({
         "PMD.ExcessiveImports",
@@ -331,7 +330,7 @@ private void createDataTableAttachment(final PickleTable pickleTable) {
             final String attachmentSource = lifecycle
                     .prepareAttachment("Data table", "text/tab-separated-values", "csv");
             lifecycle.writeAttachment(attachmentSource,
-                    new ByteArrayInputStream(dataTableCsv.toString().getBytes(Charset.forName("UTF-8"))));
+                    new ByteArrayInputStream(dataTableCsv.toString().getBytes(StandardCharsets.UTF_8)));
         }
     }
 
@@ -343,7 +342,7 @@ private void handleHookStep(final TestStepFinished event) {
         if (!Status.PASSED.equals(fixtureResult.getStatus())) {
             final TestResult testResult = new TestResult().setStatus(translateTestCaseStatus(event.result));
             final StatusDetails statusDetails = getStatusDetails(event.result.getError())
-                    .orElseGet(() -> new StatusDetails());
+                    .orElseGet(StatusDetails::new);
 
             final String errorMessage = event.result.getError() == null ? hookStep.getHookType()
                     .name() + " is failed." : hookStep.getHookType()
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
@@ -18,7 +18,6 @@
 import cucumber.runtime.ClassFinder;
 import cucumber.runtime.FeatureSupplier;
 import cucumber.runtime.Runtime;
-import cucumber.runtime.RuntimeOptions;
 import cucumber.runtime.io.MultiLoader;
 import cucumber.runtime.io.ResourceLoader;
 import cucumber.runtime.io.ResourceLoaderClassFinder;
@@ -30,6 +29,8 @@
 import gherkin.events.PickleEvent;
 import gherkin.pickles.Compiler;
 import gherkin.pickles.Pickle;
+import io.cucumber.core.options.CommandlineOptionsParser;
+import io.cucumber.core.options.RuntimeOptions;
 import io.github.glytching.junit.extension.system.SystemProperty;
 import io.github.glytching.junit.extension.system.SystemPropertyExtension;
 import io.qameta.allure.AllureLifecycle;
@@ -725,7 +726,7 @@ private byte runFeature(final AllureResultsWriterStub writer,
                 "--plugin", "null_summary"
         ));
         opts.addAll(Arrays.asList(moreOptions));
-        final RuntimeOptions options = new RuntimeOptions(opts);
+        final RuntimeOptions options = new CommandlineOptionsParser().parse(opts).build();
         boolean mt = options.isMultiThreaded();
 
         FeatureSupplier featureSupplier = () -> {
diff --git a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/AmbigiousSteps.java b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/AmbigiousSteps.java
@@ -15,8 +15,8 @@
  */
 package io.qameta.allure.cucumber4jvm.samples;
 
-import cucumber.api.java.en.Then;
-import cucumber.api.java.en.When;
+import io.cucumber.java.en.Then;
+import io.cucumber.java.en.When;
 
 /**
  * @author charlie (Dmitry Baev).
diff --git a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/AttachmentSteps.java b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/AttachmentSteps.java
@@ -15,9 +15,9 @@
  */
 package io.qameta.allure.cucumber4jvm.samples;
 
-import cucumber.api.Scenario;
-import cucumber.api.java.Before;
-import cucumber.api.java.en.Given;
+import io.cucumber.core.api.Scenario;
+import io.cucumber.java.Before;
+import io.cucumber.java.en.Given;
 
 public class AttachmentSteps
 {
diff --git a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/BackgroundFeatureSteps.java b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/BackgroundFeatureSteps.java
@@ -15,9 +15,9 @@
  */
 package io.qameta.allure.cucumber4jvm.samples;
 
-import cucumber.api.java.en.Given;
-import cucumber.api.java.en.Then;
-import cucumber.api.java.en.When;
+import io.cucumber.java.en.Given;
+import io.cucumber.java.en.Then;
+import io.cucumber.java.en.When;
 
 /**
  * @author charlie (Dmitry Baev).
diff --git a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/BrokenFeatureSteps.java b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/BrokenFeatureSteps.java
@@ -15,7 +15,7 @@
  */
 package io.qameta.allure.cucumber4jvm.samples;
 
-import cucumber.api.java.en.Given;
+import io.cucumber.java.en.Given;
 
 /**
  * @author charlie (Dmitry Baev).
diff --git a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/DatatableFeatureSteps.java b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/DatatableFeatureSteps.java
@@ -15,7 +15,7 @@
  */
 package io.qameta.allure.cucumber4jvm.samples;
 
-import cucumber.api.java.en.Given;
+import io.cucumber.java.en.Given;
 import io.cucumber.datatable.DataTable;
 
 /**
diff --git a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/HookSteps.java b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/HookSteps.java
@@ -15,8 +15,8 @@
  */
 package io.qameta.allure.cucumber4jvm.samples;
 
-import cucumber.api.java.After;
-import cucumber.api.java.Before;
+import io.cucumber.java.After;
+import io.cucumber.java.Before;
 import org.testng.Assert;
 
 /**
diff --git a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/PendingSteps.java b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/PendingSteps.java
@@ -16,7 +16,7 @@
 package io.qameta.allure.cucumber4jvm.samples;
 
 import cucumber.api.PendingException;
-import cucumber.api.java.en.Given;
+import io.cucumber.java.en.Given;
 
 /**
  * @author charlie (Dmitry Baev).
diff --git a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/SimpleFeatureSteps.java b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/samples/SimpleFeatureSteps.java
@@ -15,9 +15,9 @@
  */
 package io.qameta.allure.cucumber4jvm.samples;
 
-import cucumber.api.java.en.Given;
-import cucumber.api.java.en.Then;
-import cucumber.api.java.en.When;
+import io.cucumber.java.en.Given;
+import io.cucumber.java.en.Then;
+import io.cucumber.java.en.When;
 import org.testng.Assert;
 
 /**
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradlew.bat b/gradlew.bat
