From 93f89866d9e53d3428903fe935df9b87316e2c0d Mon Sep 17 00:00:00 2001 From: Tor Egge Date: Mon, 5 Nov 2018 12:24:24 +0000 Subject: Test that internal feed api reports supported protocol versions. --- .../src/main/java/com/yahoo/vespa/http/server/FeedHandler.java | 2 +- .../test/java/com/yahoo/vespa/http/server/VersionsTestCase.java | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedHandler.java b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedHandler.java index 52d999f1a52..58457a8aa20 100644 --- a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedHandler.java +++ b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedHandler.java @@ -54,7 +54,7 @@ public class FeedHandler extends LoggingRequestHandler { protected final ReplyHandler feedReplyHandler; private final AtomicLong sessionId; private final Metric metric; - private static final List serverSupportedVersions = Collections.unmodifiableList(Arrays.asList(2)); + private static final List serverSupportedVersions = Collections.unmodifiableList(Arrays.asList(2, 3)); private final String localHostname; private final FeedHandlerV3 feedHandlerV3; diff --git a/vespaclient-container-plugin/src/test/java/com/yahoo/vespa/http/server/VersionsTestCase.java b/vespaclient-container-plugin/src/test/java/com/yahoo/vespa/http/server/VersionsTestCase.java index ab055a54133..d6f605b0379 100644 --- a/vespaclient-container-plugin/src/test/java/com/yahoo/vespa/http/server/VersionsTestCase.java +++ b/vespaclient-container-plugin/src/test/java/com/yahoo/vespa/http/server/VersionsTestCase.java @@ -5,6 +5,7 @@ import com.yahoo.collections.Tuple2; import com.yahoo.container.jdisc.HttpResponse; import org.junit.Test; +import java.io.ByteArrayOutputStream; import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -77,6 +78,12 @@ public class VersionsTestCase { public void testTooLarge() throws Exception { Tuple2 v = FeedHandler.doCheckProtocolVersion(TOO_LARGE_NUMBER); assertThat(v.first, instanceOf(ErrorHttpResponse.class)); + ByteArrayOutputStream errorMsg = new ByteArrayOutputStream(); + ErrorHttpResponse errorResponse = (ErrorHttpResponse) v.first; + errorResponse.render(errorMsg); + assertThat(errorMsg.toString(), + is("Could not parse X-Yahoo-Feed-Protocol-Versionheader of request (values: [1000000000]). " + + "Server supports protocol versions [2, 3]")); assertThat(v.second, is(-1)); } -- cgit v1.2.3