You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2007/09/21 07:00:06 UTC

svn commit: r577984 - in /geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src: main/webapp/testScopes.jsp test/java/org/apache/geronimo/testsuite/jsps/TestJsps.java

Author: gawor
Date: Thu Sep 20 22:00:04 2007
New Revision: 577984

URL: http://svn.apache.org/viewvc?rev=577984&view=rev
Log:
fix tests

Modified:
    geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/testScopes.jsp
    geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/test/java/org/apache/geronimo/testsuite/jsps/TestJsps.java

Modified: geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/testScopes.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/testScopes.jsp?rev=577984&r1=577983&r2=577984&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/testScopes.jsp (original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/testScopes.jsp Thu Sep 20 22:00:04 2007
@@ -23,9 +23,6 @@
 <c:set var="var2" value="value2" scope="request"/>
 <c:set var="var3" value="value3" scope="session"/>
 <c:set var="var4" value="value4" scope="application"/>
-<c:out value='${pageScope.var1}' />
-<c:out value='${requestScope.var2}' />
-<c:out value='${sessionScope.var3}' />
-<c:out value='${applicationScope.var4}' />
+<c:out value='${pageScope.var1} ${requestScope.var2} ${sessionScope.var3} ${applicationScope.var4}' />
 </body>
 </html>

Modified: geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/test/java/org/apache/geronimo/testsuite/jsps/TestJsps.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/test/java/org/apache/geronimo/testsuite/jsps/TestJsps.java?rev=577984&r1=577983&r2=577984&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/test/java/org/apache/geronimo/testsuite/jsps/TestJsps.java (original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/test/java/org/apache/geronimo/testsuite/jsps/TestJsps.java Thu Sep 20 22:00:04 2007
@@ -32,7 +32,7 @@
         selenium.waitForPageToLoad("30000");
         
         //throw new Exception(selenium.getText("xpath=/html/body"));
-        assertEquals("One Two", selenium.getText("xpath=/html/body"));
+        assertEquals("OneTwo", selenium.getText("xpath=/html/body"));
     }
 
     @Test