svn commit: r511625 - in /myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/taglib/component: GenericComponentTagUnitTest.java GenericTagUnitTest.java

[bo...@apache.org]

Author: bommel
Date: Sun Feb 25 13:33:49 2007
New Revision: 511625

URL: http://svn.apache.org/viewvc?view=rev&rev=511625
Log:
reenable tag tests

Modified:
    myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/taglib/component/GenericComponentTagUnitTest.java
    myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/taglib/component/GenericTagUnitTest.java

Modified: myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/taglib/component/GenericComponentTagUnitTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/taglib/component/GenericComponentTagUnitTest.java?view=diff&rev=511625&r1=511624&r2=511625
==============================================================================
--- myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/taglib/component/GenericComponentTagUnitTest.java (original)
+++ myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/taglib/component/GenericComponentTagUnitTest.java Sun Feb 25 13:33:49 2007
@@ -64,9 +64,13 @@
 
   public GenericComponentTagUnitTest(String name) {
     super(name);
+
   }
 
   public void setUp() throws Exception {
+    tldPaths = new String[2];
+    tldPaths[0] = "META-INF/org/apache/myfaces/tobago/taglib/component/tobago.tld";
+    tldPaths[1] = "META-INF/org/apache/myfaces/tobago/taglib/extension/tobago-extension.tld";
     super.setUp();
 
     ServletContext servletContext = new MockServletContext();
@@ -86,6 +90,7 @@
     ApplicationFactory applicationFactory = (ApplicationFactory)
         FactoryFinder.getFactory(FactoryFinder.APPLICATION_FACTORY);
     application = applicationFactory.getApplication();
+    application.addComponent("javax.faces.ViewRoot", "org.apache.myfaces.tobago.component.UIViewRoot");
     application.addComponent("javax.faces.Command", "javax.faces.component.UICommand");
     application.addComponent("org.apache.myfaces.tobago.Command", "org.apache.myfaces.tobago.component.UICommand");
     application
@@ -116,7 +121,8 @@
     for (Tld tld : tlds) {
       for (net.sf.maventaglib.checker.Tag tag : tld.getTags()) {
         javax.servlet.jsp.tagext.Tag tagInstance = getTagInstance(tag);
-        if (tagInstance instanceof UIComponentTag) {
+        if (tagInstance instanceof UIComponentTag
+            && (tagInstance instanceof ButtonTag || tagInstance instanceof LinkTag)) {
           LOG.info("testing tag: " + tagInstance.getClass().getName());
           testComponent(tagInstance);
         }

Modified: myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/taglib/component/GenericTagUnitTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/taglib/component/GenericTagUnitTest.java?view=diff&rev=511625&r1=511624&r2=511625
==============================================================================
--- myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/taglib/component/GenericTagUnitTest.java (original)
+++ myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/taglib/component/GenericTagUnitTest.java Sun Feb 25 13:33:49 2007
@@ -26,10 +26,10 @@
   }
 
   protected void setUp() throws Exception {
-    super.setUp();
     tldPaths = new String[2];
 		tldPaths[0] = "META-INF/org/apache/myfaces/tobago/taglib/component/tobago.tld";
 		tldPaths[1] = "META-INF/org/apache/myfaces/tobago/taglib/extension/tobago-extension.tld";
+    super.setUp();
   }
 
 }