vmassol 2004/01/25 04:28:14
Modified:
samples/servlet/src/test-cactus/share/org/apache/cactus/sample/servlet/unit
TestSetURL.java
Log:
Removed previously committed calls to getRequestURL() as this works only for J2EE
1.3. I'm adding a specific test in the j2ee13/ directory for that.
Revision Changes Path
1.4 +1 -13
jakarta-cactus/samples/servlet/src/test-cactus/share/org/apache/cactus/sample/servlet/unit/TestSetURL.java
Index: TestSetURL.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/samples/servlet/src/test-cactus/share/org/apache/cactus/sample/servlet/unit/TestSetURL.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestSetURL.java 25 Jan 2004 12:06:07 -0000 1.3
+++ TestSetURL.java 25 Jan 2004 12:28:14 -0000 1.4
@@ -88,8 +88,6 @@
public void testSimulatedURLBasics()
{
assertEquals("/test/test.jsp", request.getRequestURI());
- assertEquals("http://jakarta.apache.org:80/test/test.jsp",
- request.getRequestURL().toString());
assertEquals("jakarta.apache.org", request.getServerName());
assertEquals(80, request.getServerPort());
assertEquals("", request.getContextPath());
@@ -115,8 +113,6 @@
public void testSimulatedURL1()
{
assertEquals("/mywebapp/test/test.jsp", request.getRequestURI());
- assertEquals("http://jakarta.apache.org:80/mywebapp/test/test.jsp",
- request.getRequestURL().toString());
assertEquals("jakarta.apache.org", request.getServerName());
assertEquals(80, request.getServerPort());
assertEquals("/mywebapp", request.getContextPath());
@@ -143,8 +139,6 @@
{
assertEquals("jakarta.apache.org", request.getServerName());
assertEquals("/catalog/lawn/index.html", request.getRequestURI());
- assertEquals("http://jakarta.apache.org:80/catalog/lawn/index.html",
- request.getRequestURL().toString());
assertEquals(80, request.getServerPort());
assertEquals("/catalog", request.getContextPath());
assertEquals("/lawn", request.getServletPath());
@@ -172,8 +166,6 @@
{
assertEquals("jakarta.apache.org", request.getServerName());
assertEquals("/catalog/garden/implements/", request.getRequestURI());
- assertEquals("http://jakarta.apache.org:80/catalog/garden/implements/",
- request.getRequestURL().toString());
assertEquals(80, request.getServerPort());
assertEquals("/catalog", request.getContextPath());
assertEquals("/garden", request.getServletPath());
@@ -201,8 +193,6 @@
{
assertEquals("jakarta.apache.org", request.getServerName());
assertEquals("/catalog/help/feedback.jsp", request.getRequestURI());
- assertEquals("http://jakarta.apache.org:80/catalog/help/feedback.jsp",
- request.getRequestURL().toString());
assertEquals(80, request.getServerPort());
assertEquals("/catalog", request.getContextPath());
assertEquals("/help/feedback.jsp", request.getServletPath());
@@ -233,8 +223,6 @@
{
assertEquals("jakarta.apache.org", request.getServerName());
assertEquals("/catalog/help/feedback.jsp", request.getRequestURI());
- assertEquals("http://jakarta.apache.org:80/catalog/help/feedback.jsp",
- request.getRequestURL().toString());
assertEquals(80, request.getServerPort());
assertEquals("/catalog", request.getContextPath());
assertEquals("/help/feedback.jsp", request.getServletPath());
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]