diff options
author | Vegard Sjonfjell <vegard@yahoo-inc.com> | 2016-10-05 15:30:57 +0200 |
---|---|---|
committer | Vegard Sjonfjell <vegard@yahoo-inc.com> | 2016-10-05 15:30:57 +0200 |
commit | 23cd65bb2d4a25f2d52a70f573ce4a3e25ee6b8c (patch) | |
tree | 0f77181a8e2d36540a4ea00b456d00adbe91e607 /document/src | |
parent | 4ff27fe8063bbe8079d7ddcb49fb1cccaf6d633c (diff) |
Move JsonTestHelper to testutil
Diffstat (limited to 'document/src')
4 files changed, 4 insertions, 29 deletions
diff --git a/document/src/main/java/com/yahoo/document/json/JsonWriter.java b/document/src/main/java/com/yahoo/document/json/JsonWriter.java index 626c97a958a..420a6bb6669 100644 --- a/document/src/main/java/com/yahoo/document/json/JsonWriter.java +++ b/document/src/main/java/com/yahoo/document/json/JsonWriter.java @@ -112,6 +112,7 @@ public class JsonWriter implements DocumentWriter { Map.Entry<Field, FieldValue> entry = i.next(); entry.getValue().serialize(entry.getKey(), this); } + generator.writeEndObject(); generator.writeEndObject(); generator.flush(); diff --git a/document/src/test/java/com/yahoo/document/json/DocumentUpdateJsonSerializerTest.java b/document/src/test/java/com/yahoo/document/json/DocumentUpdateJsonSerializerTest.java index 53e7ed701a7..9a44ebc96d4 100644 --- a/document/src/test/java/com/yahoo/document/json/DocumentUpdateJsonSerializerTest.java +++ b/document/src/test/java/com/yahoo/document/json/DocumentUpdateJsonSerializerTest.java @@ -19,8 +19,8 @@ import java.io.ByteArrayOutputStream; import java.io.InputStream; import java.io.UnsupportedEncodingException; -import static com.yahoo.document.json.JsonTestHelper.assertJsonEquals; -import static com.yahoo.document.json.JsonTestHelper.inputJson; +import static com.yahoo.test.json.JsonTestHelper.assertJsonEquals; +import static com.yahoo.test.json.JsonTestHelper.inputJson; /** * @author Vegard Sjonfjell diff --git a/document/src/test/java/com/yahoo/document/json/JsonReaderTestCase.java b/document/src/test/java/com/yahoo/document/json/JsonReaderTestCase.java index 466a915f83f..206ab8e30f0 100644 --- a/document/src/test/java/com/yahoo/document/json/JsonReaderTestCase.java +++ b/document/src/test/java/com/yahoo/document/json/JsonReaderTestCase.java @@ -59,7 +59,7 @@ import java.util.Map; import java.util.Random; import java.util.Set; -import static com.yahoo.document.json.JsonTestHelper.inputJson; +import static com.yahoo.test.json.JsonTestHelper.inputJson; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.*; diff --git a/document/src/test/java/com/yahoo/document/json/JsonTestHelper.java b/document/src/test/java/com/yahoo/document/json/JsonTestHelper.java deleted file mode 100644 index 45128e6d02a..00000000000 --- a/document/src/test/java/com/yahoo/document/json/JsonTestHelper.java +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.document.json; -import com.google.common.base.Joiner; -import static org.hamcrest.MatcherAssert.assertThat; -import static uk.co.datumedge.hamcrest.json.SameJSONAs.sameJSONAs; - -/** - * @author Vegard Sjonfjell - */ -public class JsonTestHelper { - /** - * Convenience method to input JSON without escaping double quotes and newlines - * Each parameter represents a line of JSON encoded data - * The lines are joined with newline and single quotes are replaced with double quotes - */ - public static String inputJson(String... lines) { - return Joiner.on("\n").join(lines).replaceAll("'", "\""); - } - - /** - * Structurally compare two JSON encoded strings - */ - public static void assertJsonEquals(String inputJson, String expectedJson) { - assertThat(inputJson, sameJSONAs(expectedJson)); - } -} |