Skip to content

Commit 3396c83

Browse files
aslakhellesoyaslakhellesoy
committed
Removed byte order mark and fixed bad formatting. Closes #224 
1 parent d6f0716 commit 3396c83

File tree

3 files changed

+114
-113
lines changed

3 files changed

+114
-113
lines changed

‎History.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
* [JUnit] Improved JUnit runner. ([#107](https://github.com/cucumber/cucumber-jvm/issues/107), [#211](https://github.com/cucumber/cucumber-jvm/issues/211), [#216](https://github.com/cucumber/cucumber-jvm/pull/216) Giso Deutschmann)
44
* [Core] Stacktrace filtering filters away too much. ([#228](https://github.com/cucumber/cucumber-jvm/issues/228) Aslak Hellesøy)
5-
* [Groovy] ([#212](https://github.com/cucumber/cucumber-jvm/issues/212) Martin Hauner)
5+
* [Groovy] Fix native Groovy cucumber CLI ([#212](https://github.com/cucumber/cucumber-jvm/issues/212) Martin Hauner)
6+
* [Core] Indeterministic feature ordering on Unix ([#224](https://github.com/cucumber/cucumber-jvm/issues/224) hutchy2570)
67

78
## [1.0.0.RC16](https://github.com/cucumber/cucumber-jvm/compare/v1.0.0.RC15...v1.0.0.RC16)
89

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package cucumber.runtime.model;
1+
package cucumber.runtime.model;
22

33
import cucumber.io.Resource;
44
import cucumber.io.ResourceLoader;
@@ -13,9 +13,9 @@
1313
import gherkin.formatter.model.Step;
1414

1515
import java.util.ArrayList;
16-
import java.util.List;
1716
import java.util.Collections;
1817
import java.util.Comparator;
18+
import java.util.List;
1919

2020
public class CucumberFeature {
2121
private final String uri;
@@ -26,7 +26,7 @@ public class CucumberFeature {
2626
private I18n i18n;
2727
private CucumberScenarioOutline currentScenarioOutline;
2828

29-
public static List<CucumberFeature> load(ResourceLoader resourceLoader, List<String> featurePaths, final List <Object> filters) {
29+
public static List<CucumberFeature> load(ResourceLoader resourceLoader, List<String> featurePaths, final List<Object> filters) {
3030
final List<CucumberFeature> cucumberFeatures = new ArrayList<CucumberFeature>();
3131
final FeatureBuilder builder = new FeatureBuilder(cucumberFeatures);
3232
for (String featurePath : featurePaths) {
@@ -38,7 +38,7 @@ public static List<CucumberFeature> load(ResourceLoader resourceLoader, List<Str
3838
if (cucumberFeatures.isEmpty()) {
3939
throw new CucumberException(String.format("No features found at %s", featurePaths));
4040
}
41-
Collections.sort(cucumberFeatures, new CucumberFeatureUriComparator());
41+
Collections.sort(cucumberFeatures, new CucumberFeatureUriComparator());
4242
return cucumberFeatures;
4343
}
4444

@@ -93,8 +93,8 @@ public I18n getI18n() {
9393
public String getUri() {
9494
return uri;
9595
}
96-
97-
private static class CucumberFeatureUriComparator implements Comparator<CucumberFeature> {
96+
97+
private static class CucumberFeatureUriComparator implements Comparator<CucumberFeature> {
9898
@Override
9999
public int compare(CucumberFeature a, CucumberFeature b) {
100100
return a.getUri().compareTo(b.getUri());

‎picocontainer/src/test/resources/.cucumber/stepdefs.json

+106-106
Original file line numberDiff line numberDiff line change
@@ -1,114 +1,114 @@
11
[
2-
{
3-
"source": "^I add (.*)",
4-
"flags": "",
5-
"steps": []
6-
},
7-
{
8-
"source": "^I have (\\d+) (.*) in my belly$",
9-
"flags": "",
10-
"steps": [
11-
{
12-
"name": "I have 12 cukes in my belly",
13-
"args": [
14-
{
15-
"offset": 7,
16-
"val": "12"
17-
},
18-
{
19-
"offset": 10,
20-
"val": "cukes"
21-
}
22-
]
23-
},
24-
{
25-
"name": "I have 3 cukes in my belly",
26-
"args": [
27-
{
28-
"offset": 7,
29-
"val": "3"
30-
},
31-
{
32-
"offset": 9,
33-
"val": "cukes"
34-
}
35-
]
36-
}
2+
{
3+
"source": "^I add (.*)",
4+
"flags": "",
5+
"steps": []
6+
},
7+
{
8+
"source": "^I have (\\d+) (.*) in my belly$",
9+
"flags": "",
10+
"steps": [
11+
{
12+
"name": "I have 12 cukes in my belly",
13+
"args": [
14+
{
15+
"offset": 7,
16+
"val": "12"
17+
},
18+
{
19+
"offset": 10,
20+
"val": "cukes"
21+
}
3722
]
38-
},
39-
{
40-
"source": "^I have this in my basket:$",
41-
"flags": "",
42-
"steps": [
43-
{
44-
"name": "I have this in my basket:",
45-
"args": []
46-
}
23+
},
24+
{
25+
"name": "I have 3 cukes in my belly",
26+
"args": [
27+
{
28+
"offset": 7,
29+
"val": "3"
30+
},
31+
{
32+
"offset": 9,
33+
"val": "cukes"
34+
}
4735
]
48-
},
49-
{
50-
"source": "^I should be (.*)$",
51-
"flags": "",
52-
"steps": [
53-
{
54-
"name": "I should be \u003cmood\u003e",
55-
"args": [
56-
{
57-
"offset": 12,
58-
"val": "\u003cmood\u003e"
59-
}
60-
]
61-
}
36+
}
37+
]
38+
},
39+
{
40+
"source": "^I have this in my basket:$",
41+
"flags": "",
42+
"steps": [
43+
{
44+
"name": "I have this in my basket:",
45+
"args": []
46+
}
47+
]
48+
},
49+
{
50+
"source": "^I should be (.*)$",
51+
"flags": "",
52+
"steps": [
53+
{
54+
"name": "I should be \u003cmood\u003e",
55+
"args": [
56+
{
57+
"offset": 12,
58+
"val": "\u003cmood\u003e"
59+
}
6260
]
63-
},
64-
{
65-
"source": "^the (.*) contains (.*)",
66-
"flags": "",
67-
"steps": []
68-
},
69-
{
70-
"source": "^the date is (.+)$",
71-
"flags": "",
72-
"steps": [
73-
{
74-
"name": "the date is 2011/10/25",
75-
"args": [
76-
{
77-
"offset": 12,
78-
"val": "2011/10/25"
79-
}
80-
]
81-
}
61+
}
62+
]
63+
},
64+
{
65+
"source": "^the (.*) contains (.*)",
66+
"flags": "",
67+
"steps": []
68+
},
69+
{
70+
"source": "^the date is (.+)$",
71+
"flags": "",
72+
"steps": [
73+
{
74+
"name": "the date is 2011/10/25",
75+
"args": [
76+
{
77+
"offset": 12,
78+
"val": "2011/10/25"
79+
}
8280
]
83-
},
84-
{
85-
"source": "^the date should be (.+)$",
86-
"flags": "",
87-
"steps": [
88-
{
89-
"name": "the date should be Oct 25 2011",
90-
"args": [
91-
{
92-
"offset": 19,
93-
"val": "Oct 25 2011"
94-
}
95-
]
96-
}
81+
}
82+
]
83+
},
84+
{
85+
"source": "^the date should be (.+)$",
86+
"flags": "",
87+
"steps": [
88+
{
89+
"name": "the date should be Oct 25 2011",
90+
"args": [
91+
{
92+
"offset": 19,
93+
"val": "Oct 25 2011"
94+
}
9795
]
98-
},
99-
{
100-
"source": "^there are (\\d+) cukes in my belly",
101-
"flags": "",
102-
"steps": [
103-
{
104-
"name": "there are 3 cukes in my belly",
105-
"args": [
106-
{
107-
"offset": 10,
108-
"val": "3"
109-
}
110-
]
111-
}
96+
}
97+
]
98+
},
99+
{
100+
"source": "^there are (\\d+) cukes in my belly",
101+
"flags": "",
102+
"steps": [
103+
{
104+
"name": "there are 3 cukes in my belly",
105+
"args": [
106+
{
107+
"offset": 10,
108+
"val": "3"
109+
}
112110
]
113-
}
111+
}
112+
]
113+
}
114114
]

0 commit comments

Comments
 (0)