Author: scabanovich
Date: 2010-09-17 11:35:09 -0400 (Fri, 17 Sep 2010)
New Revision: 24995
Removed:
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/WEB-INF/lib/common-annotations.jar
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/WEB-INF/lib/commons-beanutils.jar
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/WEB-INF/lib/commons-collections.jar
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/WEB-INF/lib/commons-digester.jar
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/WEB-INF/lib/commons-logging.jar
Modified:
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/WEB-INF/lib/myfaces-api-2.0.1.jar
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/WEB-INF/lib/myfaces-impl-2.0.1.jar
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/MyFacesKbModelTest.java
Log:
JBIDE-7086
https://jira.jboss.org/browse/JBIDE-7086
Deleted:
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/WEB-INF/lib/common-annotations.jar
===================================================================
(Binary files differ)
Deleted:
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/WEB-INF/lib/commons-beanutils.jar
===================================================================
(Binary files differ)
Deleted:
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/WEB-INF/lib/commons-collections.jar
===================================================================
(Binary files differ)
Deleted:
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/WEB-INF/lib/commons-digester.jar
===================================================================
(Binary files differ)
Deleted:
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/WEB-INF/lib/commons-logging.jar
===================================================================
(Binary files differ)
Modified:
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/WEB-INF/lib/myfaces-api-2.0.1.jar
===================================================================
(Binary files differ)
Modified:
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/WEB-INF/lib/myfaces-impl-2.0.1.jar
===================================================================
(Binary files differ)
Modified:
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/MyFacesKbModelTest.java
===================================================================
---
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/MyFacesKbModelTest.java 2010-09-17
15:15:32 UTC (rev 24994)
+++
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/MyFacesKbModelTest.java 2010-09-17
15:35:09 UTC (rev 24995)
@@ -16,6 +16,7 @@
import org.eclipse.core.resources.ResourcesPlugin;
import org.jboss.tools.jst.web.kb.IKbProject;
import org.jboss.tools.jst.web.kb.internal.taglib.myfaces.MyFacesTagLibrary;
+import org.jboss.tools.jst.web.kb.taglib.IComponent;
import org.jboss.tools.jst.web.kb.taglib.ITagLibrary;
import org.jboss.tools.test.util.JUnitUtils;
@@ -59,12 +60,22 @@
MyFacesTagLibrary coreTagLib = null;
ls =
kbProject.getTagLibraries("http://java.sun.com/jsf/core");
for (int i = 0; i < ls.length; i++) {
- if(ls[i] instanceof MyFacesTagLibrary) coreTagLib = (MyFacesTagLibrary)ls[i];
+ if(ls[i] instanceof MyFacesTagLibrary) {
+ coreTagLib = (MyFacesTagLibrary)ls[i];
+ }
}
assertNotNull(coreTagLib);
String[] coreTags = {"event", "metadata"};
for (String tag: coreTags) {
- assertNotNull(coreTagLib.getComponent(tag));
+ IComponent component = null;
+ for (int i = 0; i < ls.length; i++) {
+ if(ls[i] instanceof MyFacesTagLibrary) {
+ coreTagLib = (MyFacesTagLibrary)ls[i];
+ component = coreTagLib.getComponent(tag);
+ }
+ if(component != null) break;
+ }
+ assertNotNull("Cannot find tag '" + tag + "'",
component);
}
assertEquals(2, coreTagLib.getComponent("event").getAttributes().length);