aboutsummaryrefslogtreecommitdiffstats
path: root/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@yahoo-inc.com>2017-04-25 15:58:57 +0200
committerBjørn Christian Seime <bjorncs@yahoo-inc.com>2017-04-26 14:55:50 +0200
commit704d878c88639e7366ef4befafd7034373713211 (patch)
tree93a0ca25a4398bc74edae2996ec6d011534564f3 /jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty
parent8036f80e03a5056193945fc6c642b832d32a6c55 (diff)
Remove use of deprecated cookie API of Netty.
Deprecates some cookies methods/properties that are no longer supported by the Netty cookie encoder/decoder.
Diffstat (limited to 'jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty')
-rw-r--r--jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerConformanceTest.java1
-rw-r--r--jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java13
2 files changed, 5 insertions, 9 deletions
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerConformanceTest.java b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerConformanceTest.java
index 0729c4b8480..adae818b288 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerConformanceTest.java
+++ b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerConformanceTest.java
@@ -717,7 +717,6 @@ public class HttpServerConformanceTest extends ServerProviderConformanceTest {
}
}
- @SuppressWarnings("deprecation")
private class TestRunner implements Adapter<JettyHttpServer, ClientProxy, Future<HttpResponse>> {
private Matcher<ResponseGist> expectedResponse = null;
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java
index 6416d11f523..a893a76ff52 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java
+++ b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java
@@ -348,14 +348,11 @@ public class HttpServerTest {
@Test
public void requireThatSetCookieHeaderIsCorrect() throws Exception {
final TestDriver driver = TestDrivers.newInstance(new CookieSetterRequestHandler(
- new Cookie("foo", "bar").setComment("comment yeah")
- .setCommentURL("http://comment.yes/")
- .setDiscard(true)
- .setDomain(".localhost")
- .setHttpOnly(true)
- .setPath("/foopath")
- .setSecure(true)
- .setVersion(2)));
+ new Cookie("foo", "bar")
+ .setDomain(".localhost")
+ .setHttpOnly(true)
+ .setPath("/foopath")
+ .setSecure(true)));
driver.client().get("/status.html")
.expectStatusCode(is(OK))
.expectHeader("Set-Cookie",