diff --git a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletTest.java b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletTest.java
index ff36ac901a1..b9c30d803dd 100644
--- a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletTest.java
+++ b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletTest.java
@@ -1,11 +1,8 @@
package org.eclipse.jetty.servlet;
-import static org.junit.Assert.assertTrue;
-
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
-
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
@@ -14,7 +11,6 @@ import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import junit.framework.AssertionFailedError;
-
import org.eclipse.jetty.server.LocalConnector;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.toolchain.test.FS;
@@ -29,11 +25,13 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+import static org.junit.Assert.assertTrue;
+
public class DefaultServletTest
{
- @Rule
- public TestingDir testdir = new TestingDir();
-
+ @Rule
+ public TestingDir testdir = new TestingDir();
+
private Server server;
private LocalConnector connector;
private ServletContextHandler context;
@@ -48,7 +46,7 @@ public class DefaultServletTest
context = new ServletContextHandler();
context.setContextPath("/context");
- context.setWelcomeFiles(new String[] {"index.html","index.jsp","index.htm"});
+ context.setWelcomeFiles(new String[]{"index.html", "index.jsp", "index.htm"});
server.setHandler(context);
server.addConnector(connector);
@@ -66,11 +64,11 @@ public class DefaultServletTest
@Test
public void testListingWithSession() throws Exception
{
- ServletHolder defholder = context.addServlet(DefaultServlet.class,"/*");
- defholder.setInitParameter("dirAllowed","true");
- defholder.setInitParameter("redirectWelcome","false");
- defholder.setInitParameter("gzip","false");
-
+ ServletHolder defholder = context.addServlet(DefaultServlet.class, "/*");
+ defholder.setInitParameter("dirAllowed", "true");
+ defholder.setInitParameter("redirectWelcome", "false");
+ defholder.setInitParameter("gzip", "false");
+
testdir.ensureEmpty();
/* create some content in the docroot */
@@ -81,7 +79,7 @@ public class DefaultServletTest
assertTrue(new File(resBase, "three").mkdir());
String resBasePath = resBase.getAbsolutePath();
- defholder.setInitParameter("resourceBase",resBasePath);
+ defholder.setInitParameter("resourceBase", resBasePath);
StringBuffer req1 = new StringBuffer();
req1.append("GET /context/;JSESSIONID=1234567890 HTTP/1.1\n");
@@ -90,20 +88,20 @@ public class DefaultServletTest
String response = connector.getResponses(req1.toString());
- assertResponseContains("/one/;JSESSIONID=1234567890",response);
- assertResponseContains("/two/;JSESSIONID=1234567890",response);
- assertResponseContains("/three/;JSESSIONID=1234567890",response);
+ assertResponseContains("/one/;JSESSIONID=1234567890", response);
+ assertResponseContains("/two/;JSESSIONID=1234567890", response);
+ assertResponseContains("/three/;JSESSIONID=1234567890", response);
- assertResponseNotContains(" HTTP/1.1\n" );
- req1.append( "Host: localhost\n" );
- req1.append( "\n" );
+ req1.append("GET /context/; HTTP/1.1\n");
+ req1.append("Host: localhost\n");
+ req1.append("\n");
- String response = connector.getResponses( req1.toString() );
+ String response = connector.getResponses(req1.toString());
- assertResponseContains( "/one/", response );
- assertResponseContains( "/two/", response );
- assertResponseContains( "/three/", response );
- if ( !OS.IS_WINDOWS ) {
- assertResponseContains( "/f%3F%3Fr", response );
+ assertResponseContains("/one/", response);
+ assertResponseContains("/two/", response);
+ assertResponseContains("/three/", response);
+ if (!OS.IS_WINDOWS)
+ {
+ assertResponseContains("/f%3F%3Fr", response);
}
- assertResponseNotContains( "