summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorMorten Tokle <mortent@verizonmedia.com>2019-07-31 15:21:01 +0200
committerMorten Tokle <mortent@verizonmedia.com>2019-07-31 15:21:01 +0200
commit43ae4056b6d91dd1972a5c2d6c88305c727e3af3 (patch)
tree31104a278f83af0aaf86a97059ee31adf2ea8569 /application
parentd6a378f4acd925a0d79608c979718d4b1e438238 (diff)
Ignore order in serialized JSON
Diffstat (limited to 'application')
-rw-r--r--application/pom.xml7
-rw-r--r--application/src/test/java/com/yahoo/application/container/ContainerModelEvaluationTest.java3
2 files changed, 8 insertions, 2 deletions
diff --git a/application/pom.xml b/application/pom.xml
index f9f3e8394af..20b754fc236 100644
--- a/application/pom.xml
+++ b/application/pom.xml
@@ -134,7 +134,12 @@
<artifactId>httpclient</artifactId>
<scope>test</scope>
</dependency>
-
+ <dependency>
+ <groupId>com.yahoo.vespa</groupId>
+ <artifactId>testutil</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
<!-- These dependencies are necessary in test classpath when using jdisc_http_filters -->
<dependency>
diff --git a/application/src/test/java/com/yahoo/application/container/ContainerModelEvaluationTest.java b/application/src/test/java/com/yahoo/application/container/ContainerModelEvaluationTest.java
index 66a7ae579fa..6a2b7945d73 100644
--- a/application/src/test/java/com/yahoo/application/container/ContainerModelEvaluationTest.java
+++ b/application/src/test/java/com/yahoo/application/container/ContainerModelEvaluationTest.java
@@ -7,6 +7,7 @@ import com.yahoo.application.container.handler.Request;
import com.yahoo.application.container.handler.Response;
import com.yahoo.tensor.Tensor;
import com.yahoo.tensor.TensorType;
+import com.yahoo.test.json.JsonTestHelper;
import org.junit.Ignore;
import org.junit.Test;
@@ -64,7 +65,7 @@ public class ContainerModelEvaluationTest {
private void assertResponse(String url, String expectedResponse, JDisc jdisc) {
try {
Response response = jdisc.handleRequest(new Request(url));
- assertEquals(expectedResponse, response.getBodyAsString());
+ JsonTestHelper.assertJsonEquals(expectedResponse, response.getBodyAsString());
assertEquals(200, response.getStatus());
}
catch (CharacterCodingException e) {