summaryrefslogtreecommitdiffstats
path: root/clustercontroller-utils/src/test/java/com/yahoo
diff options
context:
space:
mode:
authorHåkon Hallingstad <hakon@oath.com>2018-06-25 11:21:10 +0200
committerHåkon Hallingstad <hakon@oath.com>2018-06-25 11:21:10 +0200
commit8e0db9bca4cdf4dec43b3d46fcf1a8b1d33e99ec (patch)
tree579b6bf9b376e8b35cd92794e5f14d6f04e48e72 /clustercontroller-utils/src/test/java/com/yahoo
parentda8720586341957f15bf6a42b291d879c8569538 (diff)
Move timeout query param parsing out of JsonReader
Diffstat (limited to 'clustercontroller-utils/src/test/java/com/yahoo')
-rw-r--r--clustercontroller-utils/src/test/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/server/RestApiHandlerTest.java (renamed from clustercontroller-utils/src/test/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/server/JsonReaderTest.java)10
1 files changed, 5 insertions, 5 deletions
diff --git a/clustercontroller-utils/src/test/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/server/JsonReaderTest.java b/clustercontroller-utils/src/test/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/server/RestApiHandlerTest.java
index bf47a6605a2..f7f109fffc8 100644
--- a/clustercontroller-utils/src/test/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/server/JsonReaderTest.java
+++ b/clustercontroller-utils/src/test/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/server/RestApiHandlerTest.java
@@ -9,12 +9,12 @@ import java.util.Optional;
import static org.junit.Assert.assertEquals;
-public class JsonReaderTest {
+public class RestApiHandlerTest {
@Test
public void testParsingOfTimeout() throws InvalidContentException {
- assertEquals(Optional.empty(), JsonReader.parseTimeout(null));
- assertEquals(Optional.of(Duration.ofMillis(12500)), JsonReader.parseTimeout("12.5"));
- assertEquals(Optional.of(Duration.ofMillis(0)), JsonReader.parseTimeout("-1"));
- assertEquals(Optional.of(Duration.ofMillis(0)), JsonReader.parseTimeout("0.0001"));
+ assertEquals(Optional.empty(), RestApiHandler.parseTimeout(null));
+ assertEquals(Optional.of(Duration.ofMillis(12500)), RestApiHandler.parseTimeout("12.5"));
+ assertEquals(Optional.of(Duration.ofMillis(0)), RestApiHandler.parseTimeout("-1"));
+ assertEquals(Optional.of(Duration.ofMillis(0)), RestApiHandler.parseTimeout("0.0001"));
}
} \ No newline at end of file