summaryrefslogtreecommitdiffstats
path: root/container-search/src/test/java
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@oath.com>2018-10-16 16:19:39 +0200
committerJon Bratseth <bratseth@oath.com>2018-10-16 16:19:39 +0200
commit75938aee2f1b99ab544cd0bac37da87ae2364e78 (patch)
tree934c9751135f2df423919b124e219ad94747bf42 /container-search/src/test/java
parenta05feac0e904060bec99cebdbd3eb29e243178c7 (diff)
Fix tests
Diffstat (limited to 'container-search/src/test/java')
-rw-r--r--container-search/src/test/java/com/yahoo/search/rendering/JsonRendererTestCase.java13
-rw-r--r--container-search/src/test/java/com/yahoo/search/result/test/CoverageTestCase.java4
2 files changed, 8 insertions, 9 deletions
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 4be43c4ea81..5b3b5ca6d73 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
@@ -479,8 +479,8 @@ public class JsonRendererTestCase {
Execution.Context.createContextStub());
Result r = new Result(q);
execution.search(q);
- final TraceNode child = new TraceNode("string payload", 0L);
- final TraceNode childOfChild = new TraceNode(null, 0L);
+ TraceNode child = new TraceNode("string payload", 0L);
+ TraceNode childOfChild = new TraceNode(null, 0L);
child.add(childOfChild);
childOfChild.add(new TraceNode("in OO languages, nesting is for birds", 0L));
execution.trace().traceNode().add(child);
@@ -490,7 +490,7 @@ public class JsonRendererTestCase {
@Test
- public final void test() throws IOException, InterruptedException, ExecutionException, JSONException {
+ public final void test() throws IOException, InterruptedException, ExecutionException {
String expected = "{\n"
+ " \"root\": {\n"
+ " \"children\": [\n"
@@ -556,10 +556,9 @@ public class JsonRendererTestCase {
+ " }\n"
+ "}";
Query q = new Query("/?query=a&tracelevel=5&reportCoverage=true");
- Execution execution = new Execution(
- Execution.Context.createContextStub());
+ Execution execution = new Execution(Execution.Context.createContextStub());
Result r = new Result(q);
- r.setCoverage(new Coverage(500, 1));
+ r.setCoverage(new Coverage(500, 500,1,1));
FastHit h = new FastHit("http://localhost/", .95);
h.setField("$a", "Hello, world.");
@@ -593,7 +592,7 @@ public class JsonRendererTestCase {
+ " \"non-ideal-state\" : false"
+ " },\n"
+ " \"full\": false,\n"
- + " \"nodes\": 0,\n"
+ + " \"nodes\": 1,\n"
+ " \"results\": 1,\n"
+ " \"resultsFull\": 0\n"
+ " },\n"
diff --git a/container-search/src/test/java/com/yahoo/search/result/test/CoverageTestCase.java b/container-search/src/test/java/com/yahoo/search/result/test/CoverageTestCase.java
index 471813525bf..7624185481e 100644
--- a/container-search/src/test/java/com/yahoo/search/result/test/CoverageTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/result/test/CoverageTestCase.java
@@ -16,7 +16,7 @@ public class CoverageTestCase {
@Test
public void testZeroCoverage() {
- Coverage c = new Coverage(0L, 0, 0);
+ Coverage c = new Coverage(0L, 0, 0, 0);
assertEquals(0, c.getResultPercentage());
assertEquals(0, c.getResultSets());
}
@@ -52,7 +52,7 @@ public class CoverageTestCase {
Result federationSearcherResult = new Result(new Query());
Result singleSourceResult = new Result(new Query());
federationSearcherResult.mergeWith(singleSourceResult);
- assertNull(federationSearcherResult.getCoverage( ! create));
+ assertNull(federationSearcherResult.getCoverage( !create));
assertEquals(0, federationSearcherResult.getCoverage(create).getResultSets());
}