diff options
Diffstat (limited to 'tests/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/server/session/AbstractSessionRenewTest.java')
| -rw-r--r-- | tests/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/server/session/AbstractSessionRenewTest.java | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/tests/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/server/session/AbstractSessionRenewTest.java b/tests/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/server/session/AbstractSessionRenewTest.java index 3468ab35f7..b92e588767 100644 --- a/tests/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/server/session/AbstractSessionRenewTest.java +++ b/tests/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/server/session/AbstractSessionRenewTest.java @@ -52,6 +52,7 @@ public abstract class AbstractSessionRenewTest int scavengePeriod = 3; AbstractTestServer server = createServer(0, 1, scavengePeriod); WebAppContext context = server.addWebAppContext(".", contextPath); + context.setParentLoaderPriority(true); context.addServlet(TestServlet.class, servletMapping); TestHttpSessionIdListener testListener = new TestHttpSessionIdListener(); context.addEventListener(testListener); @@ -78,6 +79,7 @@ public abstract class AbstractSessionRenewTest Request request = client.newRequest("http://localhost:" + port + contextPath + servletMapping + "?action=renew"); request.header("Cookie", sessionCookie); ContentResponse renewResponse = request.send(); + assertEquals(HttpServletResponse.SC_OK,renewResponse.getStatus()); String renewSessionCookie = renewResponse.getHeaders().get("Set-Cookie"); assertNotNull(renewSessionCookie); @@ -130,8 +132,7 @@ public abstract class AbstractSessionRenewTest assertTrue(beforeSession != null); String beforeSessionId = beforeSession.getId(); - - ((AbstractSession)beforeSession).renewId(request); + ((Session)beforeSession).renewId(request); HttpSession afterSession = request.getSession(false); assertTrue(afterSession != null); @@ -140,18 +141,18 @@ public abstract class AbstractSessionRenewTest assertTrue(beforeSession==afterSession); assertFalse(beforeSessionId.equals(afterSessionId)); - AbstractSessionManager sessionManager = (AbstractSessionManager)((AbstractSession)afterSession).getSessionManager(); + SessionManager sessionManager = ((Session)afterSession).getSessionManager(); AbstractSessionIdManager sessionIdManager = (AbstractSessionIdManager)sessionManager.getSessionIdManager(); - assertTrue(sessionIdManager.idInUse(afterSessionId)); - assertFalse(sessionIdManager.idInUse(beforeSessionId)); + assertTrue(sessionIdManager.isIdInUse(afterSessionId)); + assertFalse(sessionIdManager.isIdInUse(beforeSessionId)); HttpSession session = sessionManager.getSession(afterSessionId); assertNotNull(session); session = sessionManager.getSession(beforeSessionId); assertNull(session); - if (((AbstractSession)afterSession).isIdChanged()) + if (((Session)afterSession).isIdChanged()) { ((org.eclipse.jetty.server.Response)response).addCookie(sessionManager.getSessionCookie(afterSession, request.getContextPath(), request.isSecure())); } |