You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by mu...@apache.org on 2009/08/14 23:02:36 UTC
svn commit: r804373 [19/19] - in /struts/sandbox/trunk/struts2-jsp-plugin:
./ src/main/java/org/apache/struts2/ src/main/java/org/apache/struts2/jasper/
src/main/java/org/apache/struts2/jasper/compiler/
src/main/java/org/apache/struts2/jasper/compiler/...
Modified: struts/sandbox/trunk/struts2-jsp-plugin/src/test/java/org/apache/struts2/EmbeddedJSPResultTest.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-jsp-plugin/src/test/java/org/apache/struts2/EmbeddedJSPResultTest.java?rev=804373&r1=804372&r2=804373&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-jsp-plugin/src/test/java/org/apache/struts2/EmbeddedJSPResultTest.java (original)
+++ struts/sandbox/trunk/struts2-jsp-plugin/src/test/java/org/apache/struts2/EmbeddedJSPResultTest.java Fri Aug 14 21:02:33 2009
@@ -25,22 +25,21 @@
import com.opensymphony.xwork2.inject.Container;
import com.opensymphony.xwork2.util.ValueStack;
import junit.framework.TestCase;
-import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang.xwork.StringUtils;
import org.easymock.EasyMock;
import org.easymock.IAnswer;
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.mock.web.MockServletContext;
+import javax.servlet.Servlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
-import javax.servlet.Servlet;
+import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Map;
import java.util.List;
-import java.util.ArrayList;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.CyclicBarrier;
+import java.util.Map;
import java.util.concurrent.BrokenBarrierException;
+import java.util.concurrent.CyclicBarrier;
public class EmbeddedJSPResultTest extends TestCase {
private HttpServletRequest request;
@@ -48,6 +47,22 @@
private MockServletContext context;
private EmbeddedJSPResult result;
+ public void testEmbedded() throws Exception {
+ //the jsp is inside jsps.jar
+ result.setLocation("dir/all.jsp");
+ result.execute(null);
+
+ assertEquals("helloJGWhoamI?XXXXXXXXXXXYThissessionisnotsecure.", StringUtils.deleteWhitespace(response.getContentAsString()));
+ }
+
+ public void testEmbeddedAbsolutePath() throws Exception {
+ //the jsp is inside jsps.jar
+ result.setLocation("/dir/all.jsp");
+ result.execute(null);
+
+ assertEquals("helloJGWhoamI?XXXXXXXXXXXYThissessionisnotsecure.", StringUtils.deleteWhitespace(response.getContentAsString()));
+ }
+
public void testSimple() throws Exception {
result.setLocation("org/apache/struts2/simple0.jsp");
result.execute(null);
@@ -66,35 +81,35 @@
result.setLocation("org/apache/struts2/tag0.jsp");
result.execute(null);
- assertEquals("Thissessionisnotsecure.OtherText", cleanup(response.getContentAsString()));
+ assertEquals("Thissessionisnotsecure.OtherText", StringUtils.deleteWhitespace(response.getContentAsString()));
}
public void testIncludeSimple() throws Exception {
result.setLocation("org/apache/struts2/includes0.jsp");
result.execute(null);
- assertEquals("helloTest", cleanup(response.getContentAsString()));
+ assertEquals("helloTest", StringUtils.deleteWhitespace(response.getContentAsString()));
}
public void testIncludeSimpleWithDirective() throws Exception {
result.setLocation("org/apache/struts2/includes3.jsp");
result.execute(null);
- assertEquals("helloTest", cleanup(response.getContentAsString()));
+ assertEquals("helloTest", StringUtils.deleteWhitespace(response.getContentAsString()));
}
public void testIncludeWithSubdir() throws Exception {
result.setLocation("org/apache/struts2/includes1.jsp");
result.execute(null);
- assertEquals("subTest", cleanup(response.getContentAsString()));
+ assertEquals("subTest", StringUtils.deleteWhitespace(response.getContentAsString()));
}
public void testIncludeWithParam() throws Exception {
result.setLocation("org/apache/struts2/includes2.jsp");
result.execute(null);
- assertEquals("JGTest", cleanup(response.getContentAsString()));
+ assertEquals("JGTest", StringUtils.deleteWhitespace(response.getContentAsString()));
}
public void testBroken0() throws Exception {
@@ -111,7 +126,7 @@
result.setLocation("org/apache/struts2/jstl.jsp");
result.execute(null);
- assertEquals("XXXXXXXXXXXY", cleanup(response.getContentAsString()));
+ assertEquals("XXXXXXXXXXXY", StringUtils.deleteWhitespace(response.getContentAsString()));
}
@@ -154,18 +169,13 @@
}
}
- public void testBeans() throws Exception {
+ public void testBeans() throws Exception {
result.setLocation("org/apache/struts2/beans.jsp");
result.execute(null);
- assertEquals("WhoamI?", cleanup(response.getContentAsString()));
- }
-
- private String cleanup(String str) {
- return str.replaceAll("\\s", "");
+ assertEquals("WhoamI?", StringUtils.deleteWhitespace(response.getContentAsString()));
}
-
@Override
protected void setUp() throws Exception {
super.setUp();
Modified: struts/sandbox/trunk/struts2-jsp-plugin/src/test/resources/org/apache/struts2/beans.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-jsp-plugin/src/test/resources/org/apache/struts2/beans.jsp?rev=804373&r1=804372&r2=804373&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-jsp-plugin/src/test/resources/org/apache/struts2/beans.jsp (original)
+++ struts/sandbox/trunk/struts2-jsp-plugin/src/test/resources/org/apache/struts2/beans.jsp Fri Aug 14 21:02:33 2009
@@ -1,2 +1,2 @@
-<jsp:useBean id="mybean" class="org.apache.struts2.SoyBean" scope="page" />
-<jsp:getProperty name="mybean" property="message" />
+<jsp:useBean id="mybean" class="org.apache.struts2.SoyBean" scope="page"/>
+<jsp:getProperty name="mybean" property="message"/>
Modified: struts/sandbox/trunk/struts2-jsp-plugin/src/test/resources/org/apache/struts2/broken0.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-jsp-plugin/src/test/resources/org/apache/struts2/broken0.jsp?rev=804373&r1=804372&r2=804373&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-jsp-plugin/src/test/resources/org/apache/struts2/broken0.jsp (original)
+++ struts/sandbox/trunk/struts2-jsp-plugin/src/test/resources/org/apache/struts2/broken0.jsp Fri Aug 14 21:02:33 2009
@@ -1,2 +1,2 @@
-<jsp:include page="org/apache/struts2/printParam.jsp" >
+<jsp:include page="org/apache/struts2/printParam.jsp">
\ No newline at end of file
Modified: struts/sandbox/trunk/struts2-jsp-plugin/src/test/resources/org/apache/struts2/includes0.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-jsp-plugin/src/test/resources/org/apache/struts2/includes0.jsp?rev=804373&r1=804372&r2=804373&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-jsp-plugin/src/test/resources/org/apache/struts2/includes0.jsp (original)
+++ struts/sandbox/trunk/struts2-jsp-plugin/src/test/resources/org/apache/struts2/includes0.jsp Fri Aug 14 21:02:33 2009
@@ -1,2 +1,2 @@
-<jsp:include page="org/apache/struts2/simple0.jsp" />
+<jsp:include page="org/apache/struts2/simple0.jsp"/>
Test
\ No newline at end of file
Modified: struts/sandbox/trunk/struts2-jsp-plugin/src/test/resources/org/apache/struts2/includes1.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-jsp-plugin/src/test/resources/org/apache/struts2/includes1.jsp?rev=804373&r1=804372&r2=804373&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-jsp-plugin/src/test/resources/org/apache/struts2/includes1.jsp (original)
+++ struts/sandbox/trunk/struts2-jsp-plugin/src/test/resources/org/apache/struts2/includes1.jsp Fri Aug 14 21:02:33 2009
@@ -1,2 +1,2 @@
-<jsp:include page="org/apache/struts2/sub/simple0.jsp" />
+<jsp:include page="org/apache/struts2/sub/simple0.jsp"/>
Test
\ No newline at end of file
Modified: struts/sandbox/trunk/struts2-jsp-plugin/src/test/resources/org/apache/struts2/includes2.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-jsp-plugin/src/test/resources/org/apache/struts2/includes2.jsp?rev=804373&r1=804372&r2=804373&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-jsp-plugin/src/test/resources/org/apache/struts2/includes2.jsp (original)
+++ struts/sandbox/trunk/struts2-jsp-plugin/src/test/resources/org/apache/struts2/includes2.jsp Fri Aug 14 21:02:33 2009
@@ -1,4 +1,4 @@
-<jsp:include page="org/apache/struts2/printParam.jsp" >
- <jsp:param name="username" value="JG" />
+<jsp:include page="org/apache/struts2/printParam.jsp">
+ <jsp:param name="username" value="JG"/>
</jsp:include>
Test
\ No newline at end of file
Modified: struts/sandbox/trunk/struts2-jsp-plugin/src/test/resources/org/apache/struts2/jstl.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-jsp-plugin/src/test/resources/org/apache/struts2/jstl.jsp?rev=804373&r1=804372&r2=804373&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-jsp-plugin/src/test/resources/org/apache/struts2/jstl.jsp (original)
+++ struts/sandbox/trunk/struts2-jsp-plugin/src/test/resources/org/apache/struts2/jstl.jsp Fri Aug 14 21:02:33 2009
@@ -2,8 +2,8 @@
<c:set var="number" value="10"/>
<c:forEach begin="0" end="${number}">
-X
+ X
</c:forEach>
<c:if test="${number < 15}">
-Y
+ Y
</c:if>
\ No newline at end of file
Modified: struts/sandbox/trunk/struts2-jsp-plugin/src/test/resources/org/apache/struts2/tag0.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-jsp-plugin/src/test/resources/org/apache/struts2/tag0.jsp?rev=804373&r1=804372&r2=804373&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-jsp-plugin/src/test/resources/org/apache/struts2/tag0.jsp (original)
+++ struts/sandbox/trunk/struts2-jsp-plugin/src/test/resources/org/apache/struts2/tag0.jsp Fri Aug 14 21:02:33 2009
@@ -1,5 +1,5 @@
<%@ taglib prefix="r" uri="http://jakarta.apache.org/taglibs/request-1.0" %>
<r:isSecure value="false">
- This session is not secure.
+ This session is not secure.
</r:isSecure>
OtherText
\ No newline at end of file