Skip to content

Commit dc1e313

Browse files
committed
fix-test(修复数组不等长判断): 修复数组不等长判断
修复数组不等长判断下放
1 parent 5aba462 commit dc1e313

File tree

2 files changed

+13
-14
lines changed

2 files changed

+13
-14
lines changed

json-diff-core/src/main/java/me/codeleep/jsondiff/core/handle/array/AbstractArrayJsonNeat.java

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -57,20 +57,6 @@ public boolean check(Object expect, Object actual, JsonCompareResult result, Tra
5757
return false;
5858
}
5959

60-
int expectSize = ((JSONArray) expect).size();
61-
int actualSize = ((JSONArray) actual).size();
62-
63-
// 长度不一致
64-
if (expectSize != actualSize) {
65-
Defects defects = new Defects()
66-
.setActual(actualSize)
67-
.setExpect(expectSize)
68-
.setTravelPath(travelPath)
69-
.setIllustrateTemplate(INCONSISTENT_ARRAY_LENGTH, String.valueOf(expectSize), String.valueOf(actualSize));
70-
result.addDefects(defects);
71-
return false;
72-
}
73-
7460
return true;
7561
}
7662

json-diff-core/src/main/java/me/codeleep/jsondiff/core/handle/array/ComplexArrayJsonNeat.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import me.codeleep.jsondiff.core.utils.JsonDiffUtil;
1111

1212
import static me.codeleep.jsondiff.common.model.Constant.DATA_TYPE_INCONSISTENT;
13+
import static me.codeleep.jsondiff.common.model.Constant.INCONSISTENT_ARRAY_LENGTH;
1314

1415
/**
1516
* @author: codeleep
@@ -29,6 +30,18 @@ public JsonCompareResult detectDiff(JSONArray expect, JSONArray actual) {
2930
if (!check(expect, actual, result, travelPath)) {
3031
return result;
3132
}
33+
// 长度不一致
34+
int expectSize = ((JSONArray) expect).size();
35+
int actualSize = ((JSONArray) actual).size();
36+
if (expectSize != actualSize) {
37+
Defects defects = new Defects()
38+
.setActual(actualSize)
39+
.setExpect(expectSize)
40+
.setTravelPath(travelPath)
41+
.setIllustrateTemplate(INCONSISTENT_ARRAY_LENGTH, String.valueOf(expectSize), String.valueOf(actualSize));
42+
result.addDefects(defects);
43+
}
44+
3245
boolean ignoreOrder = RunTimeDataFactory.getOptionInstance().isIgnoreOrder();
3346
// 测试
3447
if (ignoreOrder) {

0 commit comments

Comments
 (0)