aboutsummaryrefslogtreecommitdiffstats
path: root/container-search/src
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2016-11-28 00:54:46 +0100
committerHenning Baldersheim <balder@yahoo-inc.com>2017-01-25 18:55:22 +0100
commite101361464a8aee9d04412ac0ca38beca9d6d58f (patch)
tree27430e6f4e968ba6b5e8e49cd73a92eb69f23610 /container-search/src
parent35fe745a9137d8e569e8e4cc6e2bd60d35ad6996 (diff)
Test the soft timeout config generation
Diffstat (limited to 'container-search/src')
-rw-r--r--container-search/src/main/java/com/yahoo/search/query/SoftTimeout.java2
-rw-r--r--container-search/src/test/java/com/yahoo/search/query/SoftTimeoutTestCase.java4
2 files changed, 5 insertions, 1 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/query/SoftTimeout.java b/container-search/src/main/java/com/yahoo/search/query/SoftTimeout.java
index 01cc460fbeb..2db1235f72c 100644
--- a/container-search/src/main/java/com/yahoo/search/query/SoftTimeout.java
+++ b/container-search/src/main/java/com/yahoo/search/query/SoftTimeout.java
@@ -8,7 +8,7 @@ import java.util.Objects;
/**
* Holds the settings for the soft-timeout feature.
- *
+ *
* @author balder
*/
public class SoftTimeout implements Cloneable {
diff --git a/container-search/src/test/java/com/yahoo/search/query/SoftTimeoutTestCase.java b/container-search/src/test/java/com/yahoo/search/query/SoftTimeoutTestCase.java
index ccfc71b7922..3b230aa9416 100644
--- a/container-search/src/test/java/com/yahoo/search/query/SoftTimeoutTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/query/SoftTimeoutTestCase.java
@@ -23,6 +23,10 @@ public class SoftTimeoutTestCase {
assertTrue(query.getRanking().getSoftTimeout().getEnable());
assertEquals(Double.valueOf(0.7), query.getRanking().getSoftTimeout().getFactor());
assertEquals(Double.valueOf(0.3), query.getRanking().getSoftTimeout().getTailcost());
+ query.prepare();
+ assertEquals("true", query.getRanking().getProperties().get("vespa.softtimeout.enable").get(0));
+ assertEquals("0.7", query.getRanking().getProperties().get("vespa.softtimeout.factor").get(0));
+ assertEquals("0.3", query.getRanking().getProperties().get("vespa.softtimeout.tailcost").get(0));
}
private void verifyException(String key, String value) {