Fix duplicated step definitions from the same step locations

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

@@ -43,10 +43,18 @@ public RuntimeGlue(UndefinedStepsTracker tracker, LocalizedXStreams localizedXSt
     @Override
     public void addStepDefinition(StepDefinition stepDefinition) {
         StepDefinition previous = stepDefinitionsByPattern.get(stepDefinition.getPattern());
-        if (previous != null) {
+        if (previous == null) {
+            stepDefinitionsByPattern.put(stepDefinition.getPattern(), stepDefinition);
+        } else if (!haveSameLocation(previous, stepDefinition)) {
             throw new DuplicateStepDefinitionException(previous, stepDefinition);
         }
-        stepDefinitionsByPattern.put(stepDefinition.getPattern(), stepDefinition);
+    }
+
+    private boolean haveSameLocation(StepDefinition previous, StepDefinition current) {
+        String previousLocation = previous.getLocation(true);
+        String currentLocation = current.getLocation(true);
+
+        return previousLocation.equals(currentLocation);
     }
 
     @Override

core/src/test/java/cucumber/runtime/RuntimeGlueTest.java

@@ -1,6 +1,7 @@
 package cucumber.runtime;
 
 import cucumber.runtime.xstream.LocalizedXStreams;
+import org.junit.Before;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
@@ -9,18 +10,21 @@
 import static org.mockito.Mockito.when;
 
 public class RuntimeGlueTest {
+
+    private RuntimeGlue glue;
+
+    @Before
+    public void setUpGlue() throws Exception {
+        glue = new RuntimeGlue(new UndefinedStepsTracker(),
+                new LocalizedXStreams(Thread.currentThread().getContextClassLoader()));
+    }
+
     @Test
     public void throws_duplicate_error_on_dupe_stepdefs() {
-        RuntimeGlue glue = new RuntimeGlue(new UndefinedStepsTracker(), new LocalizedXStreams(Thread.currentThread().getContextClassLoader()));
-
-        StepDefinition a = mock(StepDefinition.class);
-        when(a.getPattern()).thenReturn("hello");
-        when(a.getLocation(true)).thenReturn("foo.bf:10");
+        StepDefinition a = mockStepDefinition("hello", "foo.bf:10");
         glue.addStepDefinition(a);
 
-        StepDefinition b = mock(StepDefinition.class);
-        when(b.getPattern()).thenReturn("hello");
-        when(b.getLocation(true)).thenReturn("bar.bf:90");
+        StepDefinition b = mockStepDefinition("hello", "bar.bf:90");
         try {
             glue.addStepDefinition(b);
             fail("should have failed");
@@ -29,4 +33,23 @@ public void throws_duplicate_error_on_dupe_stepdefs() {
         }
     }
 
+    @Test
+    public void does_not_throw_duplicate_error_on_dupe_stepdefs_with_identical_locations() {
+        StepDefinition a = mockStepDefinition("hello", "foo.bf:10");
+        glue.addStepDefinition(a);
+
+        StepDefinition b = mockStepDefinition("hello", "foo.bf:10");
+        glue.addStepDefinition(b);
+
+        // It would be great to write an assertion here to match
+        // the exact count of step definition added in the glue
+    }
+
+    private StepDefinition mockStepDefinition(String pattern, String location) {
+        StepDefinition stepDefinition = mock(StepDefinition.class);
+        when(stepDefinition.getPattern()).thenReturn(pattern);
+        when(stepDefinition.getLocation(true)).thenReturn(location);
+        return stepDefinition;
+    }
+
 }

testng/src/main/java/cucumber/api/testng/TestNGCucumberRunner.java

@@ -9,9 +9,6 @@
 import cucumber.runtime.io.ResourceLoader;
 import cucumber.runtime.io.ResourceLoaderClassFinder;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
 
 /**
  * Glue code for running Cucumber via TestNG.
@@ -32,11 +29,6 @@ public TestNGCucumberRunner(Class clazz) {
         RuntimeOptionsFactory runtimeOptionsFactory = new RuntimeOptionsFactory(clazz, new Class[]{CucumberOptions.class});
         RuntimeOptions runtimeOptions = runtimeOptionsFactory.create();
 
-        // remove duplicates from glue path.
-        List<String> uniqueGlue = new ArrayList<String>(new HashSet<String>(runtimeOptions.getGlue()));
-        runtimeOptions.getGlue().clear();
-        runtimeOptions.getGlue().addAll(uniqueGlue);
-
         TestNgReporter reporter = new TestNgReporter(System.out);
         runtimeOptions.getFormatters().add(reporter);
         ClassFinder classFinder = new ResourceLoaderClassFinder(resourceLoader, classLoader);