diff options
Diffstat (limited to 'container-search/src/test/java/com/yahoo/search/query/SoftTimeoutTestCase.java')
-rw-r--r-- | container-search/src/test/java/com/yahoo/search/query/SoftTimeoutTestCase.java | 17 |
1 files changed, 9 insertions, 8 deletions
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 dff6d4c26c3..a15038ff7e2 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 @@ -1,7 +1,6 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.query; -import com.yahoo.prelude.query.QueryException; import com.yahoo.search.Query; import org.junit.Test; import static org.junit.Assert.*; @@ -10,9 +9,10 @@ import static org.junit.Assert.*; * @author baldersheim */ public class SoftTimeoutTestCase { + @Test public void testDefaultsInQuery() { - Query query=new Query("?query=test"); + Query query = new Query("?query=test"); assertTrue(query.getRanking().getSoftTimeout().getEnable()); assertNull(query.getRanking().getSoftTimeout().getFactor()); assertNull(query.getRanking().getSoftTimeout().getTailcost()); @@ -20,7 +20,7 @@ public class SoftTimeoutTestCase { @Test public void testQueryOverride() { - Query query=new Query("?query=test&ranking.softtimeout.factor=0.7&ranking.softtimeout.tailcost=0.3"); + Query query = new Query("?query=test&ranking.softtimeout.factor=0.7&ranking.softtimeout.tailcost=0.3"); assertTrue(query.getRanking().getSoftTimeout().getEnable()); assertEquals(Double.valueOf(0.7), query.getRanking().getSoftTimeout().getFactor()); assertEquals(Double.valueOf(0.3), query.getRanking().getSoftTimeout().getTailcost()); @@ -49,13 +49,13 @@ public class SoftTimeoutTestCase { private void verifyException(String key, String value) { try { new Query("?query=test&ranking.softtimeout."+key+"="+value); - assertFalse(true); - } catch (QueryException e) { - assertEquals("Invalid request parameter", e.getMessage()); - assertEquals("Could not set 'ranking.softtimeout." + key + "' to '" + value +"'", e.getCause().getMessage()); - assertEquals(key + " must be in the range [0.0, 1.0], got " + value, e.getCause().getCause().getMessage()); + fail(); + } catch (IllegalArgumentException e) { + assertEquals("Could not set 'ranking.softtimeout." + key + "' to '" + value +"'", e.getMessage()); + assertEquals(key + " must be in the range [0.0, 1.0], got " + value, e.getCause().getMessage()); } } + @Test public void testLimits() { verifyException("factor", "-0.1"); @@ -63,4 +63,5 @@ public class SoftTimeoutTestCase { verifyException("tailcost", "-0.1"); verifyException("tailcost", "1.1"); } + } |