7:17 p.m.
Author: scabanovich
Date: 2011-06-02 20:17:55 -0400 (Thu, 02 Jun 2011)
New Revision: 31791
Added:
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/TestKbModel/WebContent/resources/
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/TestKbModel/WebContent/resources/demo/
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/TestKbModel/WebContent/resources/demo/input.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/TestKbModel/WebContent/resources/demo/input2.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/kb/test/KbModelTest.java
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/kb/test/JsfKbAllTests.java
Log:
JBIDE-9060
https://issues.jboss.org/browse/JBIDE-9060
Added:
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/TestKbModel/WebContent/resources/demo/input.xhtml
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/TestKbModel/WebContent/resources/demo/input.xhtml
(rev 0)
+++
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/TestKbModel/WebContent/resources/demo/input.xhtml 2011-06-03
00:17:55 UTC (rev 31791)
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<h:commandButton xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:composite="http://java.sun.com/jsf/composite">
+
+ <composite:interface>
+ <composite:attribute name="label"/>
+ <composite:attribute name="value" required="true"/>
+ <composite:attribute name="action" required="true"
method-signature="java.lang.String f()"/>
+ <composite:attribute name="submitlabel"/>
+ </composite:interface>
+
+ <composite:implementation>
+ <h:form>
+ <h:outputText value="#{cc.attrs.label}" />
+ <h:inputText value="#{cc.attrs.value}" />
+ <h:commandButton action="#{cc.attrs.action}"
value="#{cc.attrs.submitlabel}" />
+ </h:form>
+ </composite:implementation>
+</h:commandButton>
\ No newline at end of file
Property changes on:
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/TestKbModel/WebContent/resources/demo/input.xhtml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added:
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/TestKbModel/WebContent/resources/demo/input2.xhtml
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/TestKbModel/WebContent/resources/demo/input2.xhtml
(rev 0)
+++
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/TestKbModel/WebContent/resources/demo/input2.xhtml 2011-06-03
00:17:55 UTC (rev 31791)
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!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:h="http://java.sun.com/jsf/html"
+ xmlns:composite="http://java.sun.com/jsf/composite">
+
+ <composite:interface>
+ <composite:attribute name="label2"/>
+ <composite:attribute name="value2" required="true"/>
+ <composite:attribute name="action2" required="true"
method-signature="java.lang.String f()"/>
+ <composite:attribute name="submitlabel2"/>
+ </composite:interface>
+
+ <composite:implementation>
+ <h:form>
+ <h:outputText value="#{cc.attrs.label2}" />
+ <h:inputText value="#{cc.attrs.value2}" />
+ <h:commandButton action="#{cc.attrs.action2}"
value="#{cc.attrs.submitlabel2}" />
+ </h:form>
+ </composite:implementation>
+</html>
\ No newline at end of file
Property changes on:
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/TestKbModel/WebContent/resources/demo/input2.xhtml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/kb/test/JsfKbAllTests.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/kb/test/JsfKbAllTests.java 2011-06-02
23:12:37 UTC (rev 31790)
+++
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/kb/test/JsfKbAllTests.java 2011-06-03
00:17:55 UTC (rev 31791)
@@ -24,6 +24,7 @@
public static Test suite() {
TestSuite suite = new TestSuite(JsfKbAllTests.class.getName());
suite.addTestSuite(FaceletsKbModelTest.class);
+ suite.addTestSuite(KbModelTest.class);
ProjectImportTestSetup testSetup = new XProjectImportTestSetUp(suite,
"org.jboss.tools.jsf.test",
new String[]{"projects/TestKbModel"},
Added:
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/kb/test/KbModelTest.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/kb/test/KbModelTest.java
(rev 0)
+++
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/kb/test/KbModelTest.java 2011-06-03
00:17:55 UTC (rev 31791)
@@ -0,0 +1,73 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Exadel, Inc. and 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:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.jsf.kb.test;
+
+import java.util.List;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.jboss.tools.jst.web.kb.IKbProject;
+import org.jboss.tools.jst.web.kb.internal.scanner.LoadedDeclarations;
+import org.jboss.tools.jst.web.kb.internal.scanner.ScannerException;
+import org.jboss.tools.jst.web.kb.internal.scanner.XMLScanner;
+import org.jboss.tools.jst.web.kb.internal.taglib.ELFunction;
+import org.jboss.tools.jst.web.kb.internal.taglib.composite.CompositeTagLibrary;
+import org.jboss.tools.jst.web.kb.taglib.IComponent;
+import org.jboss.tools.jst.web.kb.taglib.IELFunction;
+import org.jboss.tools.jst.web.kb.taglib.IFunctionLibrary;
+import org.jboss.tools.jst.web.kb.taglib.ITagLibrary;
+import org.jboss.tools.test.util.JUnitUtils;
+
+public class KbModelTest extends TestCase {
+
+ IProject project = null;
+ boolean makeCopy = true;
+
+ public KbModelTest() {
+ super("Kb Model Test");
+ }
+
+ public void setUp() throws Exception {
+ project =
ResourcesPlugin.getWorkspace().getRoot().getProject("TestKbModel");
+ assertNotNull("Can't load TestKbModel", project); //$NON-NLS-1$
+ }
+
+ private IKbProject getKbProject() {
+ IKbProject kbProject = null;
+ try {
+ kbProject = (IKbProject)project.getNature(IKbProject.NATURE_ID);
+ } catch (Exception e) {
+ JUnitUtils.fail("Cannot get seam nature.",e);
+ }
+ return kbProject;
+ }
+
+ public void testCompositeComponentLibraries() {
+ IKbProject kbProject = getKbProject();
+ ITagLibrary[] ls =
kbProject.getTagLibraries("http://java.sun.com/jsf/composite/demo&qu...;
+ assertEquals(1, ls.length);
+ ITagLibrary l = ls[0];
+ assertTrue(l instanceof CompositeTagLibrary);
+
+ //input.xhtml has root element other than <html>
+ IComponent c = l.getComponent("input");
+ assertNotNull(c);
+ assertNotNull(c.getAttribute("label"));
+
+ c = l.getComponent("input2");
+ assertNotNull(c);
+ assertNotNull(c.getAttribute("label2"));
+ }
+
+}
\ No newline at end of file
Property changes on:
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/kb/test/KbModelTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain