From e2ca1dab831acea34f47e9f9da1eb2d21d840f6b Mon Sep 17 00:00:00 2001
From: Vegard Sjonfjell <vegardsjo@gmail.com>
Date: Wed, 5 Oct 2016 16:15:49 +0200
Subject: Revert "Voffeloff/constant tensor validation"

---
 testutil/pom.xml                                   | 10 --------
 .../java/com/yahoo/test/json/JsonTestHelper.java   | 29 ----------------------
 2 files changed, 39 deletions(-)
 delete mode 100644 testutil/src/main/java/com/yahoo/test/json/JsonTestHelper.java

(limited to 'testutil')

diff --git a/testutil/pom.xml b/testutil/pom.xml
index bd46d2e4c16..0d2aa8a4dbf 100644
--- a/testutil/pom.xml
+++ b/testutil/pom.xml
@@ -14,11 +14,6 @@
     <name>${project.artifactId}</name>
     <description>Library of useful Hamcrest matchers.</description>
     <dependencies>
-        <dependency>
-          <groupId>com.google.guava</groupId>
-          <artifactId>guava</artifactId>
-          <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-core</artifactId>
@@ -29,11 +24,6 @@
             <artifactId>hamcrest-library</artifactId>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>uk.co.datumedge</groupId>
-            <artifactId>hamcrest-json</artifactId>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
diff --git a/testutil/src/main/java/com/yahoo/test/json/JsonTestHelper.java b/testutil/src/main/java/com/yahoo/test/json/JsonTestHelper.java
deleted file mode 100644
index a8e8e562b2d..00000000000
--- a/testutil/src/main/java/com/yahoo/test/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.test.json;
-
-import com.google.common.base.Joiner;
-import org.hamcrest.MatcherAssert;
-
-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) {
-        MatcherAssert.assertThat(inputJson, sameJSONAs(expectedJson));
-    }
-}
-- 
cgit v1.2.3