From d5c94c63033573a9324c28f7d7822277eb41bf0b Mon Sep 17 00:00:00 2001
From: Arne Juul <arnej@yahooinc.com>
Date: Thu, 15 Dec 2022 11:46:01 +0000
Subject: match JSON structure

---
 .../models/handler/OnnxEvaluationHandlerTest.java  | 38 ++++++++++------------
 1 file changed, 18 insertions(+), 20 deletions(-)

(limited to 'model-evaluation/src')

diff --git a/model-evaluation/src/test/java/ai/vespa/models/handler/OnnxEvaluationHandlerTest.java b/model-evaluation/src/test/java/ai/vespa/models/handler/OnnxEvaluationHandlerTest.java
index cc3f2863068..29795fbcd95 100644
--- a/model-evaluation/src/test/java/ai/vespa/models/handler/OnnxEvaluationHandlerTest.java
+++ b/model-evaluation/src/test/java/ai/vespa/models/handler/OnnxEvaluationHandlerTest.java
@@ -12,7 +12,6 @@ import com.yahoo.vespa.config.search.core.OnnxModelsConfig;
 import com.yahoo.vespa.config.search.core.RankingConstantsConfig;
 import com.yahoo.vespa.config.search.core.RankingExpressionsConfig;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import java.io.File;
@@ -32,36 +31,35 @@ public class OnnxEvaluationHandlerTest {
         handler = new HandlerTester(createModels());
     }
 
-    @Ignore
     @Test
     public void testListModels() {
         String url = "http://localhost/model-evaluation/v1";
         String expected = "{\"one_layer\":\"http://localhost/model-evaluation/v1/one_layer\"," +
                            "\"add_mul\":\"http://localhost/model-evaluation/v1/add_mul\"," +
                            "\"no_model\":\"http://localhost/model-evaluation/v1/no_model\"}";
-        handler.assertResponse(url, 200, expected);
+        handler.checkResponse(url, 200, HandlerTester.matchJson(expected));
     }
 
-    @Ignore
     @Test
     public void testModelInfo() {
         String url = "http://localhost/model-evaluation/v1/add_mul";
-        String expected = "{\"model\":\"add_mul\",\"functions\":[" +
-                "{\"function\":\"output1\"," +
-                    "\"info\":\"http://localhost/model-evaluation/v1/add_mul/output1\"," +
-                    "\"eval\":\"http://localhost/model-evaluation/v1/add_mul/output1/eval\"," +
-                    "\"arguments\":[" +
-                        "{\"name\":\"input1\",\"type\":\"tensor<float>(d0[1])\"}," +
-                        "{\"name\":\"input2\",\"type\":\"tensor<float>(d0[1])\"}" +
-                    "]}," +
-                "{\"function\":\"output2\"," +
-                    "\"info\":\"http://localhost/model-evaluation/v1/add_mul/output2\"," +
-                    "\"eval\":\"http://localhost/model-evaluation/v1/add_mul/output2/eval\"," +
-                    "\"arguments\":[" +
-                        "{\"name\":\"input1\",\"type\":\"tensor<float>(d0[1])\"}," +
-                        "{\"name\":\"input2\",\"type\":\"tensor<float>(d0[1])\"}" +
-                "]}]}";
-        handler.assertResponse(url, 200, expected);
+        var check = HandlerTester.matchJson(
+                "{'model':'add_mul','functions':[",
+                " {'function':'output1',",
+                "  'info':'http://localhost/model-evaluation/v1/add_mul/output1',",
+                "  'eval':'http://localhost/model-evaluation/v1/add_mul/output1/eval',",
+                "  'arguments':[",
+                "   {'name':'input1','type':'tensor<float>(d0[1])'},",
+                "   {'name':'input2','type':'tensor<float>(d0[1])'}",
+                "  ]},",
+                " {'function':'output2',",
+                "  'info':'http://localhost/model-evaluation/v1/add_mul/output2',",
+                "  'eval':'http://localhost/model-evaluation/v1/add_mul/output2/eval',",
+                "  'arguments':[",
+                "   {'name':'input1','type':'tensor<float>(d0[1])'},",
+                "   {'name':'input2','type':'tensor<float>(d0[1])'}",
+                "  ]}]}");
+        handler.checkResponse(url, 200, check);
     }
 
     @Test
-- 
cgit v1.2.3