diff options
Diffstat (limited to 'config')
4 files changed, 6 insertions, 40 deletions
diff --git a/config/pom.xml b/config/pom.xml index 73c8cd5b5ad..3518426a7bd 100755 --- a/config/pom.xml +++ b/config/pom.xml @@ -62,11 +62,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>uk.co.datumedge</groupId> - <artifactId>hamcrest-json</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> <version>13.0.1</version> diff --git a/config/src/test/java/com/yahoo/config/subscription/CfgConfigPayloadBuilderTest.java b/config/src/test/java/com/yahoo/config/subscription/CfgConfigPayloadBuilderTest.java index 7ad7144a1c8..2bc1a10b729 100644 --- a/config/src/test/java/com/yahoo/config/subscription/CfgConfigPayloadBuilderTest.java +++ b/config/src/test/java/com/yahoo/config/subscription/CfgConfigPayloadBuilderTest.java @@ -11,8 +11,8 @@ import org.junit.Test; import java.util.Arrays; import java.util.List; -import static com.yahoo.config.subscription.util.JsonHelper.assertJsonEquals; -import static com.yahoo.config.subscription.util.JsonHelper.inputJson; +import static com.yahoo.test.json.JsonTestHelper.assertJsonEquals; +import static com.yahoo.test.json.JsonTestHelper.inputJson; import static org.junit.Assert.assertEquals; /** diff --git a/config/src/test/java/com/yahoo/config/subscription/ConfigInstanceSerializerTest.java b/config/src/test/java/com/yahoo/config/subscription/ConfigInstanceSerializerTest.java index d3713eaa401..342e50821f4 100644 --- a/config/src/test/java/com/yahoo/config/subscription/ConfigInstanceSerializerTest.java +++ b/config/src/test/java/com/yahoo/config/subscription/ConfigInstanceSerializerTest.java @@ -1,22 +1,21 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.config.subscription; -import com.yahoo.foo.ArraytypesConfig; import com.yahoo.config.ConfigInstance; +import com.yahoo.foo.ArraytypesConfig; +import com.yahoo.foo.MaptypesConfig; import com.yahoo.foo.SimpletypesConfig; import com.yahoo.foo.SpecialtypesConfig; import com.yahoo.foo.StructtypesConfig; -import com.yahoo.foo.MaptypesConfig; import com.yahoo.slime.JsonFormat; import com.yahoo.slime.Slime; - import org.junit.Test; import java.io.ByteArrayOutputStream; import java.io.IOException; -import static com.yahoo.config.subscription.util.JsonHelper.assertJsonEquals; -import static com.yahoo.config.subscription.util.JsonHelper.inputJson; +import static com.yahoo.test.json.JsonTestHelper.assertJsonEquals; +import static com.yahoo.test.json.JsonTestHelper.inputJson; import static org.junit.Assert.fail; /** diff --git a/config/src/test/java/com/yahoo/config/subscription/util/JsonHelper.java b/config/src/test/java/com/yahoo/config/subscription/util/JsonHelper.java deleted file mode 100644 index 27ac1a1278c..00000000000 --- a/config/src/test/java/com/yahoo/config/subscription/util/JsonHelper.java +++ /dev/null @@ -1,28 +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.config.subscription.util; - -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 JsonHelper { - /** - * 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)); - } -} |