diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-02-03 11:16:16 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-02-03 11:16:16 +0100 |
commit | 7f3800f6e58771dca7ffe851cecb65d4b0e9763e (patch) | |
tree | 445870eadf4fd7575f736ca181957b197cd06ce6 /container-search | |
parent | 78ac77f602f7fe314812c3e8d7e13f6df02dfbab (diff) |
Also test the validator.
Diffstat (limited to 'container-search')
-rw-r--r-- | container-search/src/test/java/com/yahoo/search/rendering/JsonRendererTestCase.java | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/container-search/src/test/java/com/yahoo/search/rendering/JsonRendererTestCase.java b/container-search/src/test/java/com/yahoo/search/rendering/JsonRendererTestCase.java index 49df6dc2bc2..6189e009e91 100644 --- a/container-search/src/test/java/com/yahoo/search/rendering/JsonRendererTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/rendering/JsonRendererTestCase.java @@ -1122,6 +1122,16 @@ public class JsonRendererTestCase { assertEquals(");", jsonCallbackEnd); } + @Test + public void testThatTheJsonValidatorCanCatchErrors() { + String json = "{" + + " \"root\": {" + + " \"duplicate\": 1," + + " \"duplicate\": 2" + + " }" + + "}"; + assertEquals("Duplicate key \"duplicate\"", validateJSON(json)); + } private String render(Result r) throws InterruptedException, ExecutionException { Execution execution = new Execution(Execution.Context.createContextStub()); return render(execution, r); @@ -1141,16 +1151,15 @@ public class JsonRendererTestCase { Map<String, Object> exp = m.readValue(expected, Map.class); Map<String, Object> gen = m.readValue(generated, Map.class); assertEquals(exp, gen); - assertTrue(isValidJson(expected)); - assertTrue(isValidJson(generated)); + assertEquals("", validateJSON(expected)); + assertEquals("", validateJSON(generated)); } - private boolean isValidJson(String presumablyValidJson) { + private String validateJSON(String presumablyValidJson) { try { new JSONObject(presumablyValidJson); - return true; + return ""; } catch (JSONException e) { - assertEquals("", e.getMessage()); - return false; + return e.getMessage(); } } |