1 files changed, 23 insertions, 23 deletions
diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/HttpManyWaysToAsyncCommitTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/HttpManyWaysToAsyncCommitTest.java
index 234d7f8d26..24671c632d 100644
--- a/jetty-server/src/test/java/org/eclipse/jetty/server/HttpManyWaysToAsyncCommitTest.java
+++ b/jetty-server/src/test/java/org/eclipse/jetty/server/HttpManyWaysToAsyncCommitTest.java
@@ -28,7 +28,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.eclipse.jetty.http.HttpVersion;
-import org.eclipse.jetty.server.util.SimpleHttpParser;
+import org.eclipse.jetty.toolchain.test.http.SimpleHttpResponse;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -66,7 +66,7 @@ public class HttpManyWaysToAsyncCommitTest extends AbstractHttpTest
         server.setHandler(new DoesNotSetHandledHandler(false));
         server.start();
 
-        SimpleHttpParser.TestHttpResponse response = executeRequest();
+        SimpleHttpResponse response = executeRequest();
 
         assertThat("response code is 404", response.getCode(), is("404"));
     }
@@ -77,7 +77,7 @@ public class HttpManyWaysToAsyncCommitTest extends AbstractHttpTest
         server.setHandler(new DoesNotSetHandledHandler(true));
         server.start();
 
-        SimpleHttpParser.TestHttpResponse response = executeRequest();
+        SimpleHttpResponse response = executeRequest();
 
         assertThat("response code is 500", response.getCode(), is("500"));
     }
@@ -120,7 +120,7 @@ public class HttpManyWaysToAsyncCommitTest extends AbstractHttpTest
         server.setHandler(new OnlySetHandledHandler(false));
         server.start();
 
-        SimpleHttpParser.TestHttpResponse response = executeRequest();
+        SimpleHttpResponse response = executeRequest();
 
         assertThat("response code is 200", response.getCode(), is("200"));
         assertHeader(response, "content-length", "0");
@@ -132,7 +132,7 @@ public class HttpManyWaysToAsyncCommitTest extends AbstractHttpTest
         server.setHandler(new OnlySetHandledHandler(true));
         server.start();
 
-        SimpleHttpParser.TestHttpResponse response = executeRequest();
+        SimpleHttpResponse response = executeRequest();
 
         assertThat("response code is 500", response.getCode(), is("500"));
     }
@@ -177,7 +177,7 @@ public class HttpManyWaysToAsyncCommitTest extends AbstractHttpTest
         server.setHandler(new SetHandledWriteSomeDataHandler(false));
         server.start();
 
-        SimpleHttpParser.TestHttpResponse response = executeRequest();
+        SimpleHttpResponse response = executeRequest();
 
         assertThat("response code is 200", response.getCode(), is("200"));
         assertHeader(response, "content-length", "6");
@@ -189,7 +189,7 @@ public class HttpManyWaysToAsyncCommitTest extends AbstractHttpTest
         server.setHandler(new SetHandledWriteSomeDataHandler(true));
         server.start();
 
-        SimpleHttpParser.TestHttpResponse response = executeRequest();
+        SimpleHttpResponse response = executeRequest();
 
         assertThat("response code is 500", response.getCode(), is("500"));
     }
@@ -241,7 +241,7 @@ public class HttpManyWaysToAsyncCommitTest extends AbstractHttpTest
         server.setHandler(new ExplicitFlushHandler(false));
         server.start();
 
-        SimpleHttpParser.TestHttpResponse response = executeRequest();
+        SimpleHttpResponse response = executeRequest();
 
 
         assertThat("response code is 200", response.getCode(), is("200"));
@@ -255,7 +255,7 @@ public class HttpManyWaysToAsyncCommitTest extends AbstractHttpTest
         server.setHandler(new ExplicitFlushHandler(true));
         server.start();
 
-        SimpleHttpParser.TestHttpResponse response = executeRequest();
+        SimpleHttpResponse response = executeRequest();
 
         assertThat("response code is 200", response.getCode(), is("200"));
         if ("HTTP/1.1".equals(httpVersion))
@@ -311,7 +311,7 @@ public class HttpManyWaysToAsyncCommitTest extends AbstractHttpTest
         server.setHandler(new SetHandledAndFlushWithoutContentHandler(false));
         server.start();
 
-        SimpleHttpParser.TestHttpResponse response = executeRequest();
+        SimpleHttpResponse response = executeRequest();
 
         assertThat("response code is 200", response.getCode(), is("200"));
         if ("HTTP/1.1".equals(httpVersion))
@@ -324,7 +324,7 @@ public class HttpManyWaysToAsyncCommitTest extends AbstractHttpTest
         server.setHandler(new SetHandledAndFlushWithoutContentHandler(true));
         server.start();
 
-        SimpleHttpParser.TestHttpResponse response = executeRequest();
+        SimpleHttpResponse response = executeRequest();
 
         assertThat("response code is 200", response.getCode(), is("200"));
         if ("HTTP/1.1".equals(httpVersion))
@@ -378,7 +378,7 @@ public class HttpManyWaysToAsyncCommitTest extends AbstractHttpTest
         server.setHandler(new WriteFlushWriteMoreHandler(false));
         server.start();
 
-        SimpleHttpParser.TestHttpResponse response = executeRequest();
+        SimpleHttpResponse response = executeRequest();
 
         assertThat("response code is 200", response.getCode(), is("200"));
         if ("HTTP/1.1".equals(httpVersion))
@@ -391,7 +391,7 @@ public class HttpManyWaysToAsyncCommitTest extends AbstractHttpTest
         server.setHandler(new WriteFlushWriteMoreHandler(true));
         server.start();
 
-        SimpleHttpParser.TestHttpResponse response = executeRequest();
+        SimpleHttpResponse response = executeRequest();
 
         assertThat("response code is 200", response.getCode(), is("200"));
         if ("HTTP/1.1".equals(httpVersion))
@@ -448,7 +448,7 @@ public class HttpManyWaysToAsyncCommitTest extends AbstractHttpTest
         server.setHandler(new OverflowHandler(false));
         server.start();
 
-        SimpleHttpParser.TestHttpResponse response = executeRequest();
+        SimpleHttpResponse response = executeRequest();
 
         assertThat("response code is 200", response.getCode(), is("200"));
         assertResponseBody(response, "foobar");
@@ -461,7 +461,7 @@ public class HttpManyWaysToAsyncCommitTest extends AbstractHttpTest
         server.setHandler(new OverflowHandler(true));
         server.start();
 
-        SimpleHttpParser.TestHttpResponse response = executeRequest();
+        SimpleHttpResponse response = executeRequest();
 
         // response not committed when we throw, so 500 expected
         assertThat("response code is 500", response.getCode(), is("500"));
@@ -516,7 +516,7 @@ public class HttpManyWaysToAsyncCommitTest extends AbstractHttpTest
         server.setHandler(new SetContentLengthAndWriteThatAmountOfBytesHandler(false));
         server.start();
 
-        SimpleHttpParser.TestHttpResponse response = executeRequest();
+        SimpleHttpResponse response = executeRequest();
 
         assertThat("response code is 200", response.getCode(), is("200"));
         assertThat("response body is foo", response.getBody(), is("foo"));
@@ -529,7 +529,7 @@ public class HttpManyWaysToAsyncCommitTest extends AbstractHttpTest
         server.setHandler(new SetContentLengthAndWriteThatAmountOfBytesHandler(true));
         server.start();
 
-        SimpleHttpParser.TestHttpResponse response = executeRequest();
+        SimpleHttpResponse response = executeRequest();
 
         //TODO: should we expect 500 here?
         assertThat("response code is 200", response.getCode(), is("200"));
@@ -586,7 +586,7 @@ public class HttpManyWaysToAsyncCommitTest extends AbstractHttpTest
         server.setHandler(new SetContentLengthAndWriteMoreBytesHandler(false));
         server.start();
 
-        SimpleHttpParser.TestHttpResponse response = executeRequest();
+        SimpleHttpResponse response = executeRequest();
 
         assertThat("response code is 200", response.getCode(), is("200"));
         // jetty truncates the body when content-length is reached.! This is correct and desired behaviour?
@@ -600,7 +600,7 @@ public class HttpManyWaysToAsyncCommitTest extends AbstractHttpTest
         server.setHandler(new SetContentLengthAndWriteMoreBytesHandler(true));
         server.start();
 
-        SimpleHttpParser.TestHttpResponse response = executeRequest();
+        SimpleHttpResponse response = executeRequest();
 
         // TODO: we throw before response is committed. should we expect 500?
         assertThat("response code is 200", response.getCode(), is("200"));
@@ -657,7 +657,7 @@ public class HttpManyWaysToAsyncCommitTest extends AbstractHttpTest
         server.setHandler(new WriteAndSetContentLengthHandler(false));
         server.start();
 
-        SimpleHttpParser.TestHttpResponse response = executeRequest();
+        SimpleHttpResponse response = executeRequest();
 
         assertThat("response code is 200", response.getCode(), is("200"));
         //TODO: jetty ignores setContentLength and sends transfer-encoding header. Correct?
@@ -669,7 +669,7 @@ public class HttpManyWaysToAsyncCommitTest extends AbstractHttpTest
         server.setHandler(new WriteAndSetContentLengthHandler(true));
         server.start();
 
-        SimpleHttpParser.TestHttpResponse response = executeRequest();
+        SimpleHttpResponse response = executeRequest();
 
         assertThat("response code is 200", response.getCode(), is("200"));
     }
@@ -724,7 +724,7 @@ public class HttpManyWaysToAsyncCommitTest extends AbstractHttpTest
         server.setHandler(new WriteAndSetContentLengthTooSmallHandler(false));
         server.start();
 
-        SimpleHttpParser.TestHttpResponse response = executeRequest();
+        SimpleHttpResponse response = executeRequest();
 
         assertThat("response code is 200", response.getCode(), is("200"));
         assertResponseBody(response, "foobar");
@@ -739,7 +739,7 @@ public class HttpManyWaysToAsyncCommitTest extends AbstractHttpTest
         server.setHandler(new WriteAndSetContentLengthTooSmallHandler(true));
         server.start();
 
-        SimpleHttpParser.TestHttpResponse response = executeRequest();
+        SimpleHttpResponse response = executeRequest();
 
         assertThat(response.getCode(), is("500"));
     }