Proposed solution to #487

cucumber · Apr 7, 2013 · 840601a · 840601a
1 parent 298686d
commit 840601a
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 47 deletions.
diff --git a/groovy/src/main/code_generator/I18n.groovy.txt b/groovy/src/main/code_generator/I18n.groovy.txt
@@ -11,7 +11,7 @@ public class ${i18n.underscoredIsoCode.toUpperCase()} {
         GroovyBackend.instance.addStepDefinition(regexp, 0, body);
     }
 
-    public static void ${java.text.Normalizer.normalize(kw, java.text.Normalizer.Form.NFD)}(Pattern regexp, int timeoutMillis, Closure body) throws Throwable {
+    public static void ${kw}(Pattern regexp, int timeoutMillis, Closure body) throws Throwable {
         GroovyBackend.instance.addStepDefinition(regexp, timeoutMillis, body);
     }
 <% } %>

diff --git a/java/pom.xml b/java/pom.xml
@@ -73,39 +73,12 @@ import gherkin.I18n
 def engine = new SimpleTemplateEngine()
 def templateSource = new File(project.baseDir, "src${File.separator}main${File.separator}code_generator${File.separator}I18n.java.txt").getText()
 
-def normalize(s) {
-  if(System.getProperty("java.version").startsWith("1.6")) {
-    return s
-  } else {
-    return java.text.Normalizer.normalize(s, java.text.Normalizer.Form.NFD)
-  }
-}
-
-
-// TODO: Need to add i18n.getName() and i18n.getNative() for better names.
-def package_html = """\
-<body>
-<p>
-    \${i18n.getLocale().getDisplayLanguage()}
-</p>
-</body>
-"""
-
 I18n.all.each { i18n ->
-    i18n.codeKeywords.each { kw ->
-        def normalized_kw = normalize(kw)
-        def binding = ["i18n":i18n, "kw":normalized_kw]
-        template = engine.createTemplate(templateSource).make(binding)
-        def file = new File(project.baseDir, "target${File.separator}generated-sources${File.separator}i18n${File.separator}java${File.separator}cucumber${File.separator}api${File.separator}java${File.separator}${i18n.underscoredIsoCode}${File.separator}${normalized_kw}.java")
-        file.parentFile.mkdirs()
-        file.write(template.toString(), "UTF-8")
-    }
-
-    // html
     def binding = ["i18n":i18n]
-    def html = engine.createTemplate(package_html).make(binding).toString()
-    def file = new File(project.baseDir, "target${File.separator}generated-sources${File.separator}i18n${File.separator}java${File.separator}cucumber${File.separator}api${File.separator}java${File.separator}${i18n.underscoredIsoCode}${File.separator}package.html")
-    file.write(html, "UTF-8")
+    template = engine.createTemplate(templateSource).make(binding)
+    def file = new File(project.baseDir, "target${File.separator}generated-sources${File.separator}i18n${File.separator}java${File.separator}cucumber${File.separator}api${File.separator}java${File.separator}${i18n.underscoredIsoCode}.java")
+    file.parentFile.mkdirs()
+    file.write(template.toString(), "UTF-8")
 }
 
         ]]></groovy>

diff --git a/java/src/main/code_generator/I18n.java.txt b/java/src/main/code_generator/I18n.java.txt
@@ -1,4 +1,4 @@
-package cucumber.api.java.${i18n.underscoredIsoCode};
+package cucumber.api.java;
 
 import cucumber.runtime.java.StepDefAnnotation;
 
@@ -7,18 +7,26 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-@StepDefAnnotation
-public @interface ${kw} {
-    /**
-     * @return a regular expression
-     */
-    String value();
+/**
+ * ${i18n.getLocale().getDisplayLanguage()}
+ */
+public class ${i18n.underscoredIsoCode} {
+    private ${i18n.underscoredIsoCode} {}
 
-    /**
-     * @return max amount of time this is allowed to run for. 0 (default) means no restriction.
-     */
-    int timeout() default 0;
-}
+<% i18n.codeKeywords.each { kw -> %>
+    @Retention(RetentionPolicy.RUNTIME)
+    @Target(ElementType.METHOD)
+    @StepDefAnnotation
+    public @interface ${kw} {
+        /**
+         * @return a regular expression
+         */
+        String value();
 
+        /**
+         * @return max amount of time this is allowed to run for. 0 (default) means no restriction.
+         */
+        int timeout() default 0;
+    }
+<% } %>
+}
diff --git a/java/src/test/java/cucumber/runtime/java/stepdefs/Stepdefs.java b/java/src/test/java/cucumber/runtime/java/stepdefs/Stepdefs.java
@@ -1,10 +1,16 @@
 package cucumber.runtime.java.stepdefs;
 
 import cucumber.api.java.en.Given;
+import cucumber.api.java.sv.Så;
 
 public class Stepdefs {
     @Given("test")
     public void test() {
 
     }
+
+    @Så("test")
+    public void testEncoding() {
+
+    }
 }
diff --git a/jruby/pom.xml b/jruby/pom.xml
@@ -99,7 +99,7 @@ module Cucumber
     module JRuby
       module Dsl
 <% i18n.codeKeywords.each { kw -> %>
-        def \${java.text.Normalizer.normalize(kw, java.text.Normalizer.Form.NFD)}(regexp, &proc)
+        def \${kw}(regexp, &proc)
           register_stepdef(regexp, proc)
         end
 <% } %>