diff options
Diffstat (limited to 'tests/test-sessions/test-jdbc-sessions')
4 files changed, 33 insertions, 17 deletions
diff --git a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/LastAccessTimeTest.java b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/LastAccessTimeTest.java index 1267890e07..7f7149e018 100644 --- a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/LastAccessTimeTest.java +++ b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/LastAccessTimeTest.java @@ -18,7 +18,6 @@ package org.eclipse.jetty.server.session; -import org.eclipse.jetty.util.log.Log; import org.junit.Test; /** diff --git a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/MaxInactiveMigrationTest.java b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/MaxInactiveMigrationTest.java index 4941f4a7cc..15a5102f54 100644 --- a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/MaxInactiveMigrationTest.java +++ b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/MaxInactiveMigrationTest.java @@ -25,17 +25,17 @@ import java.io.IOException; import java.io.PrintWriter; import java.sql.DriverManager; import java.sql.SQLException; +import java.util.concurrent.Future; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import org.eclipse.jetty.client.ContentExchange; import org.eclipse.jetty.client.HttpClient; -import org.eclipse.jetty.http.HttpMethods; +import org.eclipse.jetty.client.api.ContentResponse; +import org.eclipse.jetty.client.api.Request; import org.eclipse.jetty.servlet.ServletContextHandler; -import org.eclipse.jetty.util.log.Log; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -73,7 +73,6 @@ public class MaxInactiveMigrationTest testServer1.start(); testServer2.start(); client = new HttpClient(); - client.setConnectorType(HttpClient.CONNECTOR_SOCKET); client.start(); } @@ -99,22 +98,19 @@ public class MaxInactiveMigrationTest int port=server.getPort(); //Log.getLog().setDebugEnabled(true); - - ContentExchange exchange1 = new ContentExchange(true); - exchange1.setMethod(HttpMethods.GET); - exchange1.setURL("http://localhost:" + port + "" + "/test"); + Request request = client.newRequest("http://localhost:" + port + "" + "/test"); if (sessionCookie != null) - exchange1.getRequestFields().add("Cookie", sessionCookie); - client.send(exchange1); - exchange1.waitForDone(); - assertEquals(HttpServletResponse.SC_OK, exchange1.getResponseStatus()); + request.header("Cookie", sessionCookie); + Future<ContentResponse> future = request.send(); + ContentResponse response = future.get(); + assertEquals(HttpServletResponse.SC_OK, response.getStatus()); - sessionCookie = exchange1.getResponseFields().getStringField("Set-Cookie"); + sessionCookie = response.getHeaders().getStringField("Set-Cookie"); assertTrue( sessionCookie != null ); // Mangle the cookie, replacing Path with $Path, etc. sessionCookie = sessionCookie.replaceFirst("(\\W)(P|p)ath=", "$1\\$Path="); - return exchange1.getResponseContent(); + return response.getContentAsString(); } diff --git a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/SessionRenewTest.java b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/SessionRenewTest.java new file mode 100644 index 0000000000..62a43e33e8 --- /dev/null +++ b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/SessionRenewTest.java @@ -0,0 +1,22 @@ +package org.eclipse.jetty.server.session; + +import org.junit.Test; + +public class SessionRenewTest extends AbstractSessionRenewTest +{ + + @Override + public AbstractTestServer createServer(int port, int max, int scavenge) + { + return new JdbcTestServer(port, max, scavenge); + } + + @Test + public void testSessionRenewal() throws Exception + { + super.testSessionRenewal(); + } + + + +} diff --git a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/SessionValueSavingTest.java b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/SessionValueSavingTest.java index 56c93e9038..1427763bb9 100644 --- a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/SessionValueSavingTest.java +++ b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/SessionValueSavingTest.java @@ -18,7 +18,6 @@ package org.eclipse.jetty.server.session; -import org.eclipse.jetty.util.log.Log; import org.junit.Test; /** @@ -31,7 +30,7 @@ public class SessionValueSavingTest extends AbstractSessionValueSavingTest return new JdbcTestServer(port,max,scavenge); } - @Override + @Test public void testSessionValueSaving() throws Exception { super.testSessionValueSaving(); |