Author: scabanovich
Date: 2012-03-14 19:36:25 -0400 (Wed, 14 Mar 2012)
New Revision: 39520
Added:
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/testJSFProject/WebContent/pages/inputname.html
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/testJSFProject/WebContent/pages/inputname.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAInEventAttributesTest.java
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/testJSFProject/WebContent/pages/inputUserName.jsp
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java
Log:
JBIDE-11303
https://issues.jboss.org/browse/JBIDE-11303
Content assist in event attributes is fixed.
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/testJSFProject/WebContent/pages/inputUserName.jsp
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/testJSFProject/WebContent/pages/inputUserName.jsp 2012-03-14
23:33:48 UTC (rev 39519)
+++
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/testJSFProject/WebContent/pages/inputUserName.jsp 2012-03-14
23:36:25 UTC (rev 39520)
@@ -24,5 +24,6 @@
</h:form>
</f:view>
+ <p onclick="#{}"></p>
</body>
</html>
\ No newline at end of file
Added:
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/testJSFProject/WebContent/pages/inputname.html
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/testJSFProject/WebContent/pages/inputname.html
(rev 0)
+++
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/testJSFProject/WebContent/pages/inputname.html 2012-03-14
23:36:25 UTC (rev 39520)
@@ -0,0 +1,7 @@
+<html>
+ <head>
+ </head>
+ <body>
+ <p onclick="#{}"></p>
+ </body>
+</html>
\ No newline at end of file
Property changes on:
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/testJSFProject/WebContent/pages/inputname.html
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added:
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/testJSFProject/WebContent/pages/inputname.xhtml
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/testJSFProject/WebContent/pages/inputname.xhtml
(rev 0)
+++
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/testJSFProject/WebContent/pages/inputname.xhtml 2012-03-14
23:36:25 UTC (rev 39520)
@@ -0,0 +1,27 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html
xmlns="http://www.w3.org/1999/xhtml"
+
xmlns:ui="http://java.sun.com/jsf/facelets"
+
xmlns:h="http://java.sun.com/jsf/html"
+
xmlns:f="http://java.sun.com/jsf/core"
+
xmlns:c="http://java.sun.com/jstl/core">
+
+ <f:loadBundle basename="resources" var="msg" />
+
+ <ui:composition template="/templates/common.xhtml">
+
+ <ui:define name="pageTitle">Input User Name</ui:define>
+
+ <ui:define name="pageHeader">Facelets Hello
Application</ui:define>
+
+ <ui:define name="body">
+ <h:message showSummary="true" showDetail="false"
style="color: red; font-weight: bold;" for="name" />
+ <form jsfc="h:form" id="helloForm">
+ ${msg.prompt}
+ <input label="Name" jsfc="h:inputText"
required="true" id="name" value="#{person.name}" />
+ <input type="submit" jsfc="h:commandButton"
id="submit"
+ action="greeting" value="Say Hello" />
+ </form>
+ <p onclick="#{}"></p>
+ </ui:define>
+ </ui:composition>
+</html>
Added:
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAInEventAttributesTest.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAInEventAttributesTest.java
(rev 0)
+++
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAInEventAttributesTest.java 2012-03-14
23:36:25 UTC (rev 39520)
@@ -0,0 +1,59 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at
http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.jsf.jsp.ca.test;
+
+import org.jboss.tools.jst.jsp.test.ca.ContentAssistantTestCase;
+import org.jboss.tools.test.util.TestProjectProvider;
+
+public class CAInEventAttributesTest extends ContentAssistantTestCase{
+ TestProjectProvider provider = null;
+ boolean makeCopy = true;
+ private static final String PROJECT_NAME = "testJSFProject"; //$NON-NLS-1$
+ private static final String JSP_PAGE_NAME =
"/WebContent/pages/inputUserName.jsp"; //$NON-NLS-1$
+ private static final String XHTML_PAGE_NAME =
"/WebContent/pages/inputname.xhtml"; //$NON-NLS-1$
+ private static final String HTML_PAGE_NAME =
"/WebContent/pages/inputname.html"; //$NON-NLS-1$
+
+ public void setUp() throws Exception {
+ provider = new TestProjectProvider("org.jboss.tools.jsf.ui.test", null,
PROJECT_NAME, makeCopy); //$NON-NLS-1$
+ project = provider.getProject();
+ }
+
+ protected void tearDown() throws Exception {
+ if(provider != null) {
+ provider.dispose();
+ }
+ }
+
+ public void testCAInOnclickInJSP(){
+ String[] proposals = {
+ "user", //$NON-NLS-1$
+ };
+
+ checkProposals(JSP_PAGE_NAME, "<p onclick=\"#{}\">", 14,
proposals, false, false);
+ }
+
+ public void testCAInOnclickInXHTML(){
+ String[] proposals = {
+ "user", //$NON-NLS-1$
+ };
+
+ checkProposals(XHTML_PAGE_NAME, "<p onclick=\"#{}\">", 14,
proposals, false, false);
+ }
+
+ public void testCAInOnclickInHTML(){
+ String[] proposals = {
+ "user", //$NON-NLS-1$
+ };
+
+ checkProposals(HTML_PAGE_NAME, "<p onclick=\"#{}\">", 14,
proposals, false, false);
+ }
+
+}
\ No newline at end of file
Property changes on:
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAInEventAttributesTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java 2012-03-14
23:33:48 UTC (rev 39519)
+++
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java 2012-03-14
23:36:25 UTC (rev 39520)
@@ -26,6 +26,7 @@
import org.jboss.tools.jsf.jsp.ca.test.CAForJSF2BeansInJavaTest;
import org.jboss.tools.jsf.jsp.ca.test.CAForJSF2BeansTest;
import org.jboss.tools.jsf.jsp.ca.test.CAForUnclosedELTest;
+import org.jboss.tools.jsf.jsp.ca.test.CAInEventAttributesTest;
import org.jboss.tools.jsf.jsp.ca.test.CAJsfAddInfoInELMessagesTest;
import org.jboss.tools.jsf.jsp.ca.test.CAJsfMessagesProposalsFilteringTest;
import org.jboss.tools.jsf.jsp.ca.test.CAJsfMessagesProposalsTest;
@@ -74,6 +75,7 @@
suite.addTestSuite(JsfJspJbide1704Test.class);
suite.addTestSuite(JsfJspJbide1717Test.class);
suite.addTestSuite(JsfJBide3845Test.class);
+ suite.addTestSuite(CAInEventAttributesTest.class);
suite.addTest(
new ProjectImportTestSetup(JsfJspLongResourceBundlePropertyNamesTest.suite(),