Skip to content

Commit 4a02032

Browse files
author
chenfeng
committed
更新格式化json字符串，全部统一
1 parent b0f17d9 commit 4a02032

File tree

2 files changed

+34
-35
lines changed

2 files changed

+34
-35
lines changed

‎json-diff-test/src/main/java/me/codeleep/jsondiff/test/MultAllArrayTest.java‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package me.codeleep.jsondiff.test;
22

33
import com.alibaba.fastjson2.JSON;
4-
import com.alibaba.fastjson2.JSONWriter;
54
import me.codeleep.jsondiff.DefaultJsonDifference;
65
import me.codeleep.jsondiff.common.model.JsonCompareResult;
76
import me.codeleep.jsondiff.test.model.MetaData;
@@ -11,57 +10,59 @@
1110
import org.slf4j.LoggerFactory;
1211
import org.testng.Assert;
1312
import org.testng.annotations.Test;
13+
1414
/**
1515
* @author: chenfeng
1616
* @createTime: 2023/3/2 21:55
1717
* @description: 数组类型的测试类
1818
*/
1919
public class MultAllArrayTest {
20-
private static final Logger logger = LoggerFactory.getLogger(MultAllArrayTest.class);
20+
private static final Logger logger = LoggerFactory.getLogger(MultAllArrayTest.class);
2121
private final DefaultJsonDifference defaultJsonDifference = new DefaultJsonDifference();
22+
2223
@Test(dataProvider = "right", dataProviderClass = ArrayDataFactory.class)
2324
public void noOptionRightTest(MetaData metaData) {
2425
logger.info(metaData.getCaseName());
25-
logger.debug("\n"+metaData.getExpect().toString()+"\n"+metaData.getActual().toString());
26+
logger.debug("\n" + metaData.getExpect().toString() + "\n" + metaData.getActual().toString());
2627
JsonCompareResult jsonCompareResult = defaultJsonDifference
27-
.detectDiff(JSON.toJSONString(metaData.getExpect()) , JSON.toJSONString(metaData.getActual()));
28-
if (metaData.getRet() != null)
29-
{ Assert.assertEquals(FormatContent.formatComparisonContent(jsonCompareResult),FormatContent.formatComparisonContent(metaData.getRet().toString()));}
30-
else
31-
{ Assert.assertEquals( FormatContent.formatComparisonContent(jsonCompareResult),FormatContent.formatComparisonContent("{\"match\":true}"));}
28+
.detectDiff(JSON.toJSONString(metaData.getExpect()), JSON.toJSONString(metaData.getActual()));
29+
if (metaData.getRet() != null) {
30+
Assert.assertEquals(FormatContent.formatComparisonContent(jsonCompareResult), FormatContent.formatComparisonContent(metaData.getRet().toString()));
31+
} else {
32+
Assert.assertEquals(FormatContent.formatComparisonContent(jsonCompareResult), FormatContent.formatComparisonContent("{\"match\":true}"));
33+
}
3234
}
3335

3436
@Test(dataProvider = "err", dataProviderClass = ArrayDataFactory.class)
3537
public void noOptionErrTest(MetaData metaData) {
3638
logger.info(metaData.getCaseName());
37-
logger.debug("\n"+metaData.getExpect().toString()+"\n"+metaData.getActual().toString()+"\n"+metaData.getOption());
39+
logger.debug("\n" + metaData.getExpect().toString() + "\n" + metaData.getActual().toString() + "\n" + metaData.getOption());
3840
JsonCompareResult jsonCompareResult = defaultJsonDifference
39-
.detectDiff(JSON.toJSONString(metaData.getExpect()) , JSON.toJSONString(metaData.getActual()));
40-
Assert.assertEquals(FormatContent.formatComparisonContent(jsonCompareResult),FormatContent.formatComparisonContent(metaData.getRet().toString()));
41+
.detectDiff(JSON.toJSONString(metaData.getExpect()), JSON.toJSONString(metaData.getActual()));
42+
Assert.assertEquals(FormatContent.formatComparisonContent(jsonCompareResult), FormatContent.formatComparisonContent(metaData.getRet().toString()));
4143
}
4244

4345
@Test(dataProvider = "optionRight", dataProviderClass = ArrayDataFactory.class)
4446
public void optionRight(MetaData metaData) {
4547
logger.info(metaData.getCaseName());
46-
logger.debug("\n"+metaData.getExpect().toString()+"\n"+metaData.getActual().toString()+"\n");
48+
logger.debug("\n" + metaData.getExpect().toString() + "\n" + metaData.getActual().toString() + "\n");
4749
JsonCompareResult jsonCompareResult = defaultJsonDifference
4850
.option(metaData.getOption())
49-
.detectDiff(JSON.toJSONString(metaData.getExpect()) , JSON.toJSONString(metaData.getActual()));
51+
.detectDiff(JSON.toJSONString(metaData.getExpect()), JSON.toJSONString(metaData.getActual()));
5052
if (metaData.getRet() != null) {
51-
Assert.assertEquals(JSON.toJSONString(jsonCompareResult), JSON.toJSONString(metaData.getRet()));
52-
}
53-
else {
54-
Assert.assertEquals(JSON.toJSONString(jsonCompareResult), "{\"match\":true}");
53+
Assert.assertEquals(FormatContent.formatComparisonContent(jsonCompareResult), FormatContent.formatComparisonContent(metaData.getRet().toString()));
54+
} else {
55+
Assert.assertEquals(FormatContent.formatComparisonContent(jsonCompareResult), FormatContent.formatComparisonContent("{\"match\":true}"));
5556
}
5657
}
5758

5859
@Test(dataProvider = "optionErr", dataProviderClass = ArrayDataFactory.class)
5960
public void optionErr(MetaData metaData) {
6061
logger.info(metaData.getCaseName());
61-
logger.debug("\n"+metaData.getExpect().toString()+"\n"+metaData.getActual().toString()+"\n");
62+
logger.debug("\n" + metaData.getExpect().toString() + "\n" + metaData.getActual().toString() + "\n");
6263
JsonCompareResult jsonCompareResult = defaultJsonDifference
6364
.option(metaData.getOption())
64-
.detectDiff(JSON.toJSONString(metaData.getExpect()) , JSON.toJSONString(metaData.getActual()));
65-
Assert.assertEquals(JSON.toJSONString(jsonCompareResult, JSONWriter.Feature.PrettyFormat),JSON.toJSONString(metaData.getRet(), JSONWriter.Feature.PrettyFormat));
65+
.detectDiff(JSON.toJSONString(metaData.getExpect()), JSON.toJSONString(metaData.getActual()));
66+
Assert.assertEquals(FormatContent.formatComparisonContent(jsonCompareResult), FormatContent.formatComparisonContent(metaData.getRet().toString()));
6667
}
6768
}

‎json-diff-test/src/main/java/me/codeleep/jsondiff/test/MultAllObjectTest.java‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import me.codeleep.jsondiff.DefaultJsonDifference;
66
import me.codeleep.jsondiff.test.dataFactory.ObjectDataFactory;
77
import me.codeleep.jsondiff.test.model.MetaData;
8+
import me.codeleep.jsondiff.test.utils.FormatContent;
89
import org.slf4j.Logger;
910
import org.slf4j.LoggerFactory;
1011
import org.testng.Assert;
@@ -22,52 +23,49 @@ public class MultAllObjectTest {
2223
public void noOptionRightTest(MetaData metaData) {
2324
DefaultJsonDifference defaultJsonDifference = new DefaultJsonDifference();
2425
logger.info(metaData.getCaseName());
25-
logger.debug(metaData.getExpect().toString()+"\n"+metaData.getActual().toString());
26+
logger.debug(metaData.getExpect().toString() + "\n" + metaData.getActual().toString());
2627
JsonCompareResult jsonCompareResult = defaultJsonDifference
2728
.detectDiff(JSON.toJSONString(metaData.getExpect()), JSON.toJSONString(metaData.getActual()));
2829
if (metaData.getRet() != null) {
29-
Assert.assertEquals(JSON.toJSONString(jsonCompareResult), JSON.toJSONString(metaData.getRet()));
30-
}
31-
32-
else {
33-
Assert.assertEquals(JSON.toJSONString(jsonCompareResult), "{\"match\":true}");
30+
Assert.assertEquals(FormatContent.formatComparisonContent(jsonCompareResult), FormatContent.formatComparisonContent(metaData.getRet().toString()));
31+
} else {
32+
Assert.assertEquals(FormatContent.formatComparisonContent(jsonCompareResult), FormatContent.formatComparisonContent("{\"match\":true}"));
3433
}
3534
}
3635

3736
@Test(dataProvider = "err", dataProviderClass = ObjectDataFactory.class)
3837
public void noOptionErrTest(MetaData metaData) {
3938
DefaultJsonDifference defaultJsonDifference = new DefaultJsonDifference();
4039
logger.info(metaData.getCaseName());
41-
logger.debug(metaData.getExpect().toString()+"\n"+metaData.getActual().toString());
40+
logger.debug(metaData.getExpect().toString() + "\n" + metaData.getActual().toString());
4241
JsonCompareResult jsonCompareResult = defaultJsonDifference
4342
.detectDiff(JSON.toJSONString(metaData.getExpect()), JSON.toJSONString(metaData.getActual()));
44-
Assert.assertEquals(JSON.toJSONString(jsonCompareResult),JSON.toJSONString(metaData.getRet()));
43+
Assert.assertEquals(FormatContent.formatComparisonContent(jsonCompareResult), FormatContent.formatComparisonContent(metaData.getRet().toString()));
4544
}
4645

4746
@Test(dataProvider = "optionRight", dataProviderClass = ObjectDataFactory.class)
4847
public void optionRight(MetaData metaData) {
4948
DefaultJsonDifference defaultJsonDifference = new DefaultJsonDifference();
5049
logger.info(metaData.getCaseName());
51-
logger.debug("\n"+metaData.getExpect().toString()+"\n"+metaData.getActual().toString()+"\n");
50+
logger.debug("\n" + metaData.getExpect().toString() + "\n" + metaData.getActual().toString() + "\n");
5251
JsonCompareResult jsonCompareResult = defaultJsonDifference
5352
.option(metaData.getOption())
5453
.detectDiff(JSON.toJSONString(metaData.getExpect()), JSON.toJSONString(metaData.getActual()));
5554
if (metaData.getRet() != null) {
56-
Assert.assertEquals(JSON.toJSONString(jsonCompareResult), JSON.toJSONString(metaData.getRet()));
57-
}
58-
else {
59-
Assert.assertEquals(JSON.toJSONString(jsonCompareResult), "{\"match\":true}");
55+
Assert.assertEquals(FormatContent.formatComparisonContent(jsonCompareResult), FormatContent.formatComparisonContent(metaData.getRet().toString()));
56+
} else {
57+
Assert.assertEquals(FormatContent.formatComparisonContent(jsonCompareResult), FormatContent.formatComparisonContent("{\"match\":true}"));
6058
}
6159
}
6260

6361
@Test(dataProvider = "optionErr", dataProviderClass = ObjectDataFactory.class)
6462
public void optionErr(MetaData metaData) {
6563
DefaultJsonDifference defaultJsonDifference = new DefaultJsonDifference();
6664
logger.info(metaData.getCaseName());
67-
logger.debug("\n"+metaData.getExpect().toString()+"\n"+metaData.getActual().toString()+"\n");
65+
logger.debug("\n" + metaData.getExpect().toString() + "\n" + metaData.getActual().toString() + "\n");
6866
JsonCompareResult jsonCompareResult = defaultJsonDifference
6967
.option(metaData.getOption())
7068
.detectDiff(JSON.toJSONString(metaData.getExpect()), JSON.toJSONString(metaData.getActual()));
71-
Assert.assertEquals( JSON.toJSONString(jsonCompareResult),JSON.toJSONString(metaData.getRet()));
69+
Assert.assertEquals(FormatContent.formatComparisonContent(jsonCompareResult), FormatContent.formatComparisonContent(metaData.getRet().toString()));
7270
}
7371
}

0 commit comments

Comments
 (0)