Timeout is a long, not int. Be explicit that it's millis.

History.md

@@ -1,5 +1,7 @@
 ## [1-1-5-SNAPSHOT (Git master)](https://github.com/cucumber/cucumber-jvm/compare/v1.1.4...master)
 
+* [Core] Step Definition and Hook timeout is now a `long` instead of an `int`. (Aslak Hellesøy)
+* [Rhino] Before and After hooks support ([#587](https://github.com/cucumber/cucumber-jvm/pull/587) Rui Figueira)
 * [Android] Separate CI job for Android. ([#581](https://github.com/cucumber/cucumber-jvm/issues/581), [#584](https://github.com/cucumber/cucumber-jvm/pull/584) Björn Rasmusson)
 * [Android] Add support for Dependency Injection via cucumber-picocontainer, cucumber-guice, cucumber-spring etx. (Aslak Hellesøy)
 * [TestNG] Java Calculator TestNG example project ([#579](https://github.com/cucumber/cucumber-jvm/pull/579) Dmytro Chyzhykov)

core/src/main/java/cucumber/runtime/Timeout.java

@@ -7,7 +7,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 public class Timeout {
-    public static <T> T timeout(Callback<T> callback, int timeoutMillis) throws Throwable {
+    public static <T> T timeout(Callback<T> callback, long timeoutMillis) throws Throwable {
         if (timeoutMillis == 0) {
             return callback.call();
         } else {

core/src/main/java/cucumber/runtime/Utils.java

@@ -27,7 +27,7 @@ public static boolean isInstantiable(Class<?> clazz) {
         return Modifier.isPublic(clazz.getModifiers()) && !Modifier.isAbstract(clazz.getModifiers()) && !isNonStaticInnerClass;
     }
 
-    public static Object invoke(final Object target, final Method method, int timeoutMillis, final Object... args) throws Throwable {
+    public static Object invoke(final Object target, final Method method, long timeoutMillis, final Object... args) throws Throwable {
         return Timeout.timeout(new Timeout.Callback<Object>() {
             @Override
             public Object call() throws Throwable {

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 ${java.text.Normalizer.normalize(kw, java.text.Normalizer.Form.NFD)}(Pattern regexp, long timeoutMillis, Closure body) throws Throwable {
         GroovyBackend.instance.addStepDefinition(regexp, timeoutMillis, body);
     }
 <% } %>

groovy/src/main/java/cucumber/runtime/groovy/GroovyBackend.java

@@ -123,7 +123,7 @@ public String getSnippet(Step step, FunctionNameSanitizer functionNameSanitizer)
         return snippetGenerator.getSnippet(step, null);
     }
 
-    public void addStepDefinition(Pattern regexp, int timeoutMillis, Closure body) {
+    public void addStepDefinition(Pattern regexp, long timeoutMillis, Closure body) {
         glue.addStepDefinition(new GroovyStepDefinition(regexp, timeoutMillis, body, currentLocation(), instance));
     }
 
@@ -132,11 +132,11 @@ public void registerWorld(Closure closure) {
         worldClosure = closure;
     }
 
-    public void addBeforeHook(TagExpression tagExpression, int timeoutMillis, Closure body) {
+    public void addBeforeHook(TagExpression tagExpression, long timeoutMillis, Closure body) {
         glue.addBeforeHook(new GroovyHookDefinition(tagExpression, timeoutMillis, body, currentLocation(), instance));
     }
 
-    public void addAfterHook(TagExpression tagExpression, int timeoutMillis, Closure body) {
+    public void addAfterHook(TagExpression tagExpression, long timeoutMillis, Closure body) {
         glue.addAfterHook(new GroovyHookDefinition(tagExpression, timeoutMillis, body, currentLocation(), instance));
     }
 

groovy/src/main/java/cucumber/runtime/groovy/GroovyHookDefinition.java

@@ -11,12 +11,12 @@
 
 public class GroovyHookDefinition implements HookDefinition {
     private final TagExpression tagExpression;
-    private final int timeoutMillis;
+    private final long timeoutMillis;
     private final Closure body;
     private final GroovyBackend backend;
     private final StackTraceElement location;
 
-    public GroovyHookDefinition(TagExpression tagExpression, int timeoutMillis, Closure body, StackTraceElement location, GroovyBackend backend) {
+    public GroovyHookDefinition(TagExpression tagExpression, long timeoutMillis, Closure body, StackTraceElement location, GroovyBackend backend) {
         this.tagExpression = tagExpression;
         this.timeoutMillis = timeoutMillis;
         this.body = body;

groovy/src/main/java/cucumber/runtime/groovy/GroovyStepDefinition.java

@@ -17,13 +17,13 @@
 public class GroovyStepDefinition implements StepDefinition {
     private final Pattern pattern;
     private final JdkPatternArgumentMatcher argumentMatcher;
-    private final int timeoutMillis;
+    private final long timeoutMillis;
     private final Closure body;
     private final StackTraceElement location;
     private final GroovyBackend backend;
     private List<ParameterInfo> parameterInfos;
 
-    public GroovyStepDefinition(Pattern pattern, int timeoutMillis, Closure body, StackTraceElement location, GroovyBackend backend) {
+    public GroovyStepDefinition(Pattern pattern, long timeoutMillis, Closure body, StackTraceElement location, GroovyBackend backend) {
         this.pattern = pattern;
         this.timeoutMillis = timeoutMillis;
         this.backend = backend;

java/src/main/code_generator/I18n.java.txt

@@ -17,8 +17,8 @@ public @interface ${kw} {
     String value();
 
     /**
-     * @return max amount of time this is allowed to run for. 0 (default) means no restriction.
+     * @return max amount of milliseconds this is allowed to run for. 0 (default) means no restriction.
      */
-    int timeout() default 0;
+    long timeout() default 0;
 }
 

java/src/main/java/cucumber/api/java/After.java

@@ -14,9 +14,9 @@
     String[] value() default {};
 
     /**
-     * @return max amount of time this is allowed to run for. 0 (default) means no restriction.
+     * @return max amount of milliseconds this is allowed to run for. 0 (default) means no restriction.
      */
-    int timeout() default 0;
+    long timeout() default 0;
 
     /**
      * The order in which this hook should run. Higher numbers are run first.

java/src/main/java/cucumber/api/java/Before.java

@@ -14,9 +14,9 @@
     String[] value() default {};
 
     /**
-     * @return max amount of time this is allowed to run for. 0 (default) means no restriction.
+     * @return max amount of milliseconds this is allowed to run for. 0 (default) means no restriction.
      */
-    int timeout() default 0;
+    long timeout() default 0;
 
     /**
      * The order in which this hook should run. Lower numbers are run first.

java/src/main/java/cucumber/runtime/java/JavaBackend.java

@@ -109,7 +109,7 @@ public String getSnippet(Step step, FunctionNameSanitizer functionNameSanitizer)
     void addStepDefinition(Annotation annotation, Method method) {
         try {
             objectFactory.addClass(method.getDeclaringClass());
-            glue.addStepDefinition(new JavaStepDefinition(method, pattern(annotation), timeout(annotation), objectFactory));
+            glue.addStepDefinition(new JavaStepDefinition(method, pattern(annotation), timeoutMillis(annotation), objectFactory));
         } catch (DuplicateStepDefinitionException e) {
             throw e;
         } catch (Throwable e) {
@@ -123,21 +123,21 @@ private Pattern pattern(Annotation annotation) throws Throwable {
         return Pattern.compile(regexpString);
     }
 
-    private int timeout(Annotation annotation) throws Throwable {
+    private long timeoutMillis(Annotation annotation) throws Throwable {
         Method regexpMethod = annotation.getClass().getMethod("timeout");
-        return (Integer) Utils.invoke(annotation, regexpMethod, 0);
+        return (Long) Utils.invoke(annotation, regexpMethod, 0);
     }
 
     void addHook(Annotation annotation, Method method) {
         objectFactory.addClass(method.getDeclaringClass());
 
         if (annotation.annotationType().equals(Before.class)) {
             String[] tagExpressions = ((Before) annotation).value();
-            int timeout = ((Before) annotation).timeout();
+            long timeout = ((Before) annotation).timeout();
             glue.addBeforeHook(new JavaHookDefinition(method, tagExpressions, ((Before) annotation).order(), timeout, objectFactory));
         } else {
             String[] tagExpressions = ((After) annotation).value();
-            int timeout = ((After) annotation).timeout();
+            long timeout = ((After) annotation).timeout();
             glue.addAfterHook(new JavaHookDefinition(method, tagExpressions, ((After) annotation).order(), timeout, objectFactory));
         }
     }

java/src/main/java/cucumber/runtime/java/JavaHookDefinition.java

@@ -16,14 +16,14 @@
 class JavaHookDefinition implements HookDefinition {
 
     private final Method method;
-    private final int timeout;
+    private final long timeoutMillis;
     private final TagExpression tagExpression;
     private final int order;
     private final ObjectFactory objectFactory;
 
-    public JavaHookDefinition(Method method, String[] tagExpressions, int order, int timeout, ObjectFactory objectFactory) {
+    public JavaHookDefinition(Method method, String[] tagExpressions, int order, long timeoutMillis, ObjectFactory objectFactory) {
         this.method = method;
-        this.timeout = timeout;
+        this.timeoutMillis = timeoutMillis;
         tagExpression = new TagExpression(asList(tagExpressions));
         this.order = order;
         this.objectFactory = objectFactory;
@@ -56,7 +56,7 @@ public void execute(Scenario scenario) throws Throwable {
                 throw new CucumberException("Hooks must declare 0 or 1 arguments. " + method.toString());
         }
 
-        Utils.invoke(objectFactory.getInstance(method.getDeclaringClass()), method, timeout, args);
+        Utils.invoke(objectFactory.getInstance(method.getDeclaringClass()), method, timeoutMillis, args);
     }
 
     @Override

java/src/main/java/cucumber/runtime/java/JavaStepDefinition.java

@@ -17,17 +17,17 @@
 class JavaStepDefinition implements StepDefinition {
     private final Method method;
     private final Pattern pattern;
-    private final int timeout;
+    private final long timeout;
     private final JdkPatternArgumentMatcher argumentMatcher;
     private final ObjectFactory objectFactory;
     private List<ParameterInfo> parameterInfos;
 
-    public JavaStepDefinition(Method method, Pattern pattern, int timeout, ObjectFactory objectFactory) {
+    public JavaStepDefinition(Method method, Pattern pattern, long timeoutMillis, ObjectFactory objectFactory) {
         this.method = method;
         this.parameterInfos = ParameterInfo.fromMethod(method);
         this.pattern = pattern;
         this.argumentMatcher = new JdkPatternArgumentMatcher(pattern);
-        this.timeout = timeout;
+        this.timeout = timeoutMillis;
         this.objectFactory = objectFactory;
     }
 

rhino/src/main/java/cucumber/runtime/rhino/RhinoBackend.java

@@ -96,15 +96,15 @@ public void addStepDefinition(Global jsStepDefinition, NativeRegExp regexp, Nati
         glue.addStepDefinition(stepDefinition);
     }
 
-    public void addBeforeHook(Function fn, String[] tags, int order, int timeout) {
+    public void addBeforeHook(Function fn, String[] tags, int order, long timeoutMillis) {
         StackTraceElement stepDefLocation = jsLocation();
-        RhinoHookDefinition hookDefinition = new RhinoHookDefinition(cx, scope, fn, tags, order, timeout, stepDefLocation);
+        RhinoHookDefinition hookDefinition = new RhinoHookDefinition(cx, scope, fn, tags, order, timeoutMillis, stepDefLocation);
         glue.addBeforeHook(hookDefinition);
     }
 
-    public void addAfterHook(Function fn, String[] tags, int order, int timeout) {
+    public void addAfterHook(Function fn, String[] tags, int order, long timeoutMillis) {
         StackTraceElement stepDefLocation = jsLocation();
-        RhinoHookDefinition hookDefinition = new RhinoHookDefinition(cx, scope, fn, tags, order, timeout, stepDefLocation);
+        RhinoHookDefinition hookDefinition = new RhinoHookDefinition(cx, scope, fn, tags, order, timeoutMillis, stepDefLocation);
         glue.addAfterHook(hookDefinition);
     }
 }

rhino/src/main/java/cucumber/runtime/rhino/RhinoHookDefinition.java

@@ -21,16 +21,16 @@ public class RhinoHookDefinition implements HookDefinition {
     private Function fn;
     private final TagExpression tagExpression;
     private final int order;
-    private final int timeoutMillis;
+    private final long timeoutMillis;
     private StackTraceElement location;
 
-    public RhinoHookDefinition(Context cx, Scriptable scope, Function fn, String[] tagExpressions, int order, int timeout, StackTraceElement location) {
+    public RhinoHookDefinition(Context cx, Scriptable scope, Function fn, String[] tagExpressions, int order, long timeoutMillis, StackTraceElement location) {
         this.cx = cx;
         this.scope = scope;
         this.fn = fn;
         tagExpression = new TagExpression(asList(tagExpressions));
         this.order = order;
-        this.timeoutMillis = timeout;
+        this.timeoutMillis = timeoutMillis;
         this.location = location;
     }
 
@@ -64,7 +64,7 @@ TagExpression getTagExpression() {
         return tagExpression;
     }
 
-    int getTimeout() {
+    long getTimeout() {
         return timeoutMillis;
     }
 

rhino/src/test/java/cucumber/runtime/rhino/RhinoHooksTest.java

@@ -88,12 +88,12 @@ public void shouldFailWithTimeout() throws Throwable {
         fail(InterruptedException.class.getSimpleName() + " expected");
     }
 
-    private void assertHooks(HookDefinition beforeHook, HookDefinition afterHook, String[] tags, int order, int timeout) {
-        assertHook(beforeHook, tags, order, timeout);
-        assertHook(afterHook, tags, order, timeout);
+    private void assertHooks(HookDefinition beforeHook, HookDefinition afterHook, String[] tags, int order, long timeoutMillis) {
+        assertHook(beforeHook, tags, order, timeoutMillis);
+        assertHook(afterHook, tags, order, timeoutMillis);
     }
 
-    private void assertHook(HookDefinition hookDefinition, String[] tagExprs, int order, int timeout) {
+    private void assertHook(HookDefinition hookDefinition, String[] tagExprs, int order, long timeoutMillis) {
         assertThat(hookDefinition, instanceOf(RhinoHookDefinition.class));
 
         RhinoHookDefinition rhinoHook = (RhinoHookDefinition) hookDefinition;
@@ -106,7 +106,7 @@ private void assertHook(HookDefinition hookDefinition, String[] tagExprs, int or
 
         assertTrue(rhinoHook.getTagExpression().evaluate(tags));
         assertThat(rhinoHook.getOrder(), equalTo(order));
-        assertThat(rhinoHook.getTimeout(), equalTo(timeout));
+        assertThat(rhinoHook.getTimeout(), equalTo(timeoutMillis));
     }
 
 }