@@ -10,8 +10,8 @@ public class JsonAssertTests
1010 [ Test ]
1111 public void AreEqual_String ( )
1212 {
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\" }" ;
1515
1616 JsonAssert . AreEqual ( json1 , json2 ) ;
1717 }
@@ -43,7 +43,7 @@ public void AreEqual_FailWithMessage()
4343 var error = Assert . Throws < AssertionException > (
4444 ( ) => JsonAssert . AreEqual ( json1 , json2 ) ) ;
4545
46- StringAssert . Contains ( "JsonAssert.AreEqual() failure." , error ! . Message ) ;
46+ Assert . That ( error ! . Message , Does . Contain ( "JsonAssert.AreEqual() failure." ) ) ;
4747 }
4848
4949 [ Test ]
@@ -55,10 +55,13 @@ public void AreEqual_FailWithDefaultOutput()
5555 var error = Assert . Throws < AssertionException > (
5656 ( ) => JsonAssert . AreEqual ( json1 , json2 , true ) ) ;
5757
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+ } ) ;
6265 }
6366
6467 [ Test ]
@@ -70,15 +73,18 @@ public void AreEqual_FailWithCustomOutput()
7073 var error = Assert . Throws < AssertionException > ( ( ) => JsonAssert . AreEqual ( json1 ,
7174 json2 , _ => "Custom message" ) ) ;
7275
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+ } ) ;
7581 }
7682
7783 [ Test ]
7884 public void AreNotEqual_String ( )
7985 {
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\" }" ;
8288
8389 JsonAssert . AreNotEqual ( json1 , json2 ) ;
8490 }
@@ -100,8 +106,8 @@ public void AreNotEqual_Nulls()
100106
101107 var error = Assert . Throws < AssertionException > (
102108 ( ) => JsonAssert . AreNotEqual ( json1 , json2 ) ) ;
103-
104- Assert . IsNotNull ( error ) ;
109+
110+ Assert . That ( error , Is . Not . Null ) ;
105111 }
106112
107113 [ Test ]
@@ -113,7 +119,7 @@ public void AreNotEqual_FailWithMessage()
113119 var error = Assert . Throws < AssertionException > (
114120 ( ) => JsonAssert . AreNotEqual ( json1 , json2 ) ) ;
115121
116- StringAssert . Contains ( "JsonAssert.AreNotEqual() failure." , error ! . Message ) ;
122+ Assert . That ( error ! . Message , Does . Contain ( "JsonAssert.AreNotEqual() failure." ) ) ;
117123 }
118124 }
119125}
0 commit comments