Skip to content

Commit 6224f26

Browse files
committed
Workaround line-end issue on build server
1 parent c78b312 commit 6224f26

File tree

1 file changed

+21
-10
lines changed

1 file changed

+21
-10
lines changed

tests/CommandLine.Tests/Unit/Core/TextWrapperTests.cs

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,17 @@ namespace CommandLine.Tests.Unit.Core
77
{
88
public class TextWrapperTests
99
{
10+
private string NormalizeLineBreaks(string str)
11+
{
12+
return str.Replace("\r", "");
13+
}
14+
private void EnsureEquivalent(string a,string b)
15+
{
16+
//workaround build system line-end inconsistencies
17+
NormalizeLineBreaks(a).Should().Be(NormalizeLineBreaks(b));
18+
}
19+
20+
1021
[Fact]
1122
public void IndentWorksCorrectly()
1223
{
@@ -17,7 +28,7 @@ public void IndentWorksCorrectly()
1728
var expected = @" line1
1829
line2";
1930
var wrapper = new TextWrapper(input);
20-
wrapper.Indent(2).ToText().Should().Be(expected);
31+
EnsureEquivalent(wrapper.Indent(2).ToText(),expected);
2132

2233
}
2334

@@ -32,7 +43,7 @@ some text
3243
that needs
3344
wrapping";
3445
var wrapper = new TextWrapper(input);
35-
wrapper.WordWrap(10).ToText().Should().Be(expected);
46+
EnsureEquivalent(wrapper.WordWrap(10).ToText(),expected);
3647

3748
}
3849

@@ -47,7 +58,7 @@ hippopotamus is
4758
some text that
4859
needs wrapping";
4960
var wrapper = new TextWrapper(input);
50-
wrapper.WordWrap(15).ToText().Should().Be(expected);
61+
EnsureEquivalent(wrapper.WordWrap(15).ToText(),expected);
5162

5263
}
5364

@@ -61,7 +72,7 @@ public void WrappingObeysLineBreaksOfAllStyles()
6172
that needs
6273
wrapping";
6374
var wrapper = new TextWrapper(input);
64-
wrapper.WordWrap(20).ToText().Should().Be(expected);
75+
EnsureEquivalent(wrapper.WordWrap(20).ToText(),expected);
6576

6677
}
6778

@@ -81,7 +92,7 @@ part to preserve
8192
and this part to not
8293
be indented";
8394
var wrapper = new TextWrapper(input);
84-
wrapper.WordWrap(20).ToText().Should().Be(expected);
95+
EnsureEquivalent(wrapper.WordWrap(20).ToText(),expected);
8596

8697
}
8798

@@ -96,7 +107,7 @@ that contains a
96107
veryLongWordThatWont
97108
FitOnASingleLine";
98109
var wrapper = new TextWrapper(input);
99-
wrapper.WordWrap(20).ToText().Should().Be(expected);
110+
EnsureEquivalent(wrapper.WordWrap(20).ToText(),expected);
100111

101112
}
102113

@@ -112,7 +123,7 @@ that contains
112123
veryLongWordThatWo
113124
ntFitOnASingleLine";
114125
var wrapper = new TextWrapper(input);
115-
wrapper.WordWrap(20).ToText().Should().Be(expected);
126+
EnsureEquivalent(wrapper.WordWrap(20).ToText(),expected);
116127

117128
}
118129

@@ -126,7 +137,7 @@ public void SpacesWithinStringAreRespected()
126137
text with some extra
127138
spacing";
128139
var wrapper = new TextWrapper(input);
129-
wrapper.WordWrap(20).ToText().Should().Be(expected);
140+
EnsureEquivalent(wrapper.WordWrap(20).ToText(),expected);
130141

131142
}
132143

@@ -141,7 +152,7 @@ public void ExtraSpacesAreTreatedAsNonBreaking()
141152
with some extra
142153
spacing";
143154
var wrapper = new TextWrapper(input);
144-
wrapper.WordWrap(20).ToText().Should().Be(expected);
155+
EnsureEquivalent(wrapper.WordWrap(20).ToText(),expected);
145156

146157
}
147158

@@ -157,7 +168,7 @@ public void WrappingExtraSpacesObeySubIndent()
157168
with some extra
158169
spacing";
159170
var wrapper = new TextWrapper(input);
160-
wrapper.WordWrap(20).ToText().Should().Be(expected);
171+
EnsureEquivalent(wrapper.WordWrap(20).ToText(),expected);
161172

162173
}
163174

0 commit comments

Comments
 (0)