@@ -9,56 +9,66 @@ public class CustomDiffers
9
9
[ Fact ]
10
10
public void NoCustomDiffer ( )
11
11
{
12
- var expectedDiff = "D.X Expect = \" a\" \n Actual = \" b\" \n " ;
12
+ var expectedDiff = @"DDDDD.XXX Expect = ""a""
13
+ Actual = ""b""
14
+ " ;
13
15
var expected = new Container ( new CustomDiffable ( "a" ) ) ;
14
16
var actual = new Container ( new CustomDiffable ( "b" ) ) ;
15
17
var actualDiff = Differ . ToString ( expected , actual ) ;
16
- Assert . Equal ( expectedDiff , actualDiff ) ;
18
+ AssertStr ( expectedDiff , actualDiff ) ;
17
19
}
18
20
19
21
[ Fact ]
20
22
public void CustomDiffer ( )
21
23
{
22
- var expectedDiff = "D Expect = \" a\" \n Actual = \" b\" \n " ;
24
+ var expectedDiff = @"DDDDD Expect = ""a""
25
+ Actual = ""b""
26
+ " ;
23
27
var expected = new Container ( new CustomDiffable ( "a" ) ) ;
24
28
var actual = new Container ( new CustomDiffable ( "b" ) ) ;
25
29
var actualDiff = MyDiffer . Get < Container > ( ) . ToString ( expected , actual ) ;
26
- Assert . Equal ( expectedDiff , actualDiff ) ;
30
+ AssertStr ( expectedDiff , actualDiff ) ;
27
31
}
28
32
29
33
[ Fact ]
30
34
public void CustomDifferWithCombinators ( )
31
35
{
32
- var expectedDiff = "D Expect = \" a\" \n Actual = \" b\" \n " ;
36
+ var expectedDiff = @"DDDDD Expect = ""a""
37
+ Actual = ""b""
38
+ " ;
33
39
var expected = new Container ( new CustomDiffable ( "a" ) ) ;
34
40
var actual = new Container ( new CustomDiffable ( "b" ) ) ;
35
41
var actualDiff = MyDifferWithCombinators . Get < Container > ( ) . ToString ( expected , actual ) ;
36
- Assert . Equal ( expectedDiff , actualDiff ) ;
42
+ AssertStr ( expectedDiff , actualDiff ) ;
37
43
}
38
44
39
45
[ Fact ]
40
46
public void CustomDifferWithMap ( )
41
47
{
42
- var expectedDiff = "D Expect = \" a\" \n Actual = \" b\" \n " ;
48
+ var expectedDiff = @"DDDDD Expect = ""a""
49
+ Actual = ""b""
50
+ " ;
43
51
var expected = new Container ( new CustomDiffable ( "a" ) ) ;
44
52
var actual = new Container ( new CustomDiffable ( "b" ) ) ;
45
53
var actualDiff = MyDifferWithMap . Get < Container > ( ) . ToString ( expected , actual ) ;
46
- Assert . Equal ( expectedDiff , actualDiff ) ;
54
+ AssertStr ( expectedDiff , actualDiff ) ;
47
55
}
48
56
49
57
[ Fact ]
50
58
public void CustomDifferWithMapToAnonymousObject ( )
51
59
{
52
- var expectedDiff = "D.v Expect = \" a\" \n Actual = \" b\" \n " ;
60
+ var expectedDiff = @"DDDDD.v Expect = ""a""
61
+ Actual = ""b""
62
+ " ;
53
63
var expected = new Container ( new CustomDiffable ( "a" ) ) ;
54
64
var actual = new Container ( new CustomDiffable ( "b" ) ) ;
55
65
var actualDiff = MyDifferWithMapToAnonymousObject . Get < Container > ( ) . ToString ( expected , actual ) ;
56
- Assert . Equal ( expectedDiff , actualDiff ) ;
66
+ AssertStr ( expectedDiff , actualDiff ) ;
57
67
}
58
68
59
- public record CustomDiffable ( string X ) ;
69
+ public record CustomDiffable ( string XXX ) ;
60
70
61
- public record Container ( CustomDiffable D ) ;
71
+ public record Container ( CustomDiffable DDDDD ) ;
62
72
63
73
public class MyDiffer : IDiffer < CustomDiffable >
64
74
{
@@ -70,7 +80,7 @@ public MyDiffer(IDifferFactory differFactory)
70
80
}
71
81
72
82
public FSharpOption < Diff > Diff ( CustomDiffable x1 , CustomDiffable x2 ) =>
73
- _stringDiffer . Diff ( x1 . X , x2 . X ) ;
83
+ _stringDiffer . Diff ( x1 . XXX , x2 . XXX ) ;
74
84
75
85
public static IDiffer < T > Get < T > ( ) => Singleton < T > . Instance ;
76
86
@@ -101,7 +111,7 @@ private static class Singleton<T>
101
111
CustomDiffer < CustomDiffable > . Build ( factory =>
102
112
{
103
113
var stringDiffer = factory . GetDiffer < string > ( ) ;
104
- return ( x1 , x2 ) => stringDiffer . Diff ( x1 . X , x2 . X ) ;
114
+ return ( x1 , x2 ) => stringDiffer . Diff ( x1 . XXX , x2 . XXX ) ;
105
115
} ) ;
106
116
}
107
117
@@ -115,7 +125,7 @@ private static class Singleton<T>
115
125
}
116
126
117
127
private static readonly ICustomDiffer CustomDiffer =
118
- CustomDiffer < CustomDiffable > . Map ( x => x . X ) ;
128
+ CustomDiffer < CustomDiffable > . Map ( x => x . XXX ) ;
119
129
}
120
130
121
131
public static class MyDifferWithMapToAnonymousObject
@@ -128,7 +138,12 @@ private static class Singleton<T>
128
138
}
129
139
130
140
private static readonly ICustomDiffer CustomDiffer =
131
- CustomDiffer < CustomDiffable > . Map ( x => new { v = x . X } ) ;
141
+ CustomDiffer < CustomDiffable > . Map ( x => new { v = x . XXX } ) ;
142
+ }
143
+
144
+ private void AssertStr ( string expected , string actual )
145
+ {
146
+ Assert . Equal ( expected . Replace ( "\r \n " , "\n " ) , actual ) ;
132
147
}
133
148
}
134
149
}
0 commit comments