[jbosstools-commits] JBoss Tools SVN: r23968 - in trunk/vpe/tests/org.jboss.tools.vpe.spring.test: resources/SpringTest/src/main/webapp and 3 other directories.

jbosstools-commits at lists.jboss.org jbosstools-commits at lists.jboss.org
Fri Aug 6 08:31:04 EDT 2010


Author: dvinnichek
Date: 2010-08-06 08:31:01 -0400 (Fri, 06 Aug 2010)
New Revision: 23968

Added:
   trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/htmlEscape.jsp
   trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/htmlEscape.jsp.xml
Modified:
   trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/java/org/jboss/tools/vpe/spring/test/springtest/FormBean.java
   trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/springapp-servlet.xml
   trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/index.jsp
   trunk/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringComponentContentTest.java
Log:
add tests for spring:htmlEscape (https://jira.jboss.org/browse/JBIDE-6711)

Modified: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/java/org/jboss/tools/vpe/spring/test/springtest/FormBean.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/java/org/jboss/tools/vpe/spring/test/springtest/FormBean.java	2010-08-06 10:56:01 UTC (rev 23967)
+++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/java/org/jboss/tools/vpe/spring/test/springtest/FormBean.java	2010-08-06 12:31:01 UTC (rev 23968)
@@ -25,6 +25,8 @@
 	
 	private User user;
 	private String verificationNum;
+	
+	private String javascriptStr = "<script>alert('Hello!');</script>";
 
 	public FormBean() {
 		for (CategoryType categoryType : CategoryType.values()) {
@@ -125,4 +127,12 @@
 	public void setSelectedCategory(String selectedCategory) {
 		this.selectedCategory = selectedCategory;
 	}
+
+	public String getJavascriptStr() {
+		return javascriptStr;
+	}
+
+	public void setJavascriptStr(String javascriptStr) {
+		this.javascriptStr = javascriptStr;
+	}
 }

Added: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/htmlEscape.jsp
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/htmlEscape.jsp	                        (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/htmlEscape.jsp	2010-08-06 12:31:01 UTC (rev 23968)
@@ -0,0 +1,27 @@
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+
+<html>
+    <body>
+    	<h1>Test of spring:htmlEscape</h1>
+    	
+    	<form:form modelAttribute="formBean">
+			
+			<span id="htmlEscapeTrue">
+				<spring:htmlEscape defaultHtmlEscape="true" />
+			</span>
+			<spring:bind path="javascriptStr">
+				${status.value}
+			</spring:bind>
+			
+			<span id="htmlEscapeFalse">
+				<spring:htmlEscape defaultHtmlEscape="false" />
+			</span>
+			<spring:bind path="javascriptStr">
+				${status.value}
+			</spring:bind>
+			
+		</form:form>
+    </body>
+</html>
\ No newline at end of file


Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/htmlEscape.jsp
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Added: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/htmlEscape.jsp.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/htmlEscape.jsp.xml	                        (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/htmlEscape.jsp.xml	2010-08-06 12:31:01 UTC (rev 23968)
@@ -0,0 +1,10 @@
+<tests>
+	<test id="htmlEscapeTrue">
+		<SPAN ID="htmlEscapeTrue">
+		</SPAN>
+	</test>
+	<test id="htmlEscapeFalse">
+		<SPAN ID="htmlEscapeFalse">
+		</SPAN>
+	</test>
+</tests>
\ No newline at end of file


Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/htmlEscape.jsp.xml
___________________________________________________________________
Name: svn:mime-type
   + text/xml
Name: svn:eol-style
   + native

Modified: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/springapp-servlet.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/springapp-servlet.xml	2010-08-06 10:56:01 UTC (rev 23967)
+++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/springapp-servlet.xml	2010-08-06 12:31:01 UTC (rev 23968)
@@ -35,6 +35,7 @@
     <bean name="/select.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/>
     <bean name="/escapeBody.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/>
     <bean name="/url.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/>
+    <bean name="/htmlEscape.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/>
     <bean id="userValidator" class="org.jboss.tools.vpe.spring.test.springtest.validator.UserValidator"/>
     <bean id="beanValidator" class="org.jboss.tools.vpe.spring.test.springtest.validator.BeanValidator"/>
     

Modified: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/index.jsp
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/index.jsp	2010-08-06 10:56:01 UTC (rev 23967)
+++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/index.jsp	2010-08-06 12:31:01 UTC (rev 23968)
@@ -26,4 +26,6 @@
 <br/>
 <a href="transform.htm">transform.htm</a>
 <br/>
+<a href="htmlEscape.htm">htmlEscape.htm</a>
+<br/>
 

Modified: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringComponentContentTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringComponentContentTest.java	2010-08-06 10:56:01 UTC (rev 23967)
+++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringComponentContentTest.java	2010-08-06 12:31:01 UTC (rev 23968)
@@ -120,6 +120,10 @@
 	public void testTransform() throws Throwable {
 		performContentTestByFullPath("src/main/webapp/WEB-INF/jsp/transform.jsp"); //$NON-NLS-1$
 	}
+
+	public void testHtmlEscape() throws Throwable {
+		performContentTestByFullPath("src/main/webapp/WEB-INF/jsp/htmlEscape.jsp"); //$NON-NLS-1$
+	}
 	
 	@Override
 	protected String getTestProjectName() {



More information about the jbosstools-commits mailing list