geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiam...@apache.org
Subject svn commit: r1070820 - in /geronimo/server/branches/3.0-M2/testsuite/web-testsuite/test-2.5-servlets/src: main/java/com/test/servlet/AddressServlet.java test/java/org/apache/geronimo/testsuite/servlets/TestServlets.java
Date Tue, 15 Feb 2011 09:20:49 GMT
Author: xiaming
Date: Tue Feb 15 09:20:49 2011
New Revision: 1070820

URL: http://svn.apache.org/viewvc?rev=1070820&view=rev
Log:
GERONIMO-5795 Allow IPv6 address type and fix a html tag missmatch

Modified:
    geronimo/server/branches/3.0-M2/testsuite/web-testsuite/test-2.5-servlets/src/main/java/com/test/servlet/AddressServlet.java
    geronimo/server/branches/3.0-M2/testsuite/web-testsuite/test-2.5-servlets/src/test/java/org/apache/geronimo/testsuite/servlets/TestServlets.java

Modified: geronimo/server/branches/3.0-M2/testsuite/web-testsuite/test-2.5-servlets/src/main/java/com/test/servlet/AddressServlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/testsuite/web-testsuite/test-2.5-servlets/src/main/java/com/test/servlet/AddressServlet.java?rev=1070820&r1=1070819&r2=1070820&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/testsuite/web-testsuite/test-2.5-servlets/src/main/java/com/test/servlet/AddressServlet.java
(original)
+++ geronimo/server/branches/3.0-M2/testsuite/web-testsuite/test-2.5-servlets/src/main/java/com/test/servlet/AddressServlet.java
Tue Feb 15 09:20:49 2011
@@ -49,7 +49,7 @@ import javax.servlet.http.HttpServletRes
 	protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException,
IOException {
 
 		PrintWriter out = response.getWriter();
-		out.println("<html><head><title>Sample application with Servlets 2.5</title></head></html>");
+		out.println("<html><head><title>Sample application with Servlets 2.5</title></head>");
 		out.println("<body>");
 		out.println("<font align=Center face=\"Garamond\">Address Test</font>");
 		out.println("<font align=Center face=\"Garamond\">Remote Address:" + request.getRemoteAddr()
+ "</font>");

Modified: geronimo/server/branches/3.0-M2/testsuite/web-testsuite/test-2.5-servlets/src/test/java/org/apache/geronimo/testsuite/servlets/TestServlets.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/testsuite/web-testsuite/test-2.5-servlets/src/test/java/org/apache/geronimo/testsuite/servlets/TestServlets.java?rev=1070820&r1=1070819&r2=1070820&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/testsuite/web-testsuite/test-2.5-servlets/src/test/java/org/apache/geronimo/testsuite/servlets/TestServlets.java
(original)
+++ geronimo/server/branches/3.0-M2/testsuite/web-testsuite/test-2.5-servlets/src/test/java/org/apache/geronimo/testsuite/servlets/TestServlets.java
Tue Feb 15 09:20:49 2011
@@ -48,6 +48,6 @@ public class TestServlets extends Seleni
         waitForPageLoad();
         assertEquals("Sample application with Servlets 2.5", selenium.getTitle());
         String actual = selenium.getText("xpath=/html/body");
-        assertEquals(actual, "Address Test Remote Address:127.0.0.1", actual);
+        assertEquals(true, (actual.contains("Address Test Remote Address:127.0.0.1")||actual.contains("Address
Test Remote Address:0:0:0:0:0:0:0:1")));
     }
 }
\ No newline at end of file



Mime
View raw message