Author: dazarov
Date: 2008-01-17 11:05:19 -0500 (Thu, 17 Jan 2008)
New Revision: 5770
Added:
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/resources/StrutsTest/WebContent/pages/components/bean/page.jsp
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/resources/StrutsTest/WebContent/pages/components/form/button.jsp
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/resources/StrutsTest/WebContent/pages/components/form/password.jsp
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/resources/StrutsTest/WebContent/pages/components/form/textarea.jsp
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/resources/StrutsTest/WebContent/pages/components/html/javascript.jsp
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/resources/StrutsTest/WebContent/pages/components/html/optionsCollection.jsp
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/resources/StrutsTest/WebContent/pages/components/html/xhtml.jsp
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/resources/StrutsTest/WebContent/pages/components/logic/forward.jsp
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/resources/StrutsTest/WebContent/pages/components/logic/messagesNotPresent.jsp
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/resources/StrutsTest/WebContent/pages/components/logic/messagesPresent.jsp
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/resources/StrutsTest/WebContent/pages/components/logic/notPresent.jsp
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/resources/StrutsTest/WebContent/pages/components/logic/present.jsp
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/resources/StrutsTest/WebContent/pages/components/logic/redirect.jsp
Modified:
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsBeanComponentTest.java
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsFormComponentTest.java
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsHTMLComponentTest.java
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsLogicComponentTest.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1565
Added:
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/resources/StrutsTest/WebContent/pages/components/bean/page.jsp
===================================================================
---
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/resources/StrutsTest/WebContent/pages/components/bean/page.jsp
(rev 0)
+++
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/resources/StrutsTest/WebContent/pages/components/bean/page.jsp 2008-01-17
16:05:19 UTC (rev 5770)
@@ -0,0 +1,12 @@
+<%@ taglib uri="/WEB-INF/struts-html" prefix="html" %>
+<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
+<html:html>
+<head>
+ <title></title>
+</head>
+<body>
+ <html:form action="">
+ <bean:page id="id" property="prop1" />
+ </html:form>
+</body>
+</html:html>
Added:
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/resources/StrutsTest/WebContent/pages/components/form/button.jsp
===================================================================
---
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/resources/StrutsTest/WebContent/pages/components/form/button.jsp
(rev 0)
+++
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/resources/StrutsTest/WebContent/pages/components/form/button.jsp 2008-01-17
16:05:19 UTC (rev 5770)
@@ -0,0 +1,11 @@
+<%@ taglib uri="/WEB-INF/struts-html" prefix="html" %>
+<html:html>
+<head>
+ <title></title>
+</head>
+<body>
+ <html:form action="">
+ <html:button property="prop1" value="Button" />
+ </html:form>
+</body>
+</html:html>
Added:
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/resources/StrutsTest/WebContent/pages/components/form/password.jsp
===================================================================
---
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/resources/StrutsTest/WebContent/pages/components/form/password.jsp
(rev 0)
+++
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/resources/StrutsTest/WebContent/pages/components/form/password.jsp 2008-01-17
16:05:19 UTC (rev 5770)
@@ -0,0 +1,11 @@
+<%@ taglib uri="/WEB-INF/struts-html" prefix="html" %>
+<html:html>
+<head>
+ <title></title>
+</head>
+<body>
+ <html:form action="">
+ <html:password property="prop1" value="password"/>
+ </html:form>
+</body>
+</html:html>
Added:
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/resources/StrutsTest/WebContent/pages/components/form/textarea.jsp
===================================================================
---
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/resources/StrutsTest/WebContent/pages/components/form/textarea.jsp
(rev 0)
+++
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/resources/StrutsTest/WebContent/pages/components/form/textarea.jsp 2008-01-17
16:05:19 UTC (rev 5770)
@@ -0,0 +1,11 @@
+<%@ taglib uri="/WEB-INF/struts-html" prefix="html" %>
+<html:html>
+<head>
+ <title></title>
+</head>
+<body>
+ <html:form action="">
+ <html:textarea property="prop1" rows="3" value="Very
long text!" cols="40"/>
+ </html:form>
+</body>
+</html:html>
Added:
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/resources/StrutsTest/WebContent/pages/components/html/javascript.jsp
===================================================================
---
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/resources/StrutsTest/WebContent/pages/components/html/javascript.jsp
(rev 0)
+++
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/resources/StrutsTest/WebContent/pages/components/html/javascript.jsp 2008-01-17
16:05:19 UTC (rev 5770)
@@ -0,0 +1,11 @@
+<%@ taglib uri="/WEB-INF/struts-html" prefix="html" %>
+<html:html>
+<head>
+ <title></title>
+</head>
+<body>
+ <html:form action="">
+ <html:javascript staticJavascript="script"/>
+ </html:form>
+</body>
+</html:html>
Added:
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/resources/StrutsTest/WebContent/pages/components/html/optionsCollection.jsp
===================================================================
---
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/resources/StrutsTest/WebContent/pages/components/html/optionsCollection.jsp
(rev 0)
+++
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/resources/StrutsTest/WebContent/pages/components/html/optionsCollection.jsp 2008-01-17
16:05:19 UTC (rev 5770)
@@ -0,0 +1,11 @@
+<%@ taglib uri="/WEB-INF/struts-html" prefix="html" %>
+<html:html>
+<head>
+ <title></title>
+</head>
+<body>
+ <html:form action="">
+ <html:optionsCollection
property="prop1"></html:optionsCollection>
+ </html:form>
+</body>
+</html:html>
Added:
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/resources/StrutsTest/WebContent/pages/components/html/xhtml.jsp
===================================================================
---
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/resources/StrutsTest/WebContent/pages/components/html/xhtml.jsp
(rev 0)
+++
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/resources/StrutsTest/WebContent/pages/components/html/xhtml.jsp 2008-01-17
16:05:19 UTC (rev 5770)
@@ -0,0 +1,10 @@
+<%@ taglib uri="/WEB-INF/struts-html" prefix="html" %>
+<html:html xhtml="true">
+<head>
+ <title></title>
+</head>
+<body>
+ <html:form action="">
+ </html:form>
+</body>
+</html:html>
Added:
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/resources/StrutsTest/WebContent/pages/components/logic/forward.jsp
===================================================================
---
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/resources/StrutsTest/WebContent/pages/components/logic/forward.jsp
(rev 0)
+++
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/resources/StrutsTest/WebContent/pages/components/logic/forward.jsp 2008-01-17
16:05:19 UTC (rev 5770)
@@ -0,0 +1,12 @@
+<%@ taglib uri="/WEB-INF/struts-html" prefix="html" %>
+<%@ taglib uri="/WEB-INF/struts-logic" prefix="logic" %>
+<html:html>
+<head>
+ <title></title>
+</head>
+<body>
+ <html:form action="">
+ <logic:forward name="test.jsp"/>
+ </html:form>
+</body>
+</html:html>
Added:
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/resources/StrutsTest/WebContent/pages/components/logic/messagesNotPresent.jsp
===================================================================
---
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/resources/StrutsTest/WebContent/pages/components/logic/messagesNotPresent.jsp
(rev 0)
+++
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/resources/StrutsTest/WebContent/pages/components/logic/messagesNotPresent.jsp 2008-01-17
16:05:19 UTC (rev 5770)
@@ -0,0 +1,14 @@
+<%@ taglib uri="/WEB-INF/struts-html" prefix="html" %>
+<%@ taglib uri="/WEB-INF/struts-logic" prefix="logic" %>
+<html:html>
+<head>
+ <title></title>
+</head>
+<body>
+ <html:form action="">
+ <logic:messagesNotPresent property="noSuchMessage">
+ MessagesNotPresent
+ </logic:messagesNotPresent>
+ </html:form>
+</body>
+</html:html>
Added:
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/resources/StrutsTest/WebContent/pages/components/logic/messagesPresent.jsp
===================================================================
---
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/resources/StrutsTest/WebContent/pages/components/logic/messagesPresent.jsp
(rev 0)
+++
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/resources/StrutsTest/WebContent/pages/components/logic/messagesPresent.jsp 2008-01-17
16:05:19 UTC (rev 5770)
@@ -0,0 +1,14 @@
+<%@ taglib uri="/WEB-INF/struts-html" prefix="html" %>
+<%@ taglib uri="/WEB-INF/struts-logic" prefix="logic" %>
+<html:html>
+<head>
+ <title></title>
+</head>
+<body>
+ <html:form action="">
+ <logic:messagesPresent property="anyMessage">
+ MessagesPresent
+ </logic:messagesPresent>
+ </html:form>
+</body>
+</html:html>
Added:
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/resources/StrutsTest/WebContent/pages/components/logic/notPresent.jsp
===================================================================
---
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/resources/StrutsTest/WebContent/pages/components/logic/notPresent.jsp
(rev 0)
+++
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/resources/StrutsTest/WebContent/pages/components/logic/notPresent.jsp 2008-01-17
16:05:19 UTC (rev 5770)
@@ -0,0 +1,14 @@
+<%@ taglib uri="/WEB-INF/struts-html" prefix="html" %>
+<%@ taglib uri="/WEB-INF/struts-logic" prefix="logic" %>
+<html:html>
+<head>
+ <title></title>
+</head>
+<body>
+ <html:form action="">
+ <logic:notPresent name="name" scope="scope"
property="prop">
+ NotPresent
+ </logic:notPresent>
+ </html:form>
+</body>
+</html:html>
Added:
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/resources/StrutsTest/WebContent/pages/components/logic/present.jsp
===================================================================
---
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/resources/StrutsTest/WebContent/pages/components/logic/present.jsp
(rev 0)
+++
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/resources/StrutsTest/WebContent/pages/components/logic/present.jsp 2008-01-17
16:05:19 UTC (rev 5770)
@@ -0,0 +1,14 @@
+<%@ taglib uri="/WEB-INF/struts-html" prefix="html" %>
+<%@ taglib uri="/WEB-INF/struts-logic" prefix="logic" %>
+<html:html>
+<head>
+ <title></title>
+</head>
+<body>
+ <html:form action="">
+ <logic:present name="name" scope="scope"
property="prop">
+ Present
+ </logic:present>
+ </html:form>
+</body>
+</html:html>
Added:
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/resources/StrutsTest/WebContent/pages/components/logic/redirect.jsp
===================================================================
---
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/resources/StrutsTest/WebContent/pages/components/logic/redirect.jsp
(rev 0)
+++
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/resources/StrutsTest/WebContent/pages/components/logic/redirect.jsp 2008-01-17
16:05:19 UTC (rev 5770)
@@ -0,0 +1,12 @@
+<%@ taglib uri="/WEB-INF/struts-html" prefix="html" %>
+<%@ taglib uri="/WEB-INF/struts-logic" prefix="logic" %>
+<html:html>
+<head>
+ <title></title>
+</head>
+<body>
+ <html:form action="">
+ <logic:redirect page="test.jsp"/>
+ </html:form>
+</body>
+</html:html>
Modified:
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsBeanComponentTest.java
===================================================================
---
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsBeanComponentTest.java 2008-01-17
15:44:01 UTC (rev 5769)
+++
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsBeanComponentTest.java 2008-01-17
16:05:19 UTC (rev 5770)
@@ -72,4 +72,8 @@
public void testWrite() throws Throwable {
performTestForVpeComponent((IFile)TestUtil.getComponentPath("components/bean/write.jsp",
IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
+
+ public void testPage() throws Throwable {
+ performTestForVpeComponent((IFile)TestUtil.getComponentPath("components/bean/page.jsp",
IMPORT_PROJECT_NAME)); // $NON-NLS-1$
+ }
}
Modified:
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsFormComponentTest.java
===================================================================
---
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsFormComponentTest.java 2008-01-17
15:44:01 UTC (rev 5769)
+++
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsFormComponentTest.java 2008-01-17
16:05:19 UTC (rev 5770)
@@ -84,4 +84,16 @@
public void testText() throws Throwable {
performTestForVpeComponent((IFile)TestUtil.getComponentPath("components/form/text.jsp",
IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
+
+ public void testButton() throws Throwable {
+ performTestForVpeComponent((IFile)TestUtil.getComponentPath("components/form/button.jsp",
IMPORT_PROJECT_NAME)); // $NON-NLS-1$
+ }
+
+ public void testPassword() throws Throwable {
+ performTestForVpeComponent((IFile)TestUtil.getComponentPath("components/form/password.jsp",
IMPORT_PROJECT_NAME)); // $NON-NLS-1$
+ }
+
+ public void testTextarea() throws Throwable {
+ performTestForVpeComponent((IFile)TestUtil.getComponentPath("components/form/textarea.jsp",
IMPORT_PROJECT_NAME)); // $NON-NLS-1$
+ }
}
Modified:
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsHTMLComponentTest.java
===================================================================
---
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsHTMLComponentTest.java 2008-01-17
15:44:01 UTC (rev 5769)
+++
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsHTMLComponentTest.java 2008-01-17
16:05:19 UTC (rev 5770)
@@ -68,4 +68,16 @@
public void testMessages() throws Throwable {
performTestForVpeComponent((IFile)TestUtil.getComponentPath("components/html/messages.jsp",
IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
+
+ public void testJavascript() throws Throwable {
+ performTestForVpeComponent((IFile)TestUtil.getComponentPath("components/html/javascript.jsp",
IMPORT_PROJECT_NAME)); // $NON-NLS-1$
+ }
+
+ public void testOptionsCollection() throws Throwable {
+ performTestForVpeComponent((IFile)TestUtil.getComponentPath("components/html/optionsCollection.jsp",
IMPORT_PROJECT_NAME)); // $NON-NLS-1$
+ }
+
+ public void testXHTML() throws Throwable {
+ performTestForVpeComponent((IFile)TestUtil.getComponentPath("components/html/xhtml.jsp",
IMPORT_PROJECT_NAME)); // $NON-NLS-1$
+ }
}
Modified:
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsLogicComponentTest.java
===================================================================
---
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsLogicComponentTest.java 2008-01-17
15:44:01 UTC (rev 5769)
+++
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsLogicComponentTest.java 2008-01-17
16:05:19 UTC (rev 5770)
@@ -76,4 +76,28 @@
public void testNotMatch() throws Throwable {
performTestForVpeComponent((IFile)TestUtil.getComponentPath("components/logic/notMatch.jsp",
IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
+
+ public void testForward() throws Throwable {
+ performTestForVpeComponent((IFile)TestUtil.getComponentPath("components/logic/forward.jsp",
IMPORT_PROJECT_NAME)); // $NON-NLS-1$
+ }
+
+ public void testMessagesNotPresent() throws Throwable {
+ performTestForVpeComponent((IFile)TestUtil.getComponentPath("components/logic/messagesNotPresent.jsp",
IMPORT_PROJECT_NAME)); // $NON-NLS-1$
+ }
+
+ public void testMessagesPresent() throws Throwable {
+ performTestForVpeComponent((IFile)TestUtil.getComponentPath("components/logic/messagesPresent.jsp",
IMPORT_PROJECT_NAME)); // $NON-NLS-1$
+ }
+
+ public void testNotPresent() throws Throwable {
+ performTestForVpeComponent((IFile)TestUtil.getComponentPath("components/logic/notPresent.jsp",
IMPORT_PROJECT_NAME)); // $NON-NLS-1$
+ }
+
+ public void testPresent() throws Throwable {
+ performTestForVpeComponent((IFile)TestUtil.getComponentPath("components/logic/present.jsp",
IMPORT_PROJECT_NAME)); // $NON-NLS-1$
+ }
+
+ public void testRedirect() throws Throwable {
+ performTestForVpeComponent((IFile)TestUtil.getComponentPath("components/logic/redirect.jsp",
IMPORT_PROJECT_NAME)); // $NON-NLS-1$
+ }
}