@@ -99,14 +99,14 @@ public void Test_UncertaintyAnalysisResults_ArraySerialization()
9999
100100 // Assert
101101 Assert . IsNotNull ( deserialized . ModeCurve ) ;
102- Assert . AreEqual ( original . ModeCurve . Length , deserialized . ModeCurve . Length ) ;
102+ Assert . HasCount ( original . ModeCurve . Length , deserialized . ModeCurve ) ;
103103 for ( int i = 0 ; i < original . ModeCurve . Length ; i ++ )
104104 {
105105 Assert . AreEqual ( original . ModeCurve [ i ] , deserialized . ModeCurve [ i ] , 1e-10 ) ;
106106 }
107107
108108 Assert . IsNotNull ( deserialized . MeanCurve ) ;
109- Assert . AreEqual ( original . MeanCurve . Length , deserialized . MeanCurve . Length ) ;
109+ Assert . HasCount ( original . MeanCurve . Length , deserialized . MeanCurve ) ;
110110 for ( int i = 0 ; i < original . MeanCurve . Length ; i ++ )
111111 {
112112 Assert . AreEqual ( original . MeanCurve [ i ] , deserialized . MeanCurve [ i ] , 1e-10 ) ;
@@ -161,9 +161,11 @@ public void Test_UncertaintyAnalysisResults_ParameterSetsSerialization()
161161 byte [ ] serialized = UncertaintyAnalysisResults . ToByteArray ( original ) ;
162162 var deserialized = UncertaintyAnalysisResults . FromByteArray ( serialized ) ;
163163
164+ var origLen = original . ParameterSets . Length ;
165+ var desLen = deserialized . ParameterSets . Length ;
164166 // Assert
165167 Assert . IsNotNull ( deserialized . ParameterSets ) ;
166- Assert . AreEqual ( original . ParameterSets . Length , deserialized . ParameterSets . Length ) ;
168+ Assert . AreEqual ( origLen , desLen ) ;
167169
168170 for ( int i = 0 ; i < original . ParameterSets . Length ; i ++ )
169171 {
@@ -173,7 +175,7 @@ public void Test_UncertaintyAnalysisResults_ParameterSetsSerialization()
173175 if ( original . ParameterSets [ i ] . Values != null )
174176 {
175177 Assert . IsNotNull ( deserialized . ParameterSets [ i ] . Values ) ;
176- Assert . AreEqual ( original . ParameterSets [ i ] . Values . Length , deserialized . ParameterSets [ i ] . Values . Length ) ;
178+ Assert . HasCount ( original . ParameterSets [ i ] . Values . Length , deserialized . ParameterSets [ i ] . Values ) ;
177179
178180 for ( int j = 0 ; j < original . ParameterSets [ i ] . Values . Length ; j ++ )
179181 {
@@ -246,11 +248,11 @@ public void Test_UncertaintyAnalysisResults_EmptyArrays()
246248 // Assert
247249 Assert . IsNotNull ( deserialized ) ;
248250 Assert . IsNotNull ( deserialized . ParameterSets ) ;
249- Assert . AreEqual ( 0 , deserialized . ParameterSets . Length ) ;
251+ Assert . IsEmpty ( deserialized . ParameterSets ) ;
250252 Assert . IsNotNull ( deserialized . ModeCurve ) ;
251- Assert . AreEqual ( 0 , deserialized . ModeCurve . Length ) ;
253+ Assert . IsEmpty ( deserialized . ModeCurve ) ;
252254 Assert . IsNotNull ( deserialized . MeanCurve ) ;
253- Assert . AreEqual ( 0 , deserialized . MeanCurve . Length ) ;
255+ Assert . IsEmpty ( deserialized . MeanCurve ) ;
254256 }
255257
256258 /// <summary>
@@ -293,10 +295,12 @@ public void Test_MCMCResults_BasicSerialization()
293295 byte [ ] serialized = MCMCResults . ToByteArray ( original ) ;
294296 var deserialized = MCMCResults . FromByteArray ( serialized ) ;
295297
298+ var origLen = original . AcceptanceRates . Length ;
299+ var desLen = deserialized . AcceptanceRates . Length ;
296300 // Assert
297301 Assert . IsNotNull ( deserialized ) ;
298302 Assert . IsNotNull ( deserialized . AcceptanceRates ) ;
299- Assert . AreEqual ( original . AcceptanceRates . Length , deserialized . AcceptanceRates . Length ) ;
303+ Assert . AreEqual ( origLen , desLen ) ;
300304
301305 for ( int i = 0 ; i < original . AcceptanceRates . Length ; i ++ )
302306 {
@@ -323,14 +327,16 @@ public void Test_MCMCResults_MarkovChainsSerialization()
323327 byte [ ] serialized = MCMCResults . ToByteArray ( original ) ;
324328 var deserialized = MCMCResults . FromByteArray ( serialized ) ;
325329
330+ var origLen = original . MarkovChains . Length ;
331+ var desLen = deserialized . MarkovChains . Length ;
326332 // Assert
327333 Assert . IsNotNull ( deserialized . MarkovChains ) ;
328- Assert . AreEqual ( original . MarkovChains . Length , deserialized . MarkovChains . Length ) ;
334+ Assert . AreEqual ( origLen , desLen ) ;
329335
330336 for ( int i = 0 ; i < original . MarkovChains . Length ; i ++ )
331337 {
332338 Assert . IsNotNull ( deserialized . MarkovChains [ i ] ) ;
333- Assert . AreEqual ( original . MarkovChains [ i ] . Count , deserialized . MarkovChains [ i ] . Count ) ;
339+ Assert . HasCount ( original . MarkovChains [ i ] . Count , deserialized . MarkovChains [ i ] ) ;
334340
335341 for ( int j = 0 ; j < original . MarkovChains [ i ] . Count ; j ++ )
336342 {
@@ -368,7 +374,7 @@ public void Test_MCMCResults_OutputSerialization()
368374
369375 // Assert
370376 Assert . IsNotNull ( deserialized . Output ) ;
371- Assert . AreEqual ( original . Output . Count , deserialized . Output . Count ) ;
377+ Assert . HasCount ( original . Output . Count , deserialized . Output ) ;
372378
373379 for ( int i = 0 ; i < original . Output . Count ; i ++ )
374380 {
@@ -423,7 +429,7 @@ public void Test_MCMCResults_MeanLogLikelihoodSerialization()
423429
424430 // Assert
425431 Assert . IsNotNull ( deserialized . MeanLogLikelihood ) ;
426- Assert . AreEqual ( original . MeanLogLikelihood . Count , deserialized . MeanLogLikelihood . Count ) ;
432+ Assert . HasCount ( original . MeanLogLikelihood . Count , deserialized . MeanLogLikelihood ) ;
427433
428434 for ( int i = 0 ; i < original . MeanLogLikelihood . Count ; i ++ )
429435 {
@@ -461,9 +467,9 @@ public void Test_MCMCResults_EmptyChains()
461467 // Assert
462468 Assert . IsNotNull ( deserialized ) ;
463469 Assert . IsNotNull ( deserialized . MarkovChains ) ;
464- Assert . AreEqual ( 2 , deserialized . MarkovChains . Length ) ;
465- Assert . AreEqual ( 0 , deserialized . MarkovChains [ 0 ] . Count ) ;
466- Assert . AreEqual ( 0 , deserialized . MarkovChains [ 1 ] . Count ) ;
470+ Assert . HasCount ( 2 , deserialized . MarkovChains ) ;
471+ Assert . HasCount ( 0 , deserialized . MarkovChains [ 0 ] ) ;
472+ Assert . HasCount ( 0 , deserialized . MarkovChains [ 1 ] ) ;
467473 }
468474
469475 /// <summary>
@@ -486,9 +492,11 @@ public void Test_MCMCResults_LargeDataSet()
486492 byte [ ] serialized = MCMCResults . ToByteArray ( original ) ;
487493 var deserialized = MCMCResults . FromByteArray ( serialized ) ;
488494
495+ var origLen = original . MarkovChains . Length ;
496+ var deserializedLen = deserialized . MarkovChains . Length ;
489497 // Assert
490498 Assert . IsNotNull ( deserialized ) ;
491- Assert . AreEqual ( original . MarkovChains . Length , deserialized . MarkovChains . Length ) ;
499+ Assert . AreEqual ( origLen , deserializedLen ) ;
492500
493501 // Verify first and last elements to ensure proper serialization
494502 var firstOriginal = original . MarkovChains [ 0 ] [ 0 ] ;
@@ -531,15 +539,15 @@ public void Test_JsonSerializerOptions_Configuration()
531539
532540 // Assert
533541 // Verify that WriteIndented is false (no formatting whitespace)
534- Assert . IsFalse ( jsonString . Contains ( "\n " ) ) ;
535- Assert . IsFalse ( jsonString . Contains ( " " ) ) ; // No indentation
542+ Assert . DoesNotContain ( jsonString , ( "\n " ) ) ;
543+ Assert . DoesNotContain ( jsonString , ( " " ) ) ; // No indentation
536544
537545 // Verify that null values are not included (DefaultIgnoreCondition)
538- Assert . IsFalse ( jsonString . Contains ( "\" ParentDistribution\" :null" ) ) ;
546+ Assert . DoesNotContain ( jsonString , ( "\" ParentDistribution\" :null" ) ) ;
539547
540548 // Verify that fields are included (IncludeFields = true)
541- Assert . IsTrue ( jsonString . Contains ( "\" AIC\" :" ) ) ;
542- Assert . IsTrue ( jsonString . Contains ( "\" BIC\" :" ) ) ;
549+ Assert . DoesNotContain ( jsonString , ( "\" AIC\" :" ) ) ;
550+ Assert . DoesNotContain ( jsonString , ( "\" BIC\" :" ) ) ;
543551 }
544552
545553 #endregion
0 commit comments