Do Vespa 7 TODOs

4 files changed, 18 insertions, 20 deletions

diff --git a/container-search/src/test/java/com/yahoo/prelude/searcher/test/BlendingSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/searcher/test/BlendingSearcherTestCase.java
index fae869c5235..47009eb703b 100644
--- a/container-search/src/test/java/com/yahoo/prelude/searcher/test/BlendingSearcherTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/searcher/test/BlendingSearcherTestCase.java
@@ -51,20 +51,20 @@ public class BlendingSearcherTestCase {
         private final Map<String, Searcher> searchers = new HashMap<>();
         private SearchChainRegistry chainRegistry;
 
-        private final String blendingDocumentId;
+        private final String blendingField;
 
         public BlendingSearcherWrapper() {
-            blendingDocumentId = null;
+            blendingField = null;
         }
 
-        public BlendingSearcherWrapper(String blendingDocumentId) {
-            this.blendingDocumentId = blendingDocumentId;
+        public BlendingSearcherWrapper(String blendingField) {
+            this.blendingField = blendingField;
         }
 
         @SuppressWarnings("serial")
         public BlendingSearcherWrapper(QrSearchersConfig cfg) {
             QrSearchersConfig.Com.Yahoo.Prelude.Searcher.BlendingSearcher s = cfg.com().yahoo().prelude().searcher().BlendingSearcher();
-            blendingDocumentId = s.docid().length() > 0 ? s.docid() : null;
+            blendingField = s.docid().length() > 0 ? s.docid() : null;
         }
 
         public boolean addChained(Searcher searcher, String sourceName) {
@@ -109,7 +109,7 @@ public class BlendingSearcherTestCase {
 
             FederationSearcher fedSearcher =
                     new FederationSearcher(new FederationConfig(builder), contracts, new ComponentRegistry<>());
-            BlendingSearcher blendingSearcher = new BlendingSearcher(blendingDocumentId);
+            BlendingSearcher blendingSearcher = new BlendingSearcher(blendingField);
             blendingChain = new SearchChain(ComponentId.createAnonymousComponentId("blendingChain"), blendingSearcher, fedSearcher);
             return true;
         }
@@ -217,7 +217,7 @@ public class BlendingSearcherTestCase {
         r2.setTotalHitCount(1);
         chain2.addResult(q, r2);
 
-        BlendingSearcherWrapper blender = new BlendingSearcherWrapper("uri");
+        BlendingSearcherWrapper blender = new BlendingSearcherWrapper("[id]");
         blender.addChained(new FillSearcher(chain1), "a");
         blender.addChained(new FillSearcher(chain2), "b");
         blender.initialize();
diff --git a/container-search/src/test/java/com/yahoo/search/rendering/JsonRendererTestCase.java b/container-search/src/test/java/com/yahoo/search/rendering/JsonRendererTestCase.java
index 5b3b5ca6d73..9e16ddba6fc 100644
--- a/container-search/src/test/java/com/yahoo/search/rendering/JsonRendererTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/rendering/JsonRendererTestCase.java
@@ -498,8 +498,7 @@ public class JsonRendererTestCase {
                 + "                \"children\": [\n"
                 + "                    {\n"
                 + "                        \"fields\": {\n"
-                + "                            \"c\": \"d\",\n"
-                + "                            \"uri\": \"http://localhost/1\"\n"
+                + "                            \"c\": \"d\"\n"
                 + "                        },\n"
                 + "                        \"id\": \"http://localhost/1\",\n"
                 + "                        \"relevance\": 0.9,\n"
@@ -523,8 +522,7 @@ public class JsonRendererTestCase {
                 + "            },\n"
                 + "            {\n"
                 + "                \"fields\": {\n"
-                + "                    \"b\": \"foo\",\n"
-                + "                    \"uri\": \"http://localhost/\"\n"
+                + "                    \"b\": \"foo\"\n"
                 + "                },\n"
                 + "                \"id\": \"http://localhost/\",\n"
                 + "                \"relevance\": 0.95,\n"
@@ -555,7 +553,7 @@ public class JsonRendererTestCase {
                 + "        \"relevance\": 1.0\n"
                 + "    }\n"
                 + "}";
-        Query q = new Query("/?query=a&tracelevel=5&reportCoverage=true");
+        Query q = new Query("/?query=a&tracelevel=5");
         Execution execution = new Execution(Execution.Context.createContextStub());
         Result r = new Result(q);
         r.setCoverage(new Coverage(500, 500,1,1));
@@ -603,7 +601,7 @@ public class JsonRendererTestCase {
                 + "        \"relevance\": 1.0\n"
                 + "    }\n"
                 + "}";
-        Query q = new Query("/?query=a&tracelevel=5&reportCoverage=true");
+        Query q = new Query("/?query=a&tracelevel=5");
         Execution execution = new Execution(Execution.Context.createContextStub());
         Result r = new Result(q);
         r.setCoverage(new Coverage(500, 600).setDegradedReason(5));
@@ -725,7 +723,7 @@ public class JsonRendererTestCase {
                 + "        \"relevance\": 1.0\n"
                 + "    }\n"
                 + "}\n";
-        Query q = new Query("/?query=a&tracelevel=5&reportCoverage=true");
+        Query q = new Query("/?query=a&tracelevel=5");
         Result r = new Result(q);
         Throwable t = new Throwable();
         StackTraceElement[] stack = new StackTraceElement[1];
diff --git a/container-search/src/test/java/com/yahoo/search/rendering/SyncDefaultRendererTestCase.java b/container-search/src/test/java/com/yahoo/search/rendering/SyncDefaultRendererTestCase.java
index 1d2187376a4..acb69670b14 100644
--- a/container-search/src/test/java/com/yahoo/search/rendering/SyncDefaultRendererTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/rendering/SyncDefaultRendererTestCase.java
@@ -58,8 +58,8 @@ public class SyncDefaultRendererTestCase {
 
     @SuppressWarnings("deprecation")
     @Test
-    public final void testRenderWriterResult() throws InterruptedException, ExecutionException {
-        Query q = new Query("/?query=a&tracelevel=5&reportCoverage=true");
+    public void testRenderWriterResult() throws InterruptedException, ExecutionException {
+        Query q = new Query("/?query=a&tracelevel=5");
         q.getPresentation().setTiming(true);
         Result r = new Result(q);
         r.setCoverage(new Coverage(500, 1));
@@ -96,7 +96,7 @@ public class SyncDefaultRendererTestCase {
         assertTrue(f.get());
         String summary = Utf8.toString(bs.toByteArray());
         // TODO figure out a reasonably strict and reasonably flexible way to test
-        assertTrue(summary.length() > 1000);
+        assertTrue(summary.length() > 900);
     }
 
 }
diff --git a/container-search/src/test/java/com/yahoo/search/rendering/XMLRendererTestCase.java b/container-search/src/test/java/com/yahoo/search/rendering/XMLRendererTestCase.java
index 3ecb057d176..ea3b46aaaa9 100644
--- a/container-search/src/test/java/com/yahoo/search/rendering/XMLRendererTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/rendering/XMLRendererTestCase.java
@@ -54,8 +54,8 @@ public class XMLRendererTestCase {
     }
 
     @Test
-    public final void testImplicitDefaultRender() throws Exception {
-        Query q = new Query("/?query=a&tracelevel=5&reportCoverage=true");
+    public void testImplicitDefaultRender() throws Exception {
+        Query q = new Query("/?query=a&tracelevel=5");
         q.getPresentation().setTiming(true);
         Result r = new Result(q);
         r.setCoverage(new Coverage(500, 1));
@@ -102,7 +102,7 @@ public class XMLRendererTestCase {
         assertTrue(summary.contains("<hit type=\"grouphit\" relevancy=\"1.0\">"));
         assertTrue(summary.contains("<hit type=\"summary\" relevancy=\"0.95\">"));
         assertEquals(2, occurrences("<error ", summary));
-        assertTrue(summary.length() > 1000);
+        assertTrue(summary.length() > 900);
     }
 
     private int occurrences(String fragment, String string) {