Groovy-Cucumber: support multiple World's: post review fix

Author: Luxor

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

@@ -1,6 +1,10 @@
 package cucumber.runtime.groovy;
 
-import cucumber.runtime.*;
+import cucumber.runtime.Backend;
+import cucumber.runtime.ClassFinder;
+import cucumber.runtime.CucumberException;
+import cucumber.runtime.Glue;
+import cucumber.runtime.UnreportedStepExecutor;
 import cucumber.runtime.io.Resource;
 import cucumber.runtime.io.ResourceLoader;
 import cucumber.runtime.io.ResourceLoaderClassFinder;
@@ -18,7 +22,11 @@
 
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.util.*;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
 import java.util.regex.Pattern;
 
 import static cucumber.runtime.io.MultiLoader.packageName;
@@ -150,6 +158,10 @@ public void invoke(Closure body, Object[] args) throws Throwable {
         }
     }
 
+    GroovyWorld getGroovyWorld() {
+        return world;
+    }
+
     private static StackTraceElement currentLocation() {
         Throwable t = new Throwable();
         StackTraceElement[] stackTraceElements = t.getStackTrace();

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

@@ -1,6 +1,10 @@
 package cucumber.runtime.groovy;
 
-import groovy.lang.*;
+import groovy.lang.GroovyObject;
+import groovy.lang.GroovyObjectSupport;
+import groovy.lang.MissingMethodException;
+import groovy.lang.MissingPropertyException;
+import groovy.lang.Tuple;
 import org.codehaus.groovy.runtime.MetaClassHelper;
 
 import java.util.LinkedList;
@@ -34,6 +38,10 @@ public Object invokeMethod(String name, Object args) {
         return findWorldWithMethod(name, args).invokeMethod(name, args);
     }
 
+    int worldsCount() {
+        return worlds.size();
+    }
+
     private GroovyObject findWorldWithProperty(String property) {
         if (worlds.isEmpty()) {
             throw new MissingPropertyException(property, GroovyWorld.class);

groovy/src/test/groovy/cucumber/runtime/groovy/GroovyBackendTest.groovy

@@ -0,0 +1,6 @@
+package cucumber.runtime.groovy
+
+class WorldWithPropertyAndMethod {
+    def aProperty
+    void aMethod(List<Integer> args) {}
+}

groovy/src/test/groovy/cucumber/runtime/groovy/GroovyWorldTest.groovy

@@ -0,0 +1,58 @@
+package cucumber.runtime.groovy;
+
+import cucumber.runtime.io.ResourceLoader;
+import org.codehaus.groovy.runtime.MethodClosure;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertNull;
+
+@RunWith(MockitoJUnitRunner.class)
+public class GroovyBackendTest {
+    @Mock
+    ResourceLoader resourceLoader;
+
+    GroovyBackend backend;
+
+    @Before
+    public void setUp() throws Exception {
+        backend = new GroovyBackend(resourceLoader);
+    }
+
+    @Test
+    public void should_build_world_by_calling_the_closure() {
+        backend.registerWorld(new MethodClosure(this, "worldClosureCall"));
+        backend.buildWorld();
+
+        GroovyWorld groovyWorld = backend.getGroovyWorld();
+        assertEquals(1, groovyWorld.worldsCount());
+    }
+
+    @Test
+    public void should_build_world_object_even_if_closure_world_was_not_added() {
+        assertNull(backend.getGroovyWorld());
+
+        backend.buildWorld();
+
+        assertEquals(0, backend.getGroovyWorld().worldsCount());
+    }
+
+    @Test
+    public void should_clean_up_worlds_after_dispose() {
+        backend.registerWorld(new MethodClosure(this, "worldClosureCall"));
+        backend.buildWorld();
+
+        backend.disposeWorld();
+
+        assertNull(backend.getGroovyWorld());
+    }
+
+    @SuppressWarnings("UnusedDeclaration")
+    private AnotherCustomWorld worldClosureCall() {
+        return new AnotherCustomWorld();
+    }
+}

groovy/src/test/groovy/cucumber/runtime/groovy/WorldWithPropertyAndMethod.groovy

@@ -0,0 +1,58 @@
+package cucumber.runtime.groovy;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+
+public class GroovyWorldTest  {
+    GroovyWorld world;
+
+    @Before
+    public void setUp() {
+       world = new GroovyWorld();
+    }
+
+    @Test(expected = RuntimeException.class)
+    public void should_not_register_pure_java_object() {
+        world.registerWorld("JAVA");
+    }
+
+    @Test
+    public void should_support_more_then_one_World() {
+        world.registerWorld(new CustomWorld());
+        world.registerWorld(new AnotherCustomWorld());
+
+        world.setProperty("lastAte", "groovy");
+        assertEquals("groovy", world.getProperty("lastAte"));
+
+        world.setProperty("aProperty", 1);
+        assertEquals(1, world.getProperty("aProperty"));
+
+        List<Integer> intArgs = Arrays.asList(1,2);
+        world.invokeMethod("aMethod", intArgs);
+        assertEquals(intArgs, world.getProperty("methodArgs"));
+
+        world.invokeMethod("aMethod", null);
+        assertEquals("no args", world.getProperty("methodArgs"));
+    }
+
+    @Test(expected = RuntimeException.class)
+    public void should_detect_double_property_definition() {
+        world.registerWorld(new WorldWithPropertyAndMethod());
+        world.registerWorld(new AnotherCustomWorld());
+
+        world.getProperty("aProperty");
+    }
+
+    @Test(expected = RuntimeException.class)
+    public void should_detect_double_method_definition() {
+        world.registerWorld(new WorldWithPropertyAndMethod());
+        world.registerWorld(new AnotherCustomWorld());
+
+        world.invokeMethod("aMethod", new Integer[]{1,2});
+    }
+}

groovy/src/test/java/cucumber/runtime/groovy/GroovyBackendTest.java

@@ -15,13 +15,6 @@ public class ParallelTest {
     @Mock
     Closure closure;
 
-    @Test(expected = RuntimeException.class)
-    public void exception_throw_when_world_already_set_on_same_thread() {
-        GroovyBackend groovyBackend = new GroovyBackend(resourceLoader);
-        groovyBackend.registerWorld(closure);
-        groovyBackend.registerWorld(closure);
-    }
-
     @Test
     public void can_have_a_new_backend_on_a_different_thread() {
         new GroovyBackend(resourceLoader);