[jbosstools-commits] JBoss Tools SVN: r30646 - in trunk/jst/tests/org.jboss.tools.jst.web.kb.test: src/org/jboss/tools/jst/web/kb/test and 1 other directory.

[jbosstools-commits at lists.jboss.org]

Author: scabanovich
Date: 2011-04-18 15:53:46 -0400 (Mon, 18 Apr 2011)
New Revision: 30646

Modified:
   trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/taglib2.tld
   trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/KbModelTest.java
Log:
JBIDE-8744
https://issues.jboss.org/browse/JBIDE-8744

Modified: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/taglib2.tld
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/taglib2.tld	2011-04-18 19:27:56 UTC (rev 30645)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/taglib2.tld	2011-04-18 19:53:46 UTC (rev 30646)
@@ -1,15 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
-                        "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
-<taglib>
+<taglib version="2.1" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd">
+ 
  <tlib-version>1.0</tlib-version>
- <jsp-version>1.2</jsp-version>
  <short-name>taglib2</short-name>
  <uri>taglib2</uri>
  <tag>
+  <description>Tag A</description>
   <name>tagA</name>
   <tag-class>com.TagA</tag-class>
   <body-content>empty</body-content>
-  <description>Tag A</description>
  </tag>
+ <function>
+  <name>f1</name>
+  <function-class>String</function-class>
+  <function-signature>s1</function-signature>
+ </function>
 </taglib>

Modified: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/KbModelTest.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/KbModelTest.java	2011-04-18 19:27:56 UTC (rev 30645)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/KbModelTest.java	2011-04-18 19:53:46 UTC (rev 30646)
@@ -21,6 +21,9 @@
 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.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;
 
@@ -73,8 +76,19 @@
 //		}
 	}
 
-	public void toDoTestKbProjectObjects() {
+	public void testKbProjectObjects() {
+		IKbProject kbProject = getKbProject();
+		ITagLibrary[] ls = kbProject.getTagLibraries("taglib2");
+		assertEquals(1, ls.length);
+		ITagLibrary l = ls[0];
+		assertTrue(l instanceof IFunctionLibrary);
+		IELFunction[] fs = ((IFunctionLibrary)l).getFunctions();
+		assertEquals(1, fs.length);
+		assertEquals("f1", fs[0].getName());
+		assertEquals("s1", fs[0].getFunctionSignature());
 		
+		//TODO continue
+		
 	}
 
 	public void toDoXMLSerialization() {