Author: abelevich Date: 2010-08-13 12:06:48 -0400 (Fri, 13 Aug 2010) New Revision: 18627 Modified: trunk/ui/iteration/ui/src/test/java/org/richfaces/renderkit/DataGridRendererTest.java trunk/ui/iteration/ui/src/test/java/org/richfaces/renderkit/ExtendedDataTableRendererTest.java trunk/ui/iteration/ui/src/test/resources/dataGridTest.xhtml trunk/ui/iteration/ui/src/test/resources/extendedDataTableTest.xhtml trunk/ui/iteration/ui/src/test/resources/org/richfaces/renderkit/rendererTest.xhtml Log: fix test Modified: trunk/ui/iteration/ui/src/test/java/org/richfaces/renderkit/DataGridRendererTest.java =================================================================== --- trunk/ui/iteration/ui/src/test/java/org/richfaces/renderkit/DataGridRendererTest.java 2010-08-13 15:07:57 UTC (rev 18626) +++ trunk/ui/iteration/ui/src/test/java/org/richfaces/renderkit/DataGridRendererTest.java 2010-08-13 16:06:48 UTC (rev 18627) @@ -14,6 +14,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.richfaces.component.AbstractDataGrid; import org.richfaces.component.UIDataGrid; import com.gargoylesoftware.htmlunit.html.HtmlElement; @@ -52,10 +53,10 @@ public final void testGetComponentClass() throws IOException { FacesRequest facesRequest = startFacesRequest(); FacesContext facesContext = FacesContext.getCurrentInstance(); - UIDataGrid component = (UIDataGrid) facesContext.getViewRoot().findComponent("dataGrid"); + AbstractDataGrid component = (AbstractDataGrid) facesContext.getViewRoot().findComponent("dataGrid"); DataGridRenderer renderer = (DataGridRenderer) FacesContext.getCurrentInstance() .getRenderKit().getRenderer(component.getFamily(), component.getRendererType()); - assertEquals(UIDataGrid.class, renderer.getComponentClass()); + assertEquals(AbstractDataGrid.class, renderer.getComponentClass()); facesRequest.release(); } Modified: trunk/ui/iteration/ui/src/test/java/org/richfaces/renderkit/ExtendedDataTableRendererTest.java =================================================================== --- trunk/ui/iteration/ui/src/test/java/org/richfaces/renderkit/ExtendedDataTableRendererTest.java 2010-08-13 15:07:57 UTC (rev 18626) +++ trunk/ui/iteration/ui/src/test/java/org/richfaces/renderkit/ExtendedDataTableRendererTest.java 2010-08-13 16:06:48 UTC (rev 18627) @@ -40,8 +40,8 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.richfaces.component.AbstractExtendedDataTable; import org.richfaces.component.SortOrder; -import org.richfaces.component.UIExtendedDataTable; import com.gargoylesoftware.htmlunit.html.HtmlElement; import com.gargoylesoftware.htmlunit.html.HtmlPage; @@ -87,10 +87,10 @@ public final void testGetComponentClass() throws IOException { FacesRequest facesRequest = startFacesRequest(); FacesContext facesContext = FacesContext.getCurrentInstance(); - UIExtendedDataTable component = (UIExtendedDataTable) facesContext.getViewRoot().findComponent("table"); + AbstractExtendedDataTable component = (AbstractExtendedDataTable) facesContext.getViewRoot().findComponent("table"); ExtendedDataTableRenderer renderer = (ExtendedDataTableRenderer) FacesContext.getCurrentInstance() .getRenderKit().getRenderer(component.getFamily(), component.getRendererType()); - assertEquals(UIExtendedDataTable.class, renderer.getComponentClass()); + assertEquals(AbstractExtendedDataTable.class, renderer.getComponentClass()); facesRequest.release(); } @@ -205,7 +205,7 @@ public final void testFilteringWithoutClean() throws IOException { FacesRequest facesRequest = startFacesRequest(); FacesContext facesContext = FacesContext.getCurrentInstance(); - UIExtendedDataTable component = (UIExtendedDataTable) facesContext.getViewRoot().findComponent("table"); + AbstractExtendedDataTable component = (AbstractExtendedDataTable) facesContext.getViewRoot().findComponent("table"); ExtendedDataTableRenderer renderer = (ExtendedDataTableRenderer) FacesContext.getCurrentInstance() .getRenderKit().getRenderer(component.getFamily(), component.getRendererType()); Map<String, Object> column1Attributes = component.findComponent("column1").getAttributes(); @@ -226,7 +226,7 @@ public final void testFilteringWithClean() throws IOException { FacesRequest facesRequest = startFacesRequest(); FacesContext facesContext = FacesContext.getCurrentInstance(); - UIExtendedDataTable component = (UIExtendedDataTable) facesContext.getViewRoot().findComponent("table"); + AbstractExtendedDataTable component = (AbstractExtendedDataTable) facesContext.getViewRoot().findComponent("table"); ExtendedDataTableRenderer renderer = (ExtendedDataTableRenderer) FacesContext.getCurrentInstance() .getRenderKit().getRenderer(component.getFamily(), component.getRendererType()); Map<String, Object> column1Attributes = component.findComponent("column1").getAttributes(); @@ -247,7 +247,7 @@ public final void testColumnResizing() throws IOException { FacesRequest facesRequest = startFacesRequest(); FacesContext facesContext = FacesContext.getCurrentInstance(); - UIExtendedDataTable component = (UIExtendedDataTable) facesContext.getViewRoot().findComponent("table"); + AbstractExtendedDataTable component = (AbstractExtendedDataTable) facesContext.getViewRoot().findComponent("table"); ExtendedDataTableRenderer renderer = (ExtendedDataTableRenderer) FacesContext.getCurrentInstance() .getRenderKit().getRenderer(component.getFamily(), component.getRendererType()); Map<String, Object> column1Attributes = component.findComponent("column1").getAttributes(); @@ -262,7 +262,7 @@ public final void testColumnReordering() throws IOException { FacesRequest facesRequest = startFacesRequest(); FacesContext facesContext = FacesContext.getCurrentInstance(); - UIExtendedDataTable component = (UIExtendedDataTable) facesContext.getViewRoot().findComponent("table"); + AbstractExtendedDataTable component = (AbstractExtendedDataTable) facesContext.getViewRoot().findComponent("table"); ExtendedDataTableRenderer renderer = (ExtendedDataTableRenderer) FacesContext.getCurrentInstance() .getRenderKit().getRenderer(component.getFamily(), component.getRendererType()); Map<String, Object> componentAttributes = component.getAttributes(); @@ -281,7 +281,7 @@ public final void testSortingWithoutClean() throws IOException { FacesRequest facesRequest = startFacesRequest(); FacesContext facesContext = FacesContext.getCurrentInstance(); - UIExtendedDataTable component = (UIExtendedDataTable) facesContext.getViewRoot().findComponent("table"); + AbstractExtendedDataTable component = (AbstractExtendedDataTable) facesContext.getViewRoot().findComponent("table"); ExtendedDataTableRenderer renderer = (ExtendedDataTableRenderer) FacesContext.getCurrentInstance() .getRenderKit().getRenderer(component.getFamily(), component.getRendererType()); Map<String, Object> column1Attributes = component.findComponent("column1").getAttributes(); @@ -302,7 +302,7 @@ public final void testSortingWithClean() throws IOException { FacesRequest facesRequest = startFacesRequest(); FacesContext facesContext = FacesContext.getCurrentInstance(); - UIExtendedDataTable component = (UIExtendedDataTable) facesContext.getViewRoot().findComponent("table"); + AbstractExtendedDataTable component = (AbstractExtendedDataTable) facesContext.getViewRoot().findComponent("table"); ExtendedDataTableRenderer renderer = (ExtendedDataTableRenderer) FacesContext.getCurrentInstance() .getRenderKit().getRenderer(component.getFamily(), component.getRendererType()); Map<String, Object> column1Attributes = component.findComponent("column1").getAttributes(); @@ -323,18 +323,18 @@ public final void testScrolling() throws IOException { FacesRequest facesRequest = startFacesRequest(); FacesContext facesContext = FacesContext.getCurrentInstance(); - UIExtendedDataTable component = (UIExtendedDataTable) facesContext.getViewRoot().findComponent("table"); + AbstractExtendedDataTable component = (AbstractExtendedDataTable) facesContext.getViewRoot().findComponent("table"); ExtendedDataTableRenderer renderer = (ExtendedDataTableRenderer) FacesContext.getCurrentInstance() .getRenderKit().getRenderer(component.getFamily(), component.getRendererType()); Map<String, Object> componentAttributes = component.getAttributes(); String clientId = component.getClientId(facesContext); - assertNull(componentAttributes.get(UIExtendedDataTable.SUBMITTED_CLIENT_FIRST)); + assertNull(componentAttributes.get(AbstractExtendedDataTable.SUBMITTED_CLIENT_FIRST)); facesRequest.withParameter(clientId, clientId); facesRequest.withParameter("rich:clientFirst", "28"); renderer.doDecode(facesContext, component); - assertEquals(28, componentAttributes.get(UIExtendedDataTable.SUBMITTED_CLIENT_FIRST)); + assertEquals(28, componentAttributes.get(AbstractExtendedDataTable.SUBMITTED_CLIENT_FIRST)); assertTrue(facesContext.getPartialViewContext().getRenderIds() - .contains(clientId + "@" + UIExtendedDataTable.SCROLL)); + .contains(clientId + "@" + AbstractExtendedDataTable.SCROLL)); facesRequest.release(); } } Modified: trunk/ui/iteration/ui/src/test/resources/dataGridTest.xhtml =================================================================== --- trunk/ui/iteration/ui/src/test/resources/dataGridTest.xhtml 2010-08-13 15:07:57 UTC (rev 18626) +++ trunk/ui/iteration/ui/src/test/resources/dataGridTest.xhtml 2010-08-13 16:06:48 UTC (rev 18627) @@ -5,7 +5,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:rich="http://richfaces.org/rich"> + xmlns:rich="http://richfaces.org/iteration"> <!-- JBoss, Home of Professional Open Source Copyright ${year}, Red Hat, Inc. and individual contributors Modified: trunk/ui/iteration/ui/src/test/resources/extendedDataTableTest.xhtml =================================================================== --- trunk/ui/iteration/ui/src/test/resources/extendedDataTableTest.xhtml 2010-08-13 15:07:57 UTC (rev 18626) +++ trunk/ui/iteration/ui/src/test/resources/extendedDataTableTest.xhtml 2010-08-13 16:06:48 UTC (rev 18627) @@ -5,7 +5,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:rich="http://richfaces.org/rich"> + xmlns:rich="http://richfaces.org/iteration"> <!-- JBoss, Home of Professional Open Source Copyright ${year}, Red Hat, Inc. and individual contributors Modified: trunk/ui/iteration/ui/src/test/resources/org/richfaces/renderkit/rendererTest.xhtml =================================================================== --- trunk/ui/iteration/ui/src/test/resources/org/richfaces/renderkit/rendererTest.xhtml 2010-08-13 15:07:57 UTC (rev 18626) +++ trunk/ui/iteration/ui/src/test/resources/org/richfaces/renderkit/rendererTest.xhtml 2010-08-13 16:06:48 UTC (rev 18627) @@ -3,7 +3,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:lst="http://richfaces.org/lists"> + xmlns:lst="http://richfaces.org/iteration"> <f:view contentType="text/html" /> <h:head>