iSharkFly-Docs/java-tutorials
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

made changes as per review comments

Browse Source
This commit is contained in:
gpq5 2019-06-28 10:15:05 +05:30
parent 706035468b
commit 3d50c203a6
1 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
jackson-2/src/test/java/com/baeldung/jackson/json/compare/JsonCompareUnitTest.java
View File

@ -1,6 +1,7 @@
package com.baeldung.jackson.json.compare; package com.baeldung.jackson.json.compare;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import java.io.IOException; import java.io.IOException;
@ -24,7 +25,7 @@ public class JsonCompareUnitTest {
JsonNode actualObj1 = mapper.readTree(s1); JsonNode actualObj1 = mapper.readTree(s1);
JsonNode actualObj2 = mapper.readTree(s2); JsonNode actualObj2 = mapper.readTree(s2);
assertTrue(actualObj1.equals(actualObj2)); assertEquals(actualObj1, actualObj2);
} }
@ -38,7 +39,7 @@ public class JsonCompareUnitTest {
JsonNode actualObj1 = mapper.readTree(s1); JsonNode actualObj1 = mapper.readTree(s1);
JsonNode actualObj2 = mapper.readTree(s2); JsonNode actualObj2 = mapper.readTree(s2);
assertTrue(actualObj1.equals(actualObj2)); assertEquals(actualObj1, actualObj2);
} }
@ -52,7 +53,7 @@ public class JsonCompareUnitTest {
JsonNode actualObj1 = mapper.readTree(s1); JsonNode actualObj1 = mapper.readTree(s1);
JsonNode actualObj2 = mapper.readTree(s2); JsonNode actualObj2 = mapper.readTree(s2);
assertTrue(actualObj1.equals(actualObj2)); assertEquals(actualObj1, actualObj2);
} }
@ -65,26 +66,27 @@ public class JsonCompareUnitTest {
JsonNode actualObj1 = mapper.readTree(s1); JsonNode actualObj1 = mapper.readTree(s1);
JsonNode actualObj2 = mapper.readTree(s2); JsonNode actualObj2 = mapper.readTree(s2);
Comparator<JsonNode> cmp = new Comparator<JsonNode>() { NumericNodeComparator cmp = new NumericNodeComparator();
assertNotEquals(actualObj1, actualObj2);
assertTrue(actualObj1.equals(cmp, actualObj2));
}
public class NumericNodeComparator implements Comparator<JsonNode> {
@Override @Override
public int compare(JsonNode o1, JsonNode o2) { public int compare(JsonNode o1, JsonNode o2) {
if (o1.equals(o2)) { if (o1.equals(o2)) {
return 0; return 0;
} }
if ((o1 instanceof NumericNode) && (o2 instanceof NumericNode)) { if ((o1 instanceof NumericNode) && (o2 instanceof NumericNode)) {
double d1 = ((NumericNode) o1).asDouble(); Double d1 = ((NumericNode) o1).asDouble();
double d2 = ((NumericNode) o2).asDouble(); Double d2 = ((NumericNode) o2).asDouble();
if (d1 == d2) { if (d1.equals(d2)) {
return 0; return 0;
} }
} }
return 1; return 1;
} }
};
assertFalse(actualObj1.equals(actualObj2));
assertTrue(actualObj1.equals(cmp, actualObj2));
} }
} }