@@ -10,8 +10,8 @@ public class JsonAssertTests
10
10
[ Test ]
11
11
public void AreEqual_String ( )
12
12
{
13
- var json1 = "{\" foo\" :\" bar\" ,\" baz\" :\" qux\" }" ;
14
- var json2 = "{\" baz\" :\" qux\" ,\" foo\" :\" bar\" }" ;
13
+ const string json1 = "{\" foo\" :\" bar\" ,\" baz\" :\" qux\" }" ;
14
+ const string json2 = "{\" baz\" :\" qux\" ,\" foo\" :\" bar\" }" ;
15
15
16
16
JsonAssert . AreEqual ( json1 , json2 ) ;
17
17
}
@@ -43,7 +43,7 @@ public void AreEqual_FailWithMessage()
43
43
var error = Assert . Throws < AssertionException > (
44
44
( ) => JsonAssert . AreEqual ( json1 , json2 ) ) ;
45
45
46
- StringAssert . Contains ( "JsonAssert.AreEqual() failure." , error ! . Message ) ;
46
+ Assert . That ( error ! . Message , Does . Contain ( "JsonAssert.AreEqual() failure." ) ) ;
47
47
}
48
48
49
49
[ Test ]
@@ -55,10 +55,13 @@ public void AreEqual_FailWithDefaultOutput()
55
55
var error = Assert . Throws < AssertionException > (
56
56
( ) => JsonAssert . AreEqual ( json1 , json2 , true ) ) ;
57
57
58
- StringAssert . Contains ( "JsonAssert.AreEqual() failure." , error ! . Message ) ;
59
- StringAssert . Contains ( "Expected:" , error . Message ) ;
60
- StringAssert . Contains ( "Actual:" , error . Message ) ;
61
- StringAssert . Contains ( "Delta:" , error . Message ) ;
58
+ Assert . Multiple ( ( ) =>
59
+ {
60
+ Assert . That ( error ! . Message , Does . Contain ( "JsonAssert.AreEqual() failure." ) ) ;
61
+ Assert . That ( error . Message , Does . Contain ( "Expected:" ) ) ;
62
+ Assert . That ( error . Message , Does . Contain ( "Actual:" ) ) ;
63
+ Assert . That ( error . Message , Does . Contain ( "Delta:" ) ) ;
64
+ } ) ;
62
65
}
63
66
64
67
[ Test ]
@@ -70,15 +73,18 @@ public void AreEqual_FailWithCustomOutput()
70
73
var error = Assert . Throws < AssertionException > ( ( ) => JsonAssert . AreEqual ( json1 ,
71
74
json2 , _ => "Custom message" ) ) ;
72
75
73
- StringAssert . Contains ( "JsonAssert.AreEqual() failure." , error ! . Message ) ;
74
- StringAssert . Contains ( "Custom message" , error . Message ) ;
76
+ Assert . Multiple ( ( ) =>
77
+ {
78
+ Assert . That ( error ! . Message , Does . Contain ( "JsonAssert.AreEqual() failure." ) ) ;
79
+ Assert . That ( error . Message , Does . Contain ( "Custom message" ) ) ;
80
+ } ) ;
75
81
}
76
82
77
83
[ Test ]
78
84
public void AreNotEqual_String ( )
79
85
{
80
- var json1 = "{\" foo\" :\" bar\" ,\" baz\" :\" qux\" }" ;
81
- var json2 = "{\" foo\" :\" baz\" }" ;
86
+ const string json1 = "{\" foo\" :\" bar\" ,\" baz\" :\" qux\" }" ;
87
+ const string json2 = "{\" foo\" :\" baz\" }" ;
82
88
83
89
JsonAssert . AreNotEqual ( json1 , json2 ) ;
84
90
}
@@ -100,8 +106,8 @@ public void AreNotEqual_Nulls()
100
106
101
107
var error = Assert . Throws < AssertionException > (
102
108
( ) => JsonAssert . AreNotEqual ( json1 , json2 ) ) ;
103
-
104
- Assert . IsNotNull ( error ) ;
109
+
110
+ Assert . That ( error , Is . Not . Null ) ;
105
111
}
106
112
107
113
[ Test ]
@@ -113,7 +119,7 @@ public void AreNotEqual_FailWithMessage()
113
119
var error = Assert . Throws < AssertionException > (
114
120
( ) => JsonAssert . AreNotEqual ( json1 , json2 ) ) ;
115
121
116
- StringAssert . Contains ( "JsonAssert.AreNotEqual() failure." , error ! . Message ) ;
122
+ Assert . That ( error ! . Message , Does . Contain ( "JsonAssert.AreNotEqual() failure." ) ) ;
117
123
}
118
124
}
119
125
}
0 commit comments