Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixes from merge

This commit is contained in:
Greg Wilkins 2014-10-10 08:54:11 +11:00
parent 758ce66c8d
commit 7e68a98dcd
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-server/src/test/java/org/eclipse/jetty/server/handler/BadRequestLogHandlerTest.java
View File

@ -74,7 +74,7 @@ public class BadRequestLogHandlerTest
@Override @Override
public void log(Request request, Response response) public void log(Request request, Response response)
{ {
captured.add(String.format("%s %s %s %03d",request.getMethod(),request.getUri().toString(),request.getProtocol(),response.getStatus())); captured.add(String.format("%s %s %s %03d",request.getMethod(),request.getHttpURI(),request.getProtocol(),response.getStatus()));
} }
} }

2
jetty-server/src/test/java/org/eclipse/jetty/server/handler/RequestLogHandlerTest.java
View File

@ -67,7 +67,7 @@ public class RequestLogHandlerTest
@Override @Override
public void log(Request request, Response response) public void log(Request request, Response response)
{ {
captured.add(String.format("%s %s %s %03d",request.getMethod(),request.getUri().toString(),request.getProtocol(),response.getStatus())); captured.add(String.format("%s %s %s %03d",request.getMethod(),request.getHttpURI().toString(),request.getProtocol(),response.getStatus()));
} }
} }

4
tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/AttributeNameTest.java
View File

@ -33,6 +33,7 @@ import javax.servlet.http.HttpServletResponse;
import org.eclipse.jetty.client.HttpClient; import org.eclipse.jetty.client.HttpClient;
import org.eclipse.jetty.client.api.ContentResponse; import org.eclipse.jetty.client.api.ContentResponse;
import org.eclipse.jetty.client.api.Request; import org.eclipse.jetty.client.api.Request;
import org.eclipse.jetty.http.HttpHeader;
import org.eclipse.jetty.nosql.NoSqlSession; import org.eclipse.jetty.nosql.NoSqlSession;
import org.eclipse.jetty.server.session.AbstractTestServer; import org.eclipse.jetty.server.session.AbstractTestServer;
import org.junit.Test; import org.junit.Test;
@ -94,7 +95,8 @@ public class AttributeNameTest
assertEquals("a.b.c",sessionTestResponse[0]); assertEquals("a.b.c",sessionTestResponse[0]);
String sessionCookie = response.getHeaders().getStringField("Set-Cookie"); String sessionCookie = response.getHeaders().get(HttpHeader.SET_COOKIE);
assertTrue(sessionCookie != null); assertTrue(sessionCookie != null);
//Mangle the cookie, replacing Path with $Path, etc. //Mangle the cookie, replacing Path with $Path, etc.
sessionCookie = sessionCookie.replaceFirst("(\\W)(P|p)ath=","$1\\$Path="); sessionCookie = sessionCookie.replaceFirst("(\\W)(P|p)ath=","$1\\$Path=");