diff --git a/NST/src/main/java/com/ebay/jsonpath/JPBooleanCheck.java b/NST/src/main/java/com/ebay/jsonpath/JPBooleanCheck.java index d2aeae4..b576636 100644 --- a/NST/src/main/java/com/ebay/jsonpath/JPBooleanCheck.java +++ b/NST/src/main/java/com/ebay/jsonpath/JPBooleanCheck.java @@ -71,7 +71,7 @@ public void processJsonPath(String jsonPath, SoftAssert softAssert, DocumentCont return; } - if (isNull) { + if (isNullExpected()) { softAssert.assertNull(value, AssertMessageBuilder.build(jsonPath, "with non-null boolean")); } else { softAssert.assertNotNull(value, AssertMessageBuilder.build(jsonPath, "with null boolean")); diff --git a/NST/src/main/java/com/ebay/jsonpath/JPDoubleCheck.java b/NST/src/main/java/com/ebay/jsonpath/JPDoubleCheck.java index 096429e..7375b2b 100644 --- a/NST/src/main/java/com/ebay/jsonpath/JPDoubleCheck.java +++ b/NST/src/main/java/com/ebay/jsonpath/JPDoubleCheck.java @@ -81,7 +81,7 @@ public void processJsonPath(String jsonPath, SoftAssert softAssert, DocumentCont return; } - if (isNull) { + if (isNullExpected()) { softAssert.assertNull(value, AssertMessageBuilder.build(jsonPath, "with non-null double")); } else { softAssert.assertNotNull(value, AssertMessageBuilder.build(jsonPath, "with null double")); diff --git a/NST/src/main/java/com/ebay/jsonpath/JPIntegerCheck.java b/NST/src/main/java/com/ebay/jsonpath/JPIntegerCheck.java index 9907f93..4e0a01a 100644 --- a/NST/src/main/java/com/ebay/jsonpath/JPIntegerCheck.java +++ b/NST/src/main/java/com/ebay/jsonpath/JPIntegerCheck.java @@ -71,7 +71,7 @@ public void processJsonPath(String jsonPath, SoftAssert softAssert, DocumentCont return; } - if (isNull) { + if (isNullExpected()) { softAssert.assertNull(value, AssertMessageBuilder.build(jsonPath, "with non-null integer")); } else { softAssert.assertNotNull(value, AssertMessageBuilder.build(jsonPath, "with null integer")); diff --git a/NST/src/main/java/com/ebay/jsonpath/JPJsonArrayCheck.java b/NST/src/main/java/com/ebay/jsonpath/JPJsonArrayCheck.java index 3fa76e0..8dfa1fc 100644 --- a/NST/src/main/java/com/ebay/jsonpath/JPJsonArrayCheck.java +++ b/NST/src/main/java/com/ebay/jsonpath/JPJsonArrayCheck.java @@ -112,7 +112,7 @@ public void processJsonPath(String jsonPath, SoftAssert softAssert, DocumentCont return; } - if (isNull) { + if (isNullExpected()) { softAssert.assertNull(values, AssertMessageBuilder.build(jsonPath, "because the path does exist")); } else { softAssert.assertNotNull(values, AssertMessageBuilder.build(jsonPath, "because the path does not exist")); diff --git a/NST/src/main/java/com/ebay/jsonpath/JPJsonObjectCheck.java b/NST/src/main/java/com/ebay/jsonpath/JPJsonObjectCheck.java index a2e4b5d..56eebf7 100644 --- a/NST/src/main/java/com/ebay/jsonpath/JPJsonObjectCheck.java +++ b/NST/src/main/java/com/ebay/jsonpath/JPJsonObjectCheck.java @@ -180,7 +180,7 @@ public void processJsonPath(String jsonPath, SoftAssert softAssert, DocumentCont return; } - if (isNull) { + if (isNullExpected()) { softAssert.assertNull(value, AssertMessageBuilder.build(jsonPath, "because the path does exist")); } else { softAssert.assertNotNull(value, AssertMessageBuilder.build(jsonPath, "because the path does not exist")); diff --git a/NST/src/main/java/com/ebay/jsonpath/JPListOfBooleanCheck.java b/NST/src/main/java/com/ebay/jsonpath/JPListOfBooleanCheck.java index 9120851..6a1fa1f 100644 --- a/NST/src/main/java/com/ebay/jsonpath/JPListOfBooleanCheck.java +++ b/NST/src/main/java/com/ebay/jsonpath/JPListOfBooleanCheck.java @@ -201,7 +201,7 @@ public void processJsonPath(String jsonPath, SoftAssert softAssert, DocumentCont return; } - if (!isNull) { + if (!isNullExpected()) { softAssert.assertNotNull(values, AssertMessageBuilder.build(jsonPath, "because the path does not exist")); } @@ -219,7 +219,7 @@ public void processJsonPath(String jsonPath, SoftAssert softAssert, DocumentCont continue; } - if (isNull) { + if (isNullExpected()) { softAssert.assertNull(value, AssertMessageBuilder.build(jsonPath, String.format("with NON null value on index %d of the list of Booleans", i))); } else { softAssert.assertNotNull(value, AssertMessageBuilder.build(jsonPath, String.format("with null value on index %d of the list of Booleans", i))); diff --git a/NST/src/main/java/com/ebay/jsonpath/JPListOfDoubleCheck.java b/NST/src/main/java/com/ebay/jsonpath/JPListOfDoubleCheck.java index 197bb63..01c6f4a 100644 --- a/NST/src/main/java/com/ebay/jsonpath/JPListOfDoubleCheck.java +++ b/NST/src/main/java/com/ebay/jsonpath/JPListOfDoubleCheck.java @@ -233,7 +233,7 @@ public void processJsonPath(String jsonPath, SoftAssert softAssert, DocumentCont return; } - if (!isNull) { + if (!isNullExpected()) { softAssert.assertNotNull(values, AssertMessageBuilder.build(jsonPath, "because the path does not exist.")); } @@ -251,7 +251,7 @@ public void processJsonPath(String jsonPath, SoftAssert softAssert, DocumentCont continue; } - if (isNull) { + if (isNullExpected()) { softAssert.assertNull(value, AssertMessageBuilder.build(jsonPath, String.format("with NON null value on index %d of the list of Doubles", i))); } else { softAssert.assertNotNull(value, AssertMessageBuilder.build(jsonPath, String.format("with null value on index %d of the list of Doubles", i))); diff --git a/NST/src/main/java/com/ebay/jsonpath/JPListOfIntegerCheck.java b/NST/src/main/java/com/ebay/jsonpath/JPListOfIntegerCheck.java index 27a8e56..610c090 100644 --- a/NST/src/main/java/com/ebay/jsonpath/JPListOfIntegerCheck.java +++ b/NST/src/main/java/com/ebay/jsonpath/JPListOfIntegerCheck.java @@ -203,7 +203,7 @@ public void processJsonPath(String jsonPath, SoftAssert softAssert, DocumentCont return; } - if (!isNull) { + if (!isNullExpected()) { softAssert.assertNotNull(values, AssertMessageBuilder.build(jsonPath, "because the path does not exist")); } @@ -221,7 +221,7 @@ public void processJsonPath(String jsonPath, SoftAssert softAssert, DocumentCont continue; } - if (isNull) { + if (isNullExpected()) { softAssert.assertNull(value, AssertMessageBuilder.build(jsonPath, String.format("with NON null value on index %d of the list of Integers", i))); } else { softAssert.assertNotNull(value, AssertMessageBuilder.build(jsonPath, String.format("with null value on index %d of the list of Integers", i))); diff --git a/NST/src/main/java/com/ebay/jsonpath/JPListOfStringCheck.java b/NST/src/main/java/com/ebay/jsonpath/JPListOfStringCheck.java index d0e18bf..e0554c0 100644 --- a/NST/src/main/java/com/ebay/jsonpath/JPListOfStringCheck.java +++ b/NST/src/main/java/com/ebay/jsonpath/JPListOfStringCheck.java @@ -231,7 +231,7 @@ public void processJsonPath(String jsonPath, SoftAssert softAssert, DocumentCont return; } - if (!isNull) { + if (!isNullExpected()) { softAssert.assertNotNull(values, AssertMessageBuilder.build(jsonPath, "because the path does not exist")); } @@ -249,7 +249,7 @@ public void processJsonPath(String jsonPath, SoftAssert softAssert, DocumentCont continue; } - if (isNull) { + if (isNullExpected()) { softAssert.assertNull(value, AssertMessageBuilder.build(jsonPath, String.format("because the path does exist on index %d of the list of strings", i))); } else { softAssert.assertNotNull(value, AssertMessageBuilder.build(jsonPath, String.format("with null value on index %d of the list of strings", i))); diff --git a/NST/src/main/java/com/ebay/jsonpath/JPStringCheck.java b/NST/src/main/java/com/ebay/jsonpath/JPStringCheck.java index 184d5b1..e07e8b3 100644 --- a/NST/src/main/java/com/ebay/jsonpath/JPStringCheck.java +++ b/NST/src/main/java/com/ebay/jsonpath/JPStringCheck.java @@ -206,7 +206,7 @@ public void processJsonPath(String jsonPath, SoftAssert softAssert, DocumentCont return; } - if (isNull) { + if (isNullExpected()) { softAssert.assertNull(value, AssertMessageBuilder.build(jsonPath, "with non-null string")); } else { softAssert.assertNotNull(value, AssertMessageBuilder.build(jsonPath, "with null string."));