Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FIx compatibility for cucumber java plugin #2328

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 23 additions & 7 deletions karate-core/src/main/java/com/intuit/karate/ScenarioActions.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@
import com.intuit.karate.core.AssignType;
import com.intuit.karate.core.Action;
import com.intuit.karate.core.ScenarioEngine;
import com.intuit.karate.core.When;
import cucumber.api.DataTable;
import cucumber.api.java.en.When;
import java.util.List;
import java.util.Map;

Expand Down Expand Up @@ -153,14 +154,24 @@ public void request(String body) {
engine.request(body);
}

@Override
@When("^table (.+)")
public void table(String name, DataTable table) {
table(name, table.asMaps(String.class, String.class));
}

@Override
@Action("^table (.+)")
public void table(String name, List<Map<String, String>> table) {
engine.table(name, table);
}

@Override
@When("^replace (\\w+)$")
public void replace(String name, DataTable table) {
replace(name, table.asMaps(String.class, String.class));
}

@Override
@Action("^replace (\\w+)$")
public void replace(String name, List<Map<String, String>> table) {
engine.replaceTable(name, table);
}
Expand All @@ -176,7 +187,7 @@ public void replace(String name, String token, String value) {
public void def(String name, String exp) {
engine.assign(AssignType.AUTO, name, exp, false);
}

@Override
@When("^def (.+) =$")
public void defDocString(String name, String exp) {
Expand All @@ -194,12 +205,12 @@ public void text(String name, String exp) {
public void yaml(String name, String exp) {
engine.assign(AssignType.YAML, name, exp, false);
}

@Override
@When("^yaml (.+) =$")
public void yamlDocString(String name, String exp) {
engine.assign(AssignType.YAML, name, exp, true);
}
}

@Override
@When("^copy (.+) = (.+)")
Expand Down Expand Up @@ -330,8 +341,13 @@ public void set(String name, String path, String value) {
engine.set(name, path, value);
}

@Override
@When("^set ([^\\s]+)( [^=]+)?$")
public void set(String name, String path, DataTable table) {
set(name, path, table.asMaps(String.class, String.class));
}

@Override
@Action("^set ([^\\s]+)( [^=]+)?$")
public void set(String name, String path, List<Map<String, String>> table) {
engine.setViaTable(name, path, table);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import com.intuit.karate.KarateException;
import com.intuit.karate.ScenarioActions;
import com.intuit.karate.StringUtils;
import cucumber.api.java.en.When;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.ArrayList;
Expand Down Expand Up @@ -209,6 +210,13 @@ public String toString() {
String keyword = method.getName().equalsIgnoreCase("eval") ? "eval" : methodPattern.keyword;
Collection<Method> keywordMethods = KEYWORDS_METHODS.computeIfAbsent(keyword, k -> new HashSet<>());
keywordMethods.add(methodPattern.method);
} else {
Action action = method.getDeclaredAnnotation(Action.class);
if (action != null) {
String regex = action.value();
MethodPattern methodPattern = new MethodPattern(method, regex);
overwrite.add(methodPattern);
}
}
}
for (MethodPattern mp : overwrite) {
Expand Down
18 changes: 18 additions & 0 deletions karate-core/src/main/java/cucumber/api/DataTable.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package cucumber.api;

import java.util.Collections;
import java.util.List;
import java.util.Map;

/**
* replaces cucumber-jvm code
*
* @author pthomas3
*/
public class DataTable {

public List<Map<String, String>> asMaps(Class<String> keyType, Class<String> valType) {
return Collections.EMPTY_LIST;
}

}
15 changes: 15 additions & 0 deletions karate-core/src/main/java/cucumber/api/cli/Main.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package cucumber.api.cli;

/**
* replaces cucumber-jvm code
*
* @author pthomas3
*/
public class Main {

public static void main(String[] args) {
com.intuit.karate.cli.IdeMain.main(args);
System.exit(0);
}

}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.intuit.karate.core;
package cucumber.api.java.en;

import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.intuit.karate.core;

import cucumber.api.java.en.When;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
Expand All @@ -11,7 +12,6 @@
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.time.LocalDate;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
Expand Down