diff --git a/json-path-assert/README.md b/json-path-assert/README.md index a6e94a2d..a56b9a51 100644 --- a/json-path-assert/README.md +++ b/json-path-assert/README.md @@ -80,3 +80,46 @@ Use typed matchers for specific JSON representations, if needed File json = ... assertThat(json, isJsonFile(withJsonPath("$..author"))); + +--- + +### Regarding the use of indefinite paths + +When using indefinite path expressions (e.g with wildcards '*'), the result will yield a list. Possibly an _empty_ list if no matching entries were found. If you want to assert that the list will actually contain something, make sure to express this explicitly, e.g checking for the size of the list. + + // Given a JSON like this: + { + "items": [] + } + + // Both of these statements will succeed(!) + assertThat(json, hasJsonPath("$.items[*]")); + assertThat(json, hasJsonPath("$.items[*].name")); + + // Make sure to explicitly check for size if you want to catch this scenario as a failure + assertThat(json, hasJsonPath("$.items[*]", hasSize(greaterThan(0)))); + + // However, checking for the existence of an array works fine, as is + assertThat(json, hasJsonPath("$.not_here[*]")); + +--- + +### Regarding the use of null in JSON + +'null' is a valid JSON value. If such a value exist, the path is still considered to be a valid path. + + // Given a JSON like this: + { "none": null } + + // All of these will succeed, since '$.none' is a valid path + assertThat(json, hasJsonPath("$.none")); + assertThat(json, isJson(withJsonPath("$.none"))); + assertThat(json, hasJsonPath("$.none", nullValue())); + assertThat(json, isJson(withJsonPath("$.none", nullValue()))); + + // But all of these will fail, since '$.not_there' is not a valid path + assertThat(json, hasJsonPath("$.not_there")); + assertThat(json, isJson(withJsonPath("$.not_there"))); + assertThat(json, hasJsonPath("$.not_there", anything())); + assertThat(json, isJson(withJsonPath("$.not_there", anything()))); + diff --git a/json-path-assert/src/main/java/com/jayway/jsonpath/matchers/JsonPathMatchers.java b/json-path-assert/src/main/java/com/jayway/jsonpath/matchers/JsonPathMatchers.java index c89c42cc..6f4c66da 100644 --- a/json-path-assert/src/main/java/com/jayway/jsonpath/matchers/JsonPathMatchers.java +++ b/json-path-assert/src/main/java/com/jayway/jsonpath/matchers/JsonPathMatchers.java @@ -6,6 +6,8 @@ import com.jayway.jsonpath.ReadContext; import org.hamcrest.Matcher; import java.io.File; +import java.util.List; +import java.util.Map; import static org.hamcrest.Matchers.*; @@ -17,11 +19,11 @@ public class JsonPathMatchers { public static Matcher hasJsonPath(String jsonPath) { return describedAs("has json path %0", - hasJsonPath(jsonPath, not(anyOf(nullValue(), empty()))), + isJson(withJsonPath(jsonPath)), jsonPath); } - public static Matcher hasJsonPath(final String jsonPath, final Matcher resultMatcher) { + public static Matcher hasJsonPath(String jsonPath, Matcher resultMatcher) { return isJson(withJsonPath(jsonPath, resultMatcher)); } @@ -30,18 +32,18 @@ public class JsonPathMatchers { } public static Matcher isJson() { - return isJson(withJsonPath("$..*")); + return isJson(withJsonPath("$", anyOf(instanceOf(Map.class), instanceOf(List.class)))); } - public static Matcher isJson(final Matcher matcher) { + public static Matcher isJson(Matcher matcher) { return new IsJson(matcher); } - public static Matcher isJsonString(final Matcher matcher) { + public static Matcher isJsonString(Matcher matcher) { return new IsJson(matcher); } - public static Matcher isJsonFile(final Matcher matcher) { + public static Matcher isJsonFile(Matcher matcher) { return new IsJson(matcher); } @@ -51,7 +53,7 @@ public class JsonPathMatchers { public static Matcher withJsonPath(JsonPath jsonPath) { return describedAs("with json path %0", - withJsonPath(jsonPath, not(anyOf(nullValue(), empty()))), + withJsonPath(jsonPath, anything()), jsonPath.getPath()); } @@ -67,7 +69,7 @@ public class JsonPathMatchers { return withJsonPath(JsonPath.compile(jsonPath), resultMatcher); } - public static Matcher withJsonPath(final JsonPath jsonPath, final Matcher resultMatcher) { + public static Matcher withJsonPath(JsonPath jsonPath, Matcher resultMatcher) { return new WithJsonPath(jsonPath, resultMatcher); } } diff --git a/json-path-assert/src/main/java/com/jayway/jsonpath/matchers/WithoutJsonPath.java b/json-path-assert/src/main/java/com/jayway/jsonpath/matchers/WithoutJsonPath.java index b339d5df..d14a12b0 100644 --- a/json-path-assert/src/main/java/com/jayway/jsonpath/matchers/WithoutJsonPath.java +++ b/json-path-assert/src/main/java/com/jayway/jsonpath/matchers/WithoutJsonPath.java @@ -6,8 +6,6 @@ import com.jayway.jsonpath.ReadContext; import org.hamcrest.Description; import org.hamcrest.TypeSafeDiagnosingMatcher; -import static org.hamcrest.Matchers.empty; - public class WithoutJsonPath extends TypeSafeDiagnosingMatcher { private final JsonPath jsonPath; @@ -23,7 +21,7 @@ public class WithoutJsonPath extends TypeSafeDiagnosingMatcher { .appendText(jsonPath.getPath()) .appendText(" was evaluated to ") .appendValue(value); - return value == null || empty().matches(value); + return false; } catch (JsonPathException e) { return true; } diff --git a/json-path-assert/src/test/java/com/jayway/jsonpath/matchers/HasNoJsonPathTest.java b/json-path-assert/src/test/java/com/jayway/jsonpath/matchers/HasNoJsonPathTest.java new file mode 100644 index 00000000..edd4ca9e --- /dev/null +++ b/json-path-assert/src/test/java/com/jayway/jsonpath/matchers/HasNoJsonPathTest.java @@ -0,0 +1,30 @@ +package com.jayway.jsonpath.matchers; + +import org.junit.Test; + +import static com.jayway.jsonpath.matchers.JsonPathMatchers.hasNoJsonPath; +import static org.hamcrest.Matchers.*; +import static org.junit.Assert.assertThat; + +public class HasNoJsonPathTest { + private static final String JSON_STRING = "{" + + "\"name\": \"Jessie\"" + + "}"; + + @Test + public void shouldMatchMissingJsonPath() { + assertThat(JSON_STRING, hasNoJsonPath("$.not_there")); + } + + @Test + public void shouldNotMatchExistingJsonPath() { + assertThat(JSON_STRING, not(hasNoJsonPath("$.name"))); + } + + @Test + public void shouldBeDescriptive() { + assertThat(hasNoJsonPath("$.name"), + hasToString(equalTo("is json without json path \"$['name']\""))); + } + +} diff --git a/json-path-assert/src/test/java/com/jayway/jsonpath/matchers/IsJsonTest.java b/json-path-assert/src/test/java/com/jayway/jsonpath/matchers/IsJsonTest.java index 0d08aa02..dc4325ff 100644 --- a/json-path-assert/src/test/java/com/jayway/jsonpath/matchers/IsJsonTest.java +++ b/json-path-assert/src/test/java/com/jayway/jsonpath/matchers/IsJsonTest.java @@ -20,8 +20,11 @@ import static org.hamcrest.Matchers.*; import static org.junit.Assert.assertThat; public class IsJsonTest { + private static final String VALID_JSON = resource("example.json"); + private static final String INVALID_JSON = "{ invalid-json }"; private static final String BOOKS_JSON_STRING = resource("books.json"); private static final File BOOKS_JSON_FILE = resourceAsFile("books.json"); + private static final Object BOOKS_JSON_PARSED = parseJson(BOOKS_JSON_STRING); @BeforeClass public static void setupStrictJsonParsing() { @@ -33,16 +36,52 @@ public class IsJsonTest { Configuration.setDefaults(null); } + @Test + public void shouldMatchOnEmptyJsonObject() { + assertThat("{}", isJson()); + } + + @Test + public void shouldMatchOnJsonObject() { + assertThat("{ \"hi\" : \"there\" }", isJson()); + } + + @Test + public void shouldMatchOnEmptyJsonArray() { + assertThat("[]", isJson()); + } + + @Test + public void shouldMatchOnJsonArray() { + assertThat("[\"hi\", \"there\"]", isJson()); + } + + @Test + public void shouldMatchValidJson() { + assertThat(VALID_JSON, isJson()); + assertThat(BOOKS_JSON_STRING, isJson()); + } + + @Test + public void shouldNotMatchInvalidJson() { + assertThat(INVALID_JSON, not(isJson())); + assertThat(new Object(), not(isJson())); + assertThat(new Object[]{}, not(isJson())); + assertThat("hi there", not(isJson())); + assertThat(new Integer(42), not(isJson())); + assertThat(Boolean.TRUE, not(isJson())); + assertThat(false, not(isJson())); + assertThat(null, not(isJson())); + } + @Test public void shouldMatchJsonObjectEvaluatedToTrue() { - Object parsedJson = parseJson(BOOKS_JSON_STRING); - assertThat(parsedJson, isJson(withPathEvaluatedTo(true))); + assertThat(BOOKS_JSON_PARSED, isJson(withPathEvaluatedTo(true))); } @Test public void shouldNotMatchJsonObjectEvaluatedToFalse() { - Object parsedJson = parseJson(BOOKS_JSON_STRING); - assertThat(parsedJson, not(isJson(withPathEvaluatedTo(false)))); + assertThat(BOOKS_JSON_PARSED, not(isJson(withPathEvaluatedTo(false)))); } @Test @@ -65,6 +104,12 @@ public class IsJsonTest { assertThat(BOOKS_JSON_FILE, not(isJson(withPathEvaluatedTo(false)))); } + @Test + public void shouldNotMatchNonExistingJsonFile() { + File nonExistingFile = new File("missing-file"); + assertThat(nonExistingFile, not(isJson())); + } + @Test public void shouldBeDescriptive() { Matcher matcher = isJson(withPathEvaluatedTo(true)); diff --git a/json-path-assert/src/test/java/com/jayway/jsonpath/matchers/JsonPathMatchersTest.java b/json-path-assert/src/test/java/com/jayway/jsonpath/matchers/JsonPathMatchersTest.java index f52edafd..bb287fc3 100644 --- a/json-path-assert/src/test/java/com/jayway/jsonpath/matchers/JsonPathMatchersTest.java +++ b/json-path-assert/src/test/java/com/jayway/jsonpath/matchers/JsonPathMatchersTest.java @@ -7,8 +7,8 @@ import org.junit.BeforeClass; import org.junit.Test; import java.io.File; -import java.nio.file.Paths; -import java.util.Collection; +import java.util.List; +import java.util.Map; import static com.jayway.jsonpath.matchers.JsonPathMatchers.*; import static com.jayway.jsonpath.matchers.helpers.ResourceHelpers.resource; @@ -17,8 +17,6 @@ import static org.hamcrest.Matchers.*; import static org.junit.Assert.assertThat; public class JsonPathMatchersTest { - - private static final String VALID_JSON = resource("example.json"); private static final String BOOKS_JSON = resource("books.json"); private static final String INVALID_JSON = "{ invalid-json }"; private static final File BOOKS_JSON_FILE = resourceAsFile("books.json"); @@ -35,84 +33,164 @@ public class JsonPathMatchersTest { } @Test - public void shouldMatchValidJson() { - assertThat(VALID_JSON, isJson()); - assertThat(BOOKS_JSON, isJson()); + public void shouldMatchJsonPathToStringValue() { + final String json = "{\"name\": \"Jessie\"}"; + + assertThat(json, hasJsonPath("$.name")); + assertThat(json, isJson(withJsonPath("$.name"))); + assertThat(json, hasJsonPath("$.name", equalTo("Jessie"))); + assertThat(json, isJson(withJsonPath("$.name", equalTo("Jessie")))); + + assertThat(json, not(hasJsonPath("$.name", equalTo("John")))); + assertThat(json, not(isJson(withJsonPath("$.name", equalTo("John"))))); } @Test - public void shouldNotMatchInvalidJson() { - assertThat(INVALID_JSON, not(isJson())); - assertThat(new Object(), not(isJson())); - assertThat("{}", not(isJson())); - assertThat(null, not(isJson())); + public void shouldMatchJsonPathToIntegerValue() { + final String json = "{\"number\": 10}"; + + assertThat(json, hasJsonPath("$.number")); + assertThat(json, isJson(withJsonPath("$.number"))); + assertThat(json, hasJsonPath("$.number", equalTo(10))); + assertThat(json, isJson(withJsonPath("$.number", equalTo(10)))); + + assertThat(json, not(hasJsonPath("$.number", equalTo(3)))); + assertThat(json, not(isJson(withJsonPath("$.number", equalTo(3))))); } @Test - public void shouldMatchExistingJsonPath() { - assertThat(BOOKS_JSON, hasJsonPath("$.store.name")); - assertThat(BOOKS_JSON, hasJsonPath("$.store.book[2].title")); - assertThat(BOOKS_JSON, hasJsonPath("$.store.book[*].author")); + public void shouldMatchJsonPathToDoubleValue() { + final String json = "{\"price\": 19.95}"; + + assertThat(json, hasJsonPath("$.price")); + assertThat(json, isJson(withJsonPath("$.price"))); + assertThat(json, hasJsonPath("$.price", equalTo(19.95))); + assertThat(json, isJson(withJsonPath("$.price", equalTo(19.95)))); + + assertThat(json, not(hasJsonPath("$.price", equalTo(3.3)))); + assertThat(json, not(isJson(withJsonPath("$.price", equalTo(42))))); } @Test - public void shouldMatchExistingJsonPathAlternative() { - assertThat(BOOKS_JSON, isJson(withJsonPath("$.store.name"))); - assertThat(BOOKS_JSON, isJson(withJsonPath("$.store.book[2].title"))); - assertThat(BOOKS_JSON, isJson(withJsonPath("$.store.book[*].author"))); + public void shouldMatchJsonPathToBooleanValue() { + final String json = "{\"flag\": false}"; + + assertThat(json, hasJsonPath("$.flag")); + assertThat(json, isJson(withJsonPath("$.flag"))); + assertThat(json, hasJsonPath("$.flag", equalTo(false))); + assertThat(json, isJson(withJsonPath("$.flag", equalTo(false)))); + + assertThat(json, not(hasJsonPath("$.flag", equalTo(true)))); + assertThat(json, not(isJson(withJsonPath("$.flag", equalTo(true))))); } @Test - public void shouldNotMatchInvalidJsonWithPath() { - assertThat(INVALID_JSON, not(hasJsonPath("$.path"))); - assertThat(new Object(), not(hasJsonPath("$.path"))); - assertThat("{}", not(hasJsonPath("$.path"))); - assertThat(null, not(hasJsonPath("$.path"))); + public void shouldMatchJsonPathToJsonObject() { + final String json = "{\"object\": { \"name\":\"Oscar\"}}"; + + assertThat(json, hasJsonPath("$.object")); + assertThat(json, isJson(withJsonPath("$.object"))); + assertThat(json, hasJsonPath("$.object", instanceOf(Map.class))); + assertThat(json, isJson(withJsonPath("$.object", instanceOf(Map.class)))); + + assertThat(json, not(hasJsonPath("$.object", instanceOf(List.class)))); + assertThat(json, not(isJson(withJsonPath("$.object", instanceOf(List.class))))); } @Test - public void shouldNotMatchInvalidJsonWithPathAndValue() { - assertThat(INVALID_JSON, not(hasJsonPath("$.path", anything()))); - assertThat(new Object(), not(hasJsonPath("$.path", anything()))); - assertThat(null, not(hasJsonPath("$.message", anything()))); + public void shouldMatchJsonPathToEmptyJsonObject() { + final String json = "{\"empty_object\": {}}"; + + assertThat(json, hasJsonPath("$.empty_object")); + assertThat(json, isJson(withJsonPath("$.empty_object"))); + assertThat(json, hasJsonPath("$.empty_object", instanceOf(Map.class))); + assertThat(json, isJson(withJsonPath("$.empty_object", instanceOf(Map.class)))); + + assertThat(json, not(hasJsonPath("$.empty_object", instanceOf(List.class)))); + assertThat(json, not(isJson(withJsonPath("$.empty_object", instanceOf(List.class))))); } @Test - public void shouldNotMatchNonExistingJsonPath() { - assertThat(BOOKS_JSON, not(hasJsonPath("$.not_there"))); - assertThat(BOOKS_JSON, not(hasJsonPath("$.store.book[5].title"))); - assertThat(BOOKS_JSON, not(hasJsonPath("$.store.book[*].not_there"))); + public void shouldMatchJsonPathToJsonArray() { + final String json = "{\"list\": [ \"one\",\"two\",\"three\"]}"; + + assertThat(json, hasJsonPath("$.list")); + assertThat(json, hasJsonPath("$.list[*]")); + assertThat(json, isJson(withJsonPath("$.list"))); + assertThat(json, isJson(withJsonPath("$.list[*]"))); + assertThat(json, hasJsonPath("$.list", contains("one", "two", "three"))); + assertThat(json, isJson(withJsonPath("$.list", hasItem("two")))); + + assertThat(json, not(hasJsonPath("$.list", hasSize(2)))); + assertThat(json, not(isJson(withJsonPath("$.list", contains("four"))))); } @Test - public void shouldNotMatchNonExistingJsonPathAlternative() { - assertThat(BOOKS_JSON, not(isJson(withJsonPath("$.not_there")))); - assertThat(BOOKS_JSON, not(isJson(withJsonPath("$.store.book[5].title")))); - assertThat(BOOKS_JSON, not(isJson(withJsonPath("$.store.book[*].not_there")))); + public void shouldMatchJsonPathToEmptyJsonArray() { + final String json = "{\"empty_list\": []}"; + + assertThat(json, hasJsonPath("$.empty_list")); + assertThat(json, hasJsonPath("$.empty_list[*]")); + assertThat(json, isJson(withJsonPath("$.empty_list"))); + assertThat(json, isJson(withJsonPath("$.empty_list[*]"))); + assertThat(json, hasJsonPath("$.empty_list", empty())); + assertThat(json, isJson(withJsonPath("$.empty_list", hasSize(0)))); + + assertThat(json, not(hasJsonPath("$.empty_list", hasSize(2)))); + assertThat(json, not(isJson(withJsonPath("$.empty_list", contains("four"))))); } @Test - public void shouldMatchJsonPathWithStringValue() { - assertThat(BOOKS_JSON, hasJsonPath("$.store.name", equalTo("Little Shop"))); - assertThat(BOOKS_JSON, hasJsonPath("$.store.book[2].title", equalTo("Moby Dick"))); + public void willMatchIndefiniteJsonPathsEvaluatedToEmptyLists() { + // This is just a test to demonstrate that indefinite paths + // will always match, regardless of result. This is because + // the evaluation of these expressions will return lists, + // even though they may be empty. + String json = "{\"items\": []}"; + assertThat(json, hasJsonPath("$.items[*].name")); + assertThat(json, hasJsonPath("$.items[*]")); + assertThat(json, hasJsonPath("$.items[*]", hasSize(0))); } @Test - public void shouldMatchJsonPathWithIntegerValue() { - assertThat(BOOKS_JSON, hasJsonPath("$.expensive", equalTo(10))); + public void shouldMatchJsonPathToNullValue() { + final String json = "{\"none\": null}"; + + assertThat(json, hasJsonPath("$.none")); + assertThat(json, isJson(withJsonPath("$.none"))); + assertThat(json, hasJsonPath("$.none", nullValue())); + assertThat(json, isJson(withJsonPath("$.none", nullValue()))); + + assertThat(json, not(hasJsonPath("$.none", equalTo("something")))); + assertThat(json, not(isJson(withJsonPath("$.none", empty())))); } @Test - public void shouldMatchJsonPathWithDoubleValue() { - assertThat(BOOKS_JSON, hasJsonPath("$.store.bicycle.price", equalTo(19.95))); + public void shouldNotMatchNonExistingJsonPath() { + final String json = "{}"; + + assertThat(json, not(hasJsonPath("$.not_there"))); + assertThat(json, not(hasJsonPath("$.not_there", anything()))); + assertThat(json, not(hasJsonPath("$.not_there[*]"))); + assertThat(json, not(hasJsonPath("$.not_there[*]", anything()))); + assertThat(json, not(isJson(withJsonPath("$.not_there")))); + assertThat(json, not(isJson(withJsonPath("$.not_there", anything())))); + assertThat(json, not(isJson(withJsonPath("$.not_there[*]")))); + assertThat(json, not(isJson(withJsonPath("$.not_there[*]", anything())))); } @Test - public void shouldMatchJsonPathWithCollectionValue() { - assertThat(BOOKS_JSON, hasJsonPath("$.store.book[*].author", instanceOf(Collection.class))); - assertThat(BOOKS_JSON, hasJsonPath("$.store.book[*].author", hasSize(4))); - assertThat(BOOKS_JSON, hasJsonPath("$.store.book[*].author", hasItem("Evelyn Waugh"))); - assertThat(BOOKS_JSON, hasJsonPath("$..book[2].title", hasItem("Moby Dick"))); + public void shouldNotMatchInvalidJsonWithPath() { + assertThat(INVALID_JSON, not(hasJsonPath("$.path"))); + assertThat(new Object(), not(hasJsonPath("$.path"))); + assertThat(null, not(hasJsonPath("$.path"))); + } + + @Test + public void shouldNotMatchInvalidJsonWithPathAndValue() { + assertThat(INVALID_JSON, not(hasJsonPath("$.path", anything()))); + assertThat(new Object(), not(hasJsonPath("$.path", anything()))); + assertThat(null, not(hasJsonPath("$.message", anything()))); } @Test @@ -122,7 +200,7 @@ public class JsonPathMatchersTest { @Test public void shouldNotMatchJsonPathOnNonExistingFile() { - File nonExistingFile = Paths.get("missing-file").toFile(); + File nonExistingFile = new File("missing-file"); assertThat(nonExistingFile, not(hasJsonPath("$..*", anything()))); } @@ -131,14 +209,4 @@ public class JsonPathMatchersTest { Object json = Configuration.defaultConfiguration().jsonProvider().parse(BOOKS_JSON); assertThat(json, hasJsonPath("$.store.name", equalTo("Little Shop"))); } - - @Test - public void shouldMatchMissingJsonPath() { - assertThat(BOOKS_JSON, hasNoJsonPath("$.not_there")); - } - - @Test - public void shouldNotMatchExistingJsonPath() { - assertThat(BOOKS_JSON, not(hasNoJsonPath("$.store.name"))); - } } diff --git a/json-path-assert/src/test/java/com/jayway/jsonpath/matchers/WithJsonPathTest.java b/json-path-assert/src/test/java/com/jayway/jsonpath/matchers/WithJsonPathTest.java index 6b26cd0c..31b09608 100644 --- a/json-path-assert/src/test/java/com/jayway/jsonpath/matchers/WithJsonPathTest.java +++ b/json-path-assert/src/test/java/com/jayway/jsonpath/matchers/WithJsonPathTest.java @@ -9,10 +9,10 @@ import org.hamcrest.StringDescription; import org.junit.Test; import java.util.Collection; +import java.util.List; import static com.jayway.jsonpath.JsonPath.compile; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; -import static com.jayway.jsonpath.matchers.JsonPathMatchers.withoutJsonPath; import static com.jayway.jsonpath.matchers.helpers.ResourceHelpers.resource; import static org.hamcrest.Matchers.*; import static org.junit.Assert.assertThat; @@ -40,34 +40,14 @@ public class WithJsonPathTest { public void shouldNotMatchNonExistingJsonPath() { assertThat(BOOKS_JSON, not(withJsonPath(compile("$.not_there")))); assertThat(BOOKS_JSON, not(withJsonPath(compile("$.store.book[5].title")))); - assertThat(BOOKS_JSON, not(withJsonPath(compile("$.store.book[*].not_there")))); + assertThat(BOOKS_JSON, not(withJsonPath(compile("$.store.book[1].not_there")))); } @Test public void shouldNotMatchNonExistingStringJsonPath() { assertThat(BOOKS_JSON, not(withJsonPath("$.not_there"))); assertThat(BOOKS_JSON, not(withJsonPath("$.store.book[5].title"))); - assertThat(BOOKS_JSON, not(withJsonPath("$.store.book[*].not_there"))); - } - - @Test - public void shouldMatchNonExistingJsonPath() { - assertThat(BOOKS_JSON, withoutJsonPath(compile("$.not_there"))); - } - - @Test - public void shouldMatchNonExistingStringJsonPath() { - assertThat(BOOKS_JSON, withoutJsonPath("$.not_there")); - } - - @Test - public void shouldNotMatchExistingCompiledJsonPath() { - assertThat(BOOKS_JSON, not(withoutJsonPath(compile("$.store.name")))); - } - - @Test - public void shouldNotMatchExistingStringJsonPath() { - assertThat(BOOKS_JSON, not(withoutJsonPath("$.store.name"))); + assertThat(BOOKS_JSON, not(withJsonPath("$.store.book[1].not_there"))); } @Test @@ -92,7 +72,7 @@ public class WithJsonPathTest { @Test public void shouldMatchJsonPathEvaluatedToCollectionValue() { - assertThat(BOOKS_JSON, withJsonPath(compile("$.store.book[*].author"), instanceOf(Collection.class))); + assertThat(BOOKS_JSON, withJsonPath(compile("$.store.book[*].author"), instanceOf(List.class))); assertThat(BOOKS_JSON, withJsonPath(compile("$.store.book[*].author"), hasSize(4))); assertThat(BOOKS_JSON, withJsonPath(compile("$.store.book[*].author"), hasItem("Evelyn Waugh"))); assertThat(BOOKS_JSON, withJsonPath(compile("$..book[2].title"), hasItem("Moby Dick"))); diff --git a/json-path-assert/src/test/java/com/jayway/jsonpath/matchers/WithoutJsonPathTest.java b/json-path-assert/src/test/java/com/jayway/jsonpath/matchers/WithoutJsonPathTest.java new file mode 100644 index 00000000..a2fe7f31 --- /dev/null +++ b/json-path-assert/src/test/java/com/jayway/jsonpath/matchers/WithoutJsonPathTest.java @@ -0,0 +1,44 @@ +package com.jayway.jsonpath.matchers; + +import com.jayway.jsonpath.JsonPath; +import com.jayway.jsonpath.ReadContext; +import org.junit.Test; + +import static com.jayway.jsonpath.JsonPath.compile; +import static com.jayway.jsonpath.matchers.JsonPathMatchers.withoutJsonPath; +import static org.hamcrest.Matchers.*; +import static org.junit.Assert.assertThat; + +public class WithoutJsonPathTest { + private static final String JSON_STRING = "{" + + "\"name\": \"Jessie\"," + + "\"flag\": false," + + "\"empty_array\": []," + + "\"empty_object\": {}," + + "\"none\": null" + + "}"; + private static final ReadContext JSON = JsonPath.parse(JSON_STRING); + + @Test + public void shouldMatchNonExistingJsonPath() { + assertThat(JSON, withoutJsonPath(compile("$.not_there"))); + assertThat(JSON, withoutJsonPath("$.not_there")); + } + + @Test + public void shouldNotMatchExistingJsonPath() { + assertThat(JSON, not(withoutJsonPath(compile("$.name")))); + assertThat(JSON, not(withoutJsonPath("$.name"))); + assertThat(JSON, not(withoutJsonPath("$.flag"))); + assertThat(JSON, not(withoutJsonPath("$.empty_array"))); + assertThat(JSON, not(withoutJsonPath("$.empty_object"))); + assertThat(JSON, not(withoutJsonPath("$.none"))); + } + + @Test + public void shouldBeDescriptive() { + assertThat(withoutJsonPath("$.name"), + hasToString(equalTo("without json path \"$['name']\""))); + } + +} diff --git a/json-path-assert/src/test/java/com/jayway/jsonpath/matchers/helpers/ResourceHelpers.java b/json-path-assert/src/test/java/com/jayway/jsonpath/matchers/helpers/ResourceHelpers.java index c2c8724a..6c263850 100644 --- a/json-path-assert/src/test/java/com/jayway/jsonpath/matchers/helpers/ResourceHelpers.java +++ b/json-path-assert/src/test/java/com/jayway/jsonpath/matchers/helpers/ResourceHelpers.java @@ -4,11 +4,8 @@ import org.apache.commons.io.IOUtils; import java.io.File; import java.io.IOException; -import java.net.URI; import java.net.URISyntaxException; import java.net.URL; -import java.nio.file.Path; -import java.nio.file.Paths; import static java.lang.ClassLoader.getSystemResource; import static java.lang.ClassLoader.getSystemResourceAsStream; @@ -18,18 +15,16 @@ public class ResourceHelpers { try { return IOUtils.toString(getSystemResourceAsStream(resource)); } catch (IOException e) { - throw new AssertionError("Resource not found", e); + throw new AssertionError("Resource not found: " + e.getMessage()); } } public static File resourceAsFile(String resource) { try { URL systemResource = getSystemResource(resource); - URI uri = systemResource.toURI(); - Path path = Paths.get(uri); - return path.toFile(); + return new File(systemResource.toURI()); } catch (URISyntaxException e) { - throw new AssertionError("URI syntax error", e); + throw new AssertionError("URI syntax error:" + e.getMessage()); } } } diff --git a/json-path-assert/src/test/resources/books.json b/json-path-assert/src/test/resources/books.json index f009f4ba..5d049d21 100644 --- a/json-path-assert/src/test/resources/books.json +++ b/json-path-assert/src/test/resources/books.json @@ -1,6 +1,10 @@ { "store": { "name": "Little Shop", + "none": null, + "switch": true, + "magazine": [], + "truck": {}, "book": [ { "category": "reference",