[richfaces-svn-commits] JBoss Rich Faces SVN: r447 - trunk/richfaces/dataTable/src/test/java/org/richfaces/component.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Thu Apr 19 05:57:16 EDT 2007
Author: F.antonov
Date: 2007-04-19 05:57:15 -0400 (Thu, 19 Apr 2007)
New Revision: 447
Modified:
trunk/richfaces/dataTable/src/test/java/org/richfaces/component/DataDefinitionListComponentsTest.java
trunk/richfaces/dataTable/src/test/java/org/richfaces/component/DataGridComponentTest.java
trunk/richfaces/dataTable/src/test/java/org/richfaces/component/DataListComponentsTest.java
trunk/richfaces/dataTable/src/test/java/org/richfaces/component/DataOrderedListComponentsTest.java
trunk/richfaces/dataTable/src/test/java/org/richfaces/component/DataTableComponentTest.java
Log:
DataTable components test cases development.
Modified: trunk/richfaces/dataTable/src/test/java/org/richfaces/component/DataDefinitionListComponentsTest.java
===================================================================
--- trunk/richfaces/dataTable/src/test/java/org/richfaces/component/DataDefinitionListComponentsTest.java 2007-04-19 08:27:50 UTC (rev 446)
+++ trunk/richfaces/dataTable/src/test/java/org/richfaces/component/DataDefinitionListComponentsTest.java 2007-04-19 09:57:15 UTC (rev 447)
@@ -26,10 +26,6 @@
import java.util.Iterator;
import java.util.List;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import javax.faces.component.UIComponent;
import javax.faces.component.UIOutput;
import javax.faces.component.html.HtmlOutputLink;
import javax.faces.component.html.HtmlOutputText;
@@ -40,8 +36,6 @@
import javax.faces.model.ListDataModel;
import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
-import org.richfaces.component.html.HtmlColumnGroup;
-import org.richfaces.component.html.HtmlColumn;
import com.gargoylesoftware.htmlunit.html.HtmlElement;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
@@ -51,7 +45,7 @@
*/
public class DataDefinitionListComponentsTest extends AbstractAjax4JsfTestCase {
- private UIDataList dataList;
+ private UIDataDefinitionList dataList;
/**
* Create the test case
@@ -71,7 +65,7 @@
public void setUp() throws Exception {
super.setUp();
- dataList = (UIDataList) application
+ dataList = (UIDataDefinitionList) application
.createComponent("org.richfaces.DataDefinitionList");
dataList.setId("dataDefinitionList");
@@ -211,5 +205,8 @@
assertNotNull(dd);
classAttr = dd.getAttributeValue("class");
assertTrue(classAttr.contains("dr-definition rich-definition"));
+
+ Iterator fixedChildren = dataList.fixedChildren();
+ assertNotNull(fixedChildren);
}
}
Modified: trunk/richfaces/dataTable/src/test/java/org/richfaces/component/DataGridComponentTest.java
===================================================================
--- trunk/richfaces/dataTable/src/test/java/org/richfaces/component/DataGridComponentTest.java 2007-04-19 08:27:50 UTC (rev 446)
+++ trunk/richfaces/dataTable/src/test/java/org/richfaces/component/DataGridComponentTest.java 2007-04-19 09:57:15 UTC (rev 447)
@@ -23,20 +23,12 @@
import java.util.ArrayList;
import java.util.Date;
-import java.util.Iterator;
import java.util.List;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import javax.faces.component.UIComponent;
import javax.faces.component.UIOutput;
import javax.faces.component.html.HtmlOutputText;
-import javax.faces.model.ListDataModel;
import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
-import org.richfaces.component.html.HtmlColumnGroup;
-import org.richfaces.component.html.HtmlColumn;
import com.gargoylesoftware.htmlunit.html.HtmlElement;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
@@ -46,9 +38,7 @@
*/
public class DataGridComponentTest extends AbstractAjax4JsfTestCase {
- private UIDataGrid dataGrid;
-
-
+ private UIDataGrid dataGrid;
/**
* Create the test case
@@ -71,15 +61,15 @@
dataGrid = (UIDataGrid) application
.createComponent("org.richfaces.DataGrid");
dataGrid.setId("dataGrid");
-
+
dataGrid.setColumns(5);
-
+
List list = new ArrayList();
for (int i = 1; i <= 10; i++) {
list.add(new Date((long) Math.random()));
}
dataGrid.setValue(list);
-
+
facesContext.getViewRoot().getChildren().add(dataGrid);
}
@@ -89,9 +79,9 @@
* @see org.ajax4jsf.tests.AbstractAjax4JsfTestCase#tearDown()
*/
public void tearDown() throws Exception {
- super.tearDown();
+ super.tearDown();
dataGrid = null;
- }
+ }
/**
* Test DataGrid component rendering.
@@ -99,23 +89,23 @@
* @throws Exception
*/
public void testRenderDataGrid() throws Exception {
-
+
HtmlPage page = renderView();
assertNotNull(page);
- //System.out.println(page.asXml());
+ // System.out.println(page.asXml());
HtmlElement table = page.getHtmlElementById(dataGrid
.getClientId(facesContext));
assertNotNull(table);
}
-
+
/**
* Test DataGrid component facets rendering.
*
* @throws Exception
*/
public void testRenderDataGridFacets() throws Exception {
-
+
dataGrid.getAttributes().put("rowClasses", "row1,row2");
dataGrid.getAttributes().put("columnClasses", "A,B,Y,B,C");
@@ -124,13 +114,13 @@
null, null, null);
dataGrid.getFacets().put("header", header);
header.setValue("Header");
-
+
UIOutput footer = (UIOutput) createComponent(
HtmlOutputText.COMPONENT_TYPE, HtmlOutputText.class.getName(),
null, null, null);
dataGrid.getFacets().put("footer", footer);
footer.setValue("Footer");
-
+
UIOutput caption = (UIOutput) createComponent(
HtmlOutputText.COMPONENT_TYPE, HtmlOutputText.class.getName(),
null, null, null);
@@ -139,7 +129,7 @@
HtmlPage page = renderView();
assertNotNull(page);
- //System.out.println(page.asXml());
+ // System.out.println(page.asXml());
HtmlElement table = page.getHtmlElementById(dataGrid
.getClientId(facesContext));
@@ -147,12 +137,11 @@
assertEquals("table", table.getNodeName());
String classAttr = table.getAttributeValue("class");
assertTrue(classAttr.contains("dr-table rich-table"));
-
+
List captions = table.getHtmlElementsByTagName("caption");
assertNotNull(captions);
assertEquals(1, captions.size());
- classAttr = ((HtmlElement) captions.get(0))
- .getAttributeValue("class");
+ classAttr = ((HtmlElement) captions.get(0)).getAttributeValue("class");
assertTrue(classAttr.contains("dr-table-caption rich-table-caption"));
List headers = table.getHtmlElementsByTagName("thead");
@@ -172,7 +161,7 @@
assertNotNull(td);
classAttr = td.getAttributeValue("class");
assertTrue(classAttr
- .contains("dr-table-headercell rich-table-headercell"));
+ .contains("dr-table-headercell rich-table-headercell"));
List footers = table.getHtmlElementsByTagName("tfoot");
assertNotNull(footers);
@@ -191,8 +180,8 @@
classAttr = td.getAttributeValue("class");
assertTrue(classAttr
.contains("dr-table-footercell rich-table-footercell"));
-
- List bodies = table.getHtmlElementsByTagName("tbody");
+
+ List bodies = table.getHtmlElementsByTagName("tbody");
assertEquals(1, bodies.size());
trs = ((HtmlElement) bodies.get(0)).getHtmlElementsByTagName("tr");
assertTrue(trs.size() > 0);
@@ -208,32 +197,72 @@
assertNotNull(td);
classAttr = td.getAttributeValue("class");
assertTrue(classAttr.contains("dr-table-cell rich-table-cell"));
- assertTrue(classAttr.contains("A"));
+ assertTrue(classAttr.contains("A"));
}
-
+
/**
* Test UIDataGrid component class.
*
* @throws Exception
*/
public void testUIDataGrid() throws Exception {
-
+
dataGrid.setColumns(1);
-
+
dataGrid.setElements(5);
- assertEquals(5, dataGrid.getElements());
-
+ assertEquals(5, dataGrid.getElements());
+
HtmlPage page = renderView();
assertNotNull(page);
- //System.out.println(page.asXml());
+ // System.out.println(page.asXml());
HtmlElement table = page.getHtmlElementById(dataGrid
.getClientId(facesContext));
assertNotNull(table);
- List bodies = table.getHtmlElementsByTagName("tbody");
+ List bodies = table.getHtmlElementsByTagName("tbody");
assertEquals(1, bodies.size());
List trs = ((HtmlElement) bodies.get(0)).getHtmlElementsByTagName("tr");
assertEquals(5, trs.size());
}
-
+
+ /**
+ * Test UIDataGrid component class.
+ *
+ * @throws Exception
+ */
+ public void testDataGridWithSubTable() throws Exception {
+
+ UIColumn column1 = (UIColumn) application
+ .createComponent("org.richfaces.Column");
+ dataGrid.getChildren().add(column1);
+ HtmlOutputText text1 = (HtmlOutputText) createComponent(
+ HtmlOutputText.COMPONENT_TYPE, HtmlOutputText.class.getName(),
+ null, null, null);
+ text1.setValue("Column");
+ column1.getChildren().add(text1);
+
+ UIColumn column2 = (UIColumn) application
+ .createComponent("org.richfaces.Column");
+ dataGrid.getChildren().add(column2);
+ HtmlOutputText text2 = (HtmlOutputText) createComponent(
+ HtmlOutputText.COMPONENT_TYPE, HtmlOutputText.class.getName(),
+ null, null, null);
+ text2.setValue("Column2");
+ column2.getChildren().add(text2);
+
+ dataGrid.getAttributes().put("columnClasses", "sub1,");
+
+ HtmlPage page = renderView();
+ assertNotNull(page);
+ // System.out.println(page.asXml());
+
+ HtmlElement table = page.getHtmlElementById(dataGrid
+ .getClientId(facesContext));
+ assertNotNull(table);
+ List bodies = table.getHtmlElementsByTagName("tbody");
+ assertEquals(1, bodies.size());
+ List trs = ((HtmlElement) bodies.get(0)).getHtmlElementsByTagName("tr");
+ assertEquals(2, trs.size());
+ }
+
}
Modified: trunk/richfaces/dataTable/src/test/java/org/richfaces/component/DataListComponentsTest.java
===================================================================
--- trunk/richfaces/dataTable/src/test/java/org/richfaces/component/DataListComponentsTest.java 2007-04-19 08:27:50 UTC (rev 446)
+++ trunk/richfaces/dataTable/src/test/java/org/richfaces/component/DataListComponentsTest.java 2007-04-19 09:57:15 UTC (rev 447)
@@ -23,13 +23,8 @@
import java.util.ArrayList;
import java.util.Date;
-import java.util.Iterator;
import java.util.List;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import javax.faces.component.UIComponent;
import javax.faces.component.UIOutput;
import javax.faces.component.html.HtmlOutputLink;
import javax.faces.component.html.HtmlOutputText;
@@ -40,8 +35,6 @@
import javax.faces.model.ListDataModel;
import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
-import org.richfaces.component.html.HtmlColumnGroup;
-import org.richfaces.component.html.HtmlColumn;
import com.gargoylesoftware.htmlunit.html.HtmlElement;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
Modified: trunk/richfaces/dataTable/src/test/java/org/richfaces/component/DataOrderedListComponentsTest.java
===================================================================
--- trunk/richfaces/dataTable/src/test/java/org/richfaces/component/DataOrderedListComponentsTest.java 2007-04-19 08:27:50 UTC (rev 446)
+++ trunk/richfaces/dataTable/src/test/java/org/richfaces/component/DataOrderedListComponentsTest.java 2007-04-19 09:57:15 UTC (rev 447)
@@ -23,13 +23,8 @@
import java.util.ArrayList;
import java.util.Date;
-import java.util.Iterator;
import java.util.List;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import javax.faces.component.UIComponent;
import javax.faces.component.UIOutput;
import javax.faces.component.html.HtmlOutputLink;
import javax.faces.component.html.HtmlOutputText;
@@ -40,8 +35,6 @@
import javax.faces.model.ListDataModel;
import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
-import org.richfaces.component.html.HtmlColumnGroup;
-import org.richfaces.component.html.HtmlColumn;
import com.gargoylesoftware.htmlunit.html.HtmlElement;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
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 08:27:50 UTC (rev 446)
+++ trunk/richfaces/dataTable/src/test/java/org/richfaces/component/DataTableComponentTest.java 2007-04-19 09:57:15 UTC (rev 447)
@@ -25,7 +25,6 @@
import java.util.Date;
import java.util.Iterator;
import java.util.List;
-import java.util.Random;
import javax.faces.component.UIOutput;
import javax.faces.component.html.HtmlOutputLink;
@@ -191,7 +190,7 @@
HtmlPage page = renderView();
assertNotNull(page);
- // System.out.println(page.asXml());
+ //System.out.println(page.asXml());
HtmlElement table = page.getHtmlElementById(dataTable
.getClientId(facesContext));
@@ -277,7 +276,7 @@
null, null, null);
dataTable.getFacets().put("footer", footer);
footer.setValue("Footer");
-
+
HtmlPage page = renderView();
assertNotNull(page);
// System.out.println(page.asXml());
@@ -330,6 +329,10 @@
classAttr = td.getAttributeValue("class");
assertTrue(classAttr
.contains("dr-table-footercell rich-table-footercell"));
+
+ Iterator fixedChildren = dataTable.fixedChildren();
+ assertNotNull(fixedChildren);
+ assertTrue(fixedChildren.hasNext());
}
/**
@@ -350,6 +353,9 @@
dataTable.getAttributes().put("rowClasses", "row1,row2");
dataTable.getAttributes().put("columnClasses", "column1,column2");
+ column1.getAttributes().put("styleClass", "column1StyleClass");
+ column2.getAttributes().put("styleClass", "");
+
HtmlPage page = renderView();
assertNotNull(page);
// System.out.println(page.asXml());
@@ -382,6 +388,7 @@
assertNotNull(td);
classAttr = td.getAttributeValue("class");
assertTrue(classAttr.contains("column1"));
+ assertTrue(classAttr.contains("column1StyleClass"));
}
/**
@@ -430,4 +437,18 @@
// System.out.println(page.asXml());
}
+ /**
+ * Test for UIColumnGroup class.
+ *
+ * @throws Exception
+ */
+ public void testUIColumnGroup() throws Exception {
+
+ try {
+ columnGroup.setBreakBefore(true);
+ assertTrue(false);
+ } catch (Exception e) {
+ assertTrue(e instanceof IllegalStateException);
+ }
+ }
}
More information about the richfaces-svn-commits
mailing list