11package me .codeleep .jsondiff .test ;
22
33import com .alibaba .fastjson2 .JSON ;
4+ import com .alibaba .fastjson2 .JSONWriter ;
45import me .codeleep .jsondiff .DefaultJsonDifference ;
56import me .codeleep .jsondiff .common .model .JsonCompareResult ;
67import me .codeleep .jsondiff .test .model .MetaData ;
78import me .codeleep .jsondiff .test .dataFactory .ArrayDataFactory ;
9+ import me .codeleep .jsondiff .test .utils .FormatContent ;
810import org .slf4j .Logger ;
911import org .slf4j .LoggerFactory ;
1012import org .testng .Assert ;
1618 */
1719public class MultAllArrayTest {
1820 private static final Logger logger = LoggerFactory .getLogger (MultAllArrayTest .class );
21+ private final DefaultJsonDifference defaultJsonDifference = new DefaultJsonDifference ();
1922 @ Test (dataProvider = "right" , dataProviderClass = ArrayDataFactory .class )
2023 public void noOptionRightTest (MetaData metaData ) {
21- DefaultJsonDifference defaultJsonDifference = new DefaultJsonDifference ();
2224 logger .info (metaData .getCaseName ());
2325 logger .debug ("\n " +metaData .getExpect ().toString ()+"\n " +metaData .getActual ().toString ());
2426 JsonCompareResult jsonCompareResult = defaultJsonDifference
2527 .detectDiff (JSON .toJSONString (metaData .getExpect ()) , JSON .toJSONString (metaData .getActual ()));
2628 if (metaData .getRet () != null )
27- { Assert .assertEquals ( JSON . toJSONString (jsonCompareResult ),JSON . toJSONString (metaData .getRet ()));}
29+ { Assert .assertEquals (FormatContent . formatComparisonContent (jsonCompareResult ),FormatContent . formatComparisonContent (metaData .getRet (). toString ()));}
2830 else
29- { Assert .assertEquals ( JSON . toJSONString (jsonCompareResult ),"{\" match\" :true}" );}
31+ { Assert .assertEquals ( FormatContent . formatComparisonContent (jsonCompareResult ),FormatContent . formatComparisonContent ( "{\" match\" :true}" ) );}
3032 }
3133
3234 @ Test (dataProvider = "err" , dataProviderClass = ArrayDataFactory .class )
3335 public void noOptionErrTest (MetaData metaData ) {
34- DefaultJsonDifference defaultJsonDifference = new DefaultJsonDifference ();
3536 logger .info (metaData .getCaseName ());
3637 logger .debug ("\n " +metaData .getExpect ().toString ()+"\n " +metaData .getActual ().toString ()+"\n " +metaData .getOption ());
3738 JsonCompareResult jsonCompareResult = defaultJsonDifference
3839 .detectDiff (JSON .toJSONString (metaData .getExpect ()) , JSON .toJSONString (metaData .getActual ()));
39- Assert .assertEquals (JSON .toJSONString (jsonCompareResult ),JSON .toJSONString (metaData .getRet ()));
40-
40+ Assert .assertEquals (FormatContent .formatComparisonContent (jsonCompareResult ),FormatContent .formatComparisonContent (metaData .getRet ().toString ()));
4141 }
4242
4343 @ Test (dataProvider = "optionRight" , dataProviderClass = ArrayDataFactory .class )
4444 public void optionRight (MetaData metaData ) {
45- DefaultJsonDifference defaultJsonDifference = new DefaultJsonDifference ();
4645 logger .info (metaData .getCaseName ());
4746 logger .debug ("\n " +metaData .getExpect ().toString ()+"\n " +metaData .getActual ().toString ()+"\n " );
4847 JsonCompareResult jsonCompareResult = defaultJsonDifference
@@ -58,12 +57,11 @@ public void optionRight(MetaData metaData) {
5857
5958 @ Test (dataProvider = "optionErr" , dataProviderClass = ArrayDataFactory .class )
6059 public void optionErr (MetaData metaData ) {
61- DefaultJsonDifference defaultJsonDifference = new DefaultJsonDifference ();
6260 logger .info (metaData .getCaseName ());
6361 logger .debug ("\n " +metaData .getExpect ().toString ()+"\n " +metaData .getActual ().toString ()+"\n " );
6462 JsonCompareResult jsonCompareResult = defaultJsonDifference
6563 .option (metaData .getOption ())
6664 .detectDiff (JSON .toJSONString (metaData .getExpect ()) , JSON .toJSONString (metaData .getActual ()));
67- Assert .assertEquals (JSON .toJSONString (jsonCompareResult ),JSON .toJSONString (metaData .getRet ()));
65+ Assert .assertEquals (JSON .toJSONString (jsonCompareResult , JSONWriter . Feature . PrettyFormat ),JSON .toJSONString (metaData .getRet (), JSONWriter . Feature . PrettyFormat ));
6866 }
6967}
0 commit comments