[richfaces-svn-commits] JBoss Rich Faces SVN: r454 - trunk/richfaces/dataTable/src/test/java/org/richfaces/component.

[richfaces-svn-commits at lists.jboss.org]

Author: F.antonov
Date: 2007-04-19 10:44:40 -0400 (Thu, 19 Apr 2007)
New Revision: 454

Modified:
   trunk/richfaces/dataTable/src/test/java/org/richfaces/component/DataTableComponentTest.java
Log:
DataTable test cases development.

Modified: trunk/richfaces/dataTable/src/test/java/org/richfaces/component/DataTableComponentTest.java
===================================================================
--- trunk/richfaces/dataTable/src/test/java/org/richfaces/component/DataTableComponentTest.java	2007-04-19 14:43:06 UTC (rev 453)
+++ trunk/richfaces/dataTable/src/test/java/org/richfaces/component/DataTableComponentTest.java	2007-04-19 14:44:40 UTC (rev 454)
@@ -26,6 +26,7 @@
 import java.util.Iterator;
 import java.util.List;
 
+import javax.faces.component.UIComponent;
 import javax.faces.component.UIOutput;
 import javax.faces.component.html.HtmlOutputLink;
 import javax.faces.component.html.HtmlOutputText;
@@ -35,7 +36,10 @@
 import javax.faces.el.ValueBinding;
 import javax.faces.model.ListDataModel;
 
+import org.ajax4jsf.ajax.UIAjaxSupport;
+import org.ajax4jsf.framework.ajax.AjaxSupport;
 import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
+import org.apache.commons.collections.Predicate;
 
 import com.gargoylesoftware.htmlunit.html.HtmlElement;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
@@ -171,7 +175,7 @@
         UIColumn column3 = (UIColumn) application
                 .createComponent("org.richfaces.Column");
         dataTable.getChildren().add(column3);
-        HtmlOutputText text = (HtmlOutputText) createComponent(
+        UIOutput text = (UIOutput) createComponent(
                 HtmlOutputText.COMPONENT_TYPE, HtmlOutputText.class.getName(),
                 null, null, null);
         text.setValue("Column");
@@ -181,7 +185,7 @@
         UIColumn column4 = (UIColumn) application
                 .createComponent("org.richfaces.Column");
         dataTable.getChildren().add(column4);
-        HtmlOutputText text2 = (HtmlOutputText) createComponent(
+        UIOutput text2 = (UIOutput) createComponent(
                 HtmlOutputText.COMPONENT_TYPE, HtmlOutputText.class.getName(),
                 null, null, null);
         text.setValue("Column2");
@@ -190,7 +194,7 @@
 
         HtmlPage page = renderView();
         assertNotNull(page);
-        //System.out.println(page.asXml());
+        // System.out.println(page.asXml());
 
         HtmlElement table = page.getHtmlElementById(dataTable
                 .getClientId(facesContext));
@@ -276,7 +280,7 @@
                 null, null, null);
         dataTable.getFacets().put("footer", footer);
         footer.setValue("Footer");
-        
+
         HtmlPage page = renderView();
         assertNotNull(page);
         // System.out.println(page.asXml());
@@ -403,24 +407,45 @@
         subTable.setId("subTable");
         dataTable.getChildren().add(subTable);
 
+        UIColumnGroup subTableColumnGroup = (UIColumnGroup) application
+                .createComponent("org.richfaces.ColumnGroup");
+
         UIColumn column3 = (UIColumn) application
                 .createComponent("org.richfaces.Column");
-        subTable.getChildren().add(column3);
-        HtmlOutputText text = (HtmlOutputText) createComponent(
+        subTableColumnGroup.getChildren().add(column3);
+        UIOutput text = (UIOutput) createComponent(
                 HtmlOutputText.COMPONENT_TYPE, HtmlOutputText.class.getName(),
                 null, null, null);
-        text.setValue("Column");
+        text.setValue("Column1");
         column3.getChildren().add(text);
 
         UIColumn column4 = (UIColumn) application
                 .createComponent("org.richfaces.Column");
-        subTable.getChildren().add(column4);
-        HtmlOutputText text2 = (HtmlOutputText) createComponent(
+        subTableColumnGroup.getChildren().add(column4);
+        UIOutput text2 = (UIOutput) createComponent(
                 HtmlOutputText.COMPONENT_TYPE, HtmlOutputText.class.getName(),
                 null, null, null);
         text.setValue("Column2");
         column4.getChildren().add(text2);
 
+        UIColumn headerColumn = (UIColumn) application
+                .createComponent("org.richfaces.Column");
+        UIOutput header = (UIOutput) createComponent(
+                HtmlOutputText.COMPONENT_TYPE, HtmlOutputText.class.getName(),
+                null, null, null);
+        header.setValue("Header");
+        headerColumn.getChildren().add(header);
+        subTable.getFacets().put("header", headerColumn);
+
+        column3.getFacets().put(
+                "header",
+                (UIOutput) createComponent(HtmlOutputText.COMPONENT_TYPE,
+                        HtmlOutputText.class.getName(), null, null, null));
+        column4.getFacets().put(
+                "header",
+                (UIOutput) createComponent(HtmlOutputText.COMPONENT_TYPE,
+                        HtmlOutputText.class.getName(), null, null, null));
+
         subTable.getAttributes().put("columnClasses", "sub1,sub2");
 
         assertTrue(subTable.isBreakBefore());
@@ -435,6 +460,7 @@
         HtmlPage page = renderView();
         assertNotNull(page);
         // System.out.println(page.asXml());
+
     }
 
     /**
@@ -451,4 +477,33 @@
             assertTrue(e instanceof IllegalStateException);
         }
     }
+
+    /**
+     * Test for Predicate classes of UIDataTable class.
+     * 
+     * @throws Exception
+     */
+    public void testPredicates() throws Exception {
+
+        Predicate columnPredicate = UIDataTable.isColumn;
+        Predicate notColumnPredicate = UIDataTable.isNotColumn;
+        Predicate ajaxSupportPredicate = UIDataTable.isAjaxSupport;
+
+        UIComponent notColumn = createComponent(HtmlOutputText.COMPONENT_TYPE,
+                HtmlOutputText.class.getName(), null, null, null);
+        UIComponent column = column1;
+        UIComponent notAjaxSupport = notColumn;
+        UIComponent ajaxSupport = createComponent(UIAjaxSupport.COMPONENT_TYPE,
+                org.ajax4jsf.ajax.html.HtmlAjaxSupport.class.getName(), null,
+                null, null);
+
+        assertTrue(columnPredicate.evaluate(column));
+        assertTrue(!columnPredicate.evaluate(notColumn));
+
+        assertTrue(notColumnPredicate.evaluate(notColumn));
+        assertTrue(!notColumnPredicate.evaluate(column));
+
+        assertTrue(ajaxSupportPredicate.evaluate(ajaxSupport));
+        assertTrue(!ajaxSupportPredicate.evaluate(notAjaxSupport));
+    }
 }