From 999f21ddb973be7183c34b93a24d771ef44d70ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aslak=20Helles=C3=B8y?= Date: Mon, 19 Mar 2012 23:56:24 +0000 Subject: [PATCH 1/2] Update snippets to new syntax. See #267 --- clojure/src/main/clj/cucumber/runtime/clj.clj | 7 +++---- .../test/java/cucumber/runtime/clojure/ClojureSnippet.java | 7 +++---- .../java/cucumber/runtime/clojure/ClojureSnippetTest.java | 7 +++---- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/clojure/src/main/clj/cucumber/runtime/clj.clj b/clojure/src/main/clj/cucumber/runtime/clj.clj index 2fd1ed937a..524f3fcfff 100644 --- a/clojure/src/main/clj/cucumber/runtime/clj.clj +++ b/clojure/src/main/clj/cucumber/runtime/clj.clj @@ -21,10 +21,9 @@ Snippet (template [_] (str - "({0} #\"{1}\"\n" - " (fn [{3}]\n" - " '' {4}\n" - " ))\n")) + "({0} #\"{1}\" [{3}]\n" + " '' {4}\n" + " )\n")) (arguments [_ argumentTypes] (SnippetGenerator/untypedArguments argumentTypes)) (namedGroupStart [_] nil) diff --git a/clojure/src/test/java/cucumber/runtime/clojure/ClojureSnippet.java b/clojure/src/test/java/cucumber/runtime/clojure/ClojureSnippet.java index 76d0b95cc3..9c48bbd1a9 100644 --- a/clojure/src/test/java/cucumber/runtime/clojure/ClojureSnippet.java +++ b/clojure/src/test/java/cucumber/runtime/clojure/ClojureSnippet.java @@ -9,10 +9,9 @@ public class ClojureSnippet implements Snippet { @Override public String template() { - return "({0} #\"{1}\"\n" + - " (fn [{3}]\n" + - " '' {4}\n" + - " ))\n"; + return "({0} #\"{1}\" [{3}]\n" + + " '' {4}\n" + + " )\n"; } @Override diff --git a/clojure/src/test/java/cucumber/runtime/clojure/ClojureSnippetTest.java b/clojure/src/test/java/cucumber/runtime/clojure/ClojureSnippetTest.java index 1a5775ce4e..5cd2c21f9e 100644 --- a/clojure/src/test/java/cucumber/runtime/clojure/ClojureSnippetTest.java +++ b/clojure/src/test/java/cucumber/runtime/clojure/ClojureSnippetTest.java @@ -15,10 +15,9 @@ public void generatesPlainSnippet() { Step step = new Step(Collections.emptyList(), "Given ", "I have 4 cukes in my \"big\" belly", 0, null, null); String snippet = new SnippetGenerator(new ClojureSnippet()).getSnippet(step); String expected = "" + - "(Given #\"^I have (\\d+) cukes in my \"([^\"]*)\" belly$\"\n" + - " (fn [arg1, arg2]\n" + - " ' Express the Regexp above with the code you wish you had\n" + - " ))\n"; + "(Given #\"^I have (\\d+) cukes in my \"([^\"]*)\" belly$\" [arg1, arg2]\n" + + " ' Express the Regexp above with the code you wish you had\n" + + " )\n"; assertEquals(expected, snippet); } } From 0b0b02cdd3148cf5f75757dc95fe1a3851021812 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aslak=20Helles=C3=B8y?= Date: Tue, 20 Mar 2012 00:00:08 +0000 Subject: [PATCH 2/2] Attribution. Closes #244, #267 --- History.md | 1 + 1 file changed, 1 insertion(+) diff --git a/History.md b/History.md index 7277ce1567..88d1911a90 100644 --- a/History.md +++ b/History.md @@ -1,6 +1,7 @@ ## [Git master](https://github.com/cucumber/cucumber-jvm/compare/v1.0.0.RC21...master) * [Core] Fix broken --tags option (and get rid of JCommander for CLI parsing). ([#266](https://github.com/cucumber/cucumber-jvm/issues/266) Aslak Hellesøy) +* [Clojure] Make Clojure DSL syntax cleaner ([#244](https://github.com/cucumber/cucumber-jvm/issues/244) [#267](https://github.com/cucumber/cucumber-jvm/pull/267) rplevy-draker) * [Clojure] Native Clojure backend ([#138](https://github.com/cucumber/cucumber-jvm/pull/138) [#265](https://github.com/cucumber/cucumber-jvm/pull/265) Kevin Downey, Nils Wloka) * [JUnit] Added `format` attribute to `@Cucumber.Options` (Aslak Hellesøy)