Author: markt
Date: Mon Nov 3 11:48:38 2014
New Revision: 1636329
URL: http://svn.apache.org/r1636329
Log:
Reduce boilerplate code.
Modified:
tomcat/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
tomcat/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java
Modified: tomcat/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java?rev=1636329&r1=1636328&r2=1636329&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
(original)
+++ tomcat/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java Mon
Nov 3 11:48:38 2014
@@ -16,7 +16,6 @@
*/
package org.apache.coyote.ajp;
-import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.PrintWriter;
@@ -121,13 +120,7 @@ public class TestAbstractAjpProcessor ex
public void doTestPost(boolean multipleCL, int expectedStatus) throws
Exception {
- Tomcat tomcat = getTomcatInstance();
-
- // Use the normal Tomcat ROOT context
- File root = new File("test/webapp");
- tomcat.addWebapp("", root.getAbsolutePath());
-
- tomcat.start();
+ getTomcatInstanceTestWebapp(false, true);
SimpleAjpClient ajpClient = new SimpleAjpClient();
ajpClient.setPort(getPort());
@@ -136,7 +129,7 @@ public class TestAbstractAjpProcessor ex
validateCpong(ajpClient.cping());
TesterAjpMessage forwardMessage =
- ajpClient.createForwardMessage("/echo-params.jsp", 4);
+ ajpClient.createForwardMessage("/test/echo-params.jsp", 4);
forwardMessage.addHeader(0xA008, "9");
if (multipleCL) {
forwardMessage.addHeader(0xA008, "99");
Modified:
tomcat/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java?rev=1636329&r1=1636328&r2=1636329&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java
(original)
+++ tomcat/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java
Mon Nov 3 11:48:38 2014
@@ -16,7 +16,6 @@
*/
package org.apache.coyote.http11;
-import java.io.File;
import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
@@ -137,13 +136,7 @@ public class TestAbstractHttp11Processor
@Test
public void testWithUnknownExpectation() throws Exception {
- Tomcat tomcat = getTomcatInstance();
-
- // Use the normal Tomcat ROOT context
- File root = new File("test/webapp");
- tomcat.addWebapp("", root.getAbsolutePath());
-
- tomcat.start();
+ getTomcatInstanceTestWebapp(false, true);
String request =
"POST /echo-params.jsp HTTP/1.1" + SimpleHttpClient.CRLF +
@@ -151,7 +144,7 @@ public class TestAbstractHttp11Processor
"Expect: unknoen" + SimpleHttpClient.CRLF +
SimpleHttpClient.CRLF;
- Client client = new Client(tomcat.getConnector().getLocalPort());
+ Client client = new Client(getPort());
client.setRequest(new String[] {request});
client.connect();
@@ -162,13 +155,7 @@ public class TestAbstractHttp11Processor
@Test
public void testWithTEVoid() throws Exception {
- Tomcat tomcat = getTomcatInstance();
-
- // Use the normal Tomcat ROOT context
- File root = new File("test/webapp");
- tomcat.addWebapp("", root.getAbsolutePath());
-
- tomcat.start();
+ getTomcatInstanceTestWebapp(false, true);
String request =
"POST /echo-params.jsp HTTP/1.1" + SimpleHttpClient.CRLF +
@@ -180,7 +167,7 @@ public class TestAbstractHttp11Processor
SimpleHttpClient.CRLF +
"test=data";
- Client client = new Client(tomcat.getConnector().getLocalPort());
+ Client client = new Client(getPort());
client.setRequest(new String[] {request});
client.connect();
@@ -191,13 +178,7 @@ public class TestAbstractHttp11Processor
@Test
public void testWithTEBuffered() throws Exception {
- Tomcat tomcat = getTomcatInstance();
-
- // Use the normal Tomcat ROOT context
- File root = new File("test/webapp");
- tomcat.addWebapp("", root.getAbsolutePath());
-
- tomcat.start();
+ getTomcatInstanceTestWebapp(false, true);
String request =
"POST /echo-params.jsp HTTP/1.1" + SimpleHttpClient.CRLF +
@@ -209,7 +190,7 @@ public class TestAbstractHttp11Processor
SimpleHttpClient.CRLF +
"test=data";
- Client client = new Client(tomcat.getConnector().getLocalPort());
+ Client client = new Client(getPort());
client.setRequest(new String[] {request});
client.connect();
@@ -231,19 +212,12 @@ public class TestAbstractHttp11Processor
}
- private void doTestWithTEChunked(boolean withCL)
- throws Exception {
-
- Tomcat tomcat = getTomcatInstance();
-
- // Use the normal Tomcat ROOT context
- File root = new File("test/webapp");
- tomcat.addWebapp("", root.getAbsolutePath());
+ private void doTestWithTEChunked(boolean withCL) throws Exception {
- tomcat.start();
+ getTomcatInstanceTestWebapp(false, true);
String request =
- "POST /echo-params.jsp HTTP/1.1" + SimpleHttpClient.CRLF +
+ "POST /test/echo-params.jsp HTTP/1.1" + SimpleHttpClient.CRLF +
"Host: any" + SimpleHttpClient.CRLF +
(withCL ? "Content-length: 1" + SimpleHttpClient.CRLF : "") +
"Transfer-encoding: chunked" + SimpleHttpClient.CRLF +
@@ -256,7 +230,7 @@ public class TestAbstractHttp11Processor
"0" + SimpleHttpClient.CRLF +
SimpleHttpClient.CRLF;
- Client client = new Client(tomcat.getConnector().getLocalPort());
+ Client client = new Client(getPort());
client.setRequest(new String[] {request});
client.connect();
@@ -268,16 +242,10 @@ public class TestAbstractHttp11Processor
@Test
public void testWithTEIdentity() throws Exception {
- Tomcat tomcat = getTomcatInstance();
-
- // Use the normal Tomcat ROOT context
- File root = new File("test/webapp");
- tomcat.addWebapp("", root.getAbsolutePath());
-
- tomcat.start();
+ getTomcatInstanceTestWebapp(false, true);
String request =
- "POST /echo-params.jsp HTTP/1.1" + SimpleHttpClient.CRLF +
+ "POST /test/echo-params.jsp HTTP/1.1" + SimpleHttpClient.CRLF +
"Host: any" + SimpleHttpClient.CRLF +
"Transfer-encoding: identity" + SimpleHttpClient.CRLF +
"Content-Length: 9" + SimpleHttpClient.CRLF +
@@ -287,7 +255,7 @@ public class TestAbstractHttp11Processor
SimpleHttpClient.CRLF +
"test=data";
- Client client = new Client(tomcat.getConnector().getLocalPort());
+ Client client = new Client(getPort());
client.setRequest(new String[] {request});
client.connect();
@@ -299,13 +267,7 @@ public class TestAbstractHttp11Processor
@Test
public void testWithTESavedRequest() throws Exception {
- Tomcat tomcat = getTomcatInstance();
-
- // Use the normal Tomcat ROOT context
- File root = new File("test/webapp");
- tomcat.addWebapp("", root.getAbsolutePath());
-
- tomcat.start();
+ getTomcatInstanceTestWebapp(false, true);
String request =
"POST /echo-params.jsp HTTP/1.1" + SimpleHttpClient.CRLF +
@@ -317,7 +279,7 @@ public class TestAbstractHttp11Processor
SimpleHttpClient.CRLF +
"test=data";
- Client client = new Client(tomcat.getConnector().getLocalPort());
+ Client client = new Client(getPort());
client.setRequest(new String[] {request});
client.connect();
@@ -328,13 +290,7 @@ public class TestAbstractHttp11Processor
@Test
public void testWithTEUnsupported() throws Exception {
- Tomcat tomcat = getTomcatInstance();
-
- // Use the normal Tomcat ROOT context
- File root = new File("test/webapp");
- tomcat.addWebapp("", root.getAbsolutePath());
-
- tomcat.start();
+ getTomcatInstanceTestWebapp(false, true);
String request =
"POST /echo-params.jsp HTTP/1.1" + SimpleHttpClient.CRLF +
@@ -346,7 +302,7 @@ public class TestAbstractHttp11Processor
SimpleHttpClient.CRLF +
"test=data";
- Client client = new Client(tomcat.getConnector().getLocalPort());
+ Client client = new Client(getPort());
client.setRequest(new String[] {request});
client.connect();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
