Execute no scenarios when the rerun file is empty. Fixes #840.

Author: brasmusson

History.md

@@ -1,6 +1,7 @@
 ## [1.2.3-SNAPSHOT](https://github.com/cucumber/cucumber-jvm/compare/v1.2.2...master) (In Git)
 
-* Snippets for quoted arguments changed from `(.*?)` to `([^\"]*)` (which is how it was before 1.1.6). See [cucumber/cucumber#63](https://github.com/cucumber/cucumber/pull/663) (Aslak Hellesøy)
+* Execute no scenarios when the rerun file is empty ([#840](https://github.com/cucumber/cucumber-jvm/issues/840) Björn Rasmusson)
+* Snippets for quoted arguments changed from `(.*?)` to `([^\"]*)` (which is how it was before 1.1.6). See [cucumber/cucumber#663](https://github.com/cucumber/cucumber/pull/663) (Aslak Hellesøy)
 * Fix non running gradle example ([#839](https://github.com/cucumber/cucumber-jvm/pull/839) Ole Christian Langfjæran)
 
 ## [1.2.2](https://github.com/cucumber/cucumber-jvm/compare/v1.2.0...v1.2.2) (2015-01-13)

core/src/main/java/cucumber/runtime/model/CucumberFeature.java

@@ -62,8 +62,10 @@ private static void loadFromRerunFile(FeatureBuilder builder, ResourceLoader res
         Iterable<Resource> resources = resourceLoader.resources(rerunPath, null);
         for (Resource resource : resources) {
             String source = builder.read(resource);
-            for (String featurePath : source.split(" ")) {
-                loadFromFileSystemOrClasspath(builder, resourceLoader, featurePath, filters);
+            if (!source.isEmpty()) {
+                for (String featurePath : source.split(" ")) {
+                    loadFromFileSystemOrClasspath(builder, resourceLoader, featurePath, filters);
+                }
             }
         }
     }

core/src/test/java/cucumber/runtime/model/CucumberFeatureTest.java

@@ -18,6 +18,7 @@
 import static java.util.Collections.emptyList;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
+import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -116,6 +117,26 @@ public void loads_features_specified_in_rerun_file() throws Exception {
         assertEquals("Scenario: scenario 2", features.get(1).getFeatureElements().get(0).getVisualName());
     }
 
+    @Test
+    public void loads_no_features_when_rerun_file_is_empty() throws Exception {
+        String feature = "" +
+                "Feature: bar\n" +
+                "  Scenario: scenario bar\n" +
+                "    * step\n";
+        String rerunPath = "path/rerun.txt";
+        String rerunFile = "";
+        ResourceLoader resourceLoader = mockFeatureFileResourceForAnyFeaturePath(feature);
+        mockFileResource(resourceLoader, rerunPath, null, rerunFile);
+
+        List<CucumberFeature> features = CucumberFeature.load(
+                resourceLoader,
+                asList("@" + rerunPath),
+                new ArrayList<Object>(),
+                new PrintStream(new ByteArrayOutputStream()));
+
+        assertEquals(0, features.size());
+    }
+
     @Test
     public void loads_features_specified_in_rerun_file_from_classpath_when_not_in_file_system() throws Exception {
         String featurePath = "path/bar.feature";
@@ -214,6 +235,16 @@ private ResourceLoader mockFeatureFileResource(String featurePath, String featur
         return resourceLoader;
     }
 
+    private ResourceLoader mockFeatureFileResourceForAnyFeaturePath(String feature)
+            throws IOException, UnsupportedEncodingException {
+        ResourceLoader resourceLoader = mock(ResourceLoader.class);
+        Resource resource = mock(Resource.class);
+        when(resource.getPath()).thenReturn("");
+        when(resource.getInputStream()).thenReturn(new ByteArrayInputStream(feature.getBytes("UTF-8")));
+        when(resourceLoader.resources(anyString(), anyString())).thenReturn(asList(resource));
+        return resourceLoader;
+    }
+
     private void mockFeatureFileResource(ResourceLoader resourceLoader, String featurePath, String feature)
             throws IOException, UnsupportedEncodingException {
         mockFileResource(resourceLoader, featurePath, ".feature", feature);