diff options
author | Vegard Sjonfjell <vegardsjo@gmail.com> | 2016-10-05 16:18:23 +0200 |
---|---|---|
committer | Vegard Sjonfjell <vegardsjo@gmail.com> | 2016-10-07 12:50:54 +0200 |
commit | 7141a841b0bd85342732072a235c45b78d896fba (patch) | |
tree | 1981275dc938af38278b947531ede7bcf9646e0f /document | |
parent | 92fa424e133b6da2e9d3b49231abf92e3adaa762 (diff) |
Revert "Revert "Voffeloff/constant tensor validation""
Diffstat (limited to 'document')
5 files changed, 10 insertions, 37 deletions
diff --git a/document/pom.xml b/document/pom.xml index 529107407ca..71713b27050 100644 --- a/document/pom.xml +++ b/document/pom.xml @@ -48,11 +48,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>uk.co.datumedge</groupId> - <artifactId>hamcrest-json</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>com.yahoo.vespa</groupId> <artifactId>config</artifactId> <version>${project.version}</version> @@ -83,6 +78,12 @@ <classifier>no_aop</classifier> <scope>provided</scope> </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>testutil</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> </dependencies> <build> <plugins> 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 b3deae547ab..de483186d6c 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 09e6a74e68a..00000000000 --- a/document/src/test/java/com/yahoo/document/json/JsonTestHelper.java +++ /dev/null @@ -1,29 +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)); - } - -} |