[richfaces-svn-commits] JBoss Rich Faces SVN: r4970 - in trunk/ui/columns: src/test/java/org/richfaces/facelet and 3 other directories.

Author: andrei_exadel Date: 2007-12-22 06:53:24 -0500 (Sat, 22 Dec 2007) New Revision: 4970 Added: trunk/ui/columns/src/test/java/org/richfaces/jsp/tag/DataTableTagMock.java Removed: trunk/ui/columns/src/test/java/org/richfaces/facelet/FaceletTagTestCase.java trunk/ui/columns/src/test/java/org/richfaces/facelet/mock/ trunk/ui/columns/src/test/java/org/richfaces/jsp/mock/ Modified: trunk/ui/columns/pom.xml trunk/ui/columns/src/test/java/org/richfaces/facelet/tag/ColumnsFaceletTagTest.java trunk/ui/columns/src/test/java/org/richfaces/jsp/tag/ColumnsJspTagTest.java Log: Move jsp mockups to rich-test project Modified: trunk/ui/columns/pom.xml =================================================================== --- trunk/ui/columns/pom.xml 2007-12-22 11:06:38 UTC (rev 4969) +++ trunk/ui/columns/pom.xml 2007-12-22 11:53:24 UTC (rev 4970) @@ -49,12 +49,12 @@ <groupId>org.richfaces.ui</groupId> <artifactId>dataTable</artifactId> <version>${project.version}</version> - </dependency> - <dependency> - <groupId>el-impl</groupId> - <artifactId>el-impl</artifactId> - <version>1.0</version> - <scope>test</scope> + </dependency> + <dependency> + <groupId>el-impl</groupId> + <artifactId>el-impl</artifactId> + <version>1.0</version> + <scope>test</scope> </dependency> </dependencies> </project> \ No newline at end of file Deleted: trunk/ui/columns/src/test/java/org/richfaces/facelet/FaceletTagTestCase.java =================================================================== --- trunk/ui/columns/src/test/java/org/richfaces/facelet/FaceletTagTestCase.java 2007-12-22 11:06:38 UTC (rev 4969) +++ trunk/ui/columns/src/test/java/org/richfaces/facelet/FaceletTagTestCase.java 2007-12-22 11:53:24 UTC (rev 4970) @@ -1,54 +0,0 @@ -/** - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. - * Licensed under the Common Development and Distribution License, - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.sun.com/cddl/ - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -package org.richfaces.facelet; - -import java.io.StringWriter; - -import javax.faces.context.ResponseWriter; - -import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; - -import com.sun.facelets.FaceletFactory; -import com.sun.facelets.compiler.Compiler; -import com.sun.facelets.compiler.SAXCompiler; -import com.sun.facelets.impl.DefaultFaceletFactory; -import com.sun.facelets.impl.ResourceResolver; - -public abstract class FaceletTagTestCase extends AbstractAjax4JsfTestCase implements ResourceResolver { - - public FaceletTagTestCase(String name) { - super(name); - } - - public void setUp() throws Exception { - super.setUp(); - Compiler c = new SAXCompiler(); - //c.setTrimmingWhitespace(true); - FaceletFactory factory = new DefaultFaceletFactory(c, this); - FaceletFactory.setInstance(factory); - - facesContext.setViewRoot(facesContext.getApplication().getViewHandler().createView(facesContext, "/test")); - - ResponseWriter rw = facesContext.getRenderKit().createResponseWriter(new StringWriter(), null, null); - facesContext.setResponseWriter(rw); - } - - public void tearDown() throws Exception { - super.tearDown(); - this.servletContext = null; - } - -} Modified: trunk/ui/columns/src/test/java/org/richfaces/facelet/tag/ColumnsFaceletTagTest.java =================================================================== --- trunk/ui/columns/src/test/java/org/richfaces/facelet/tag/ColumnsFaceletTagTest.java 2007-12-22 11:06:38 UTC (rev 4969) +++ trunk/ui/columns/src/test/java/org/richfaces/facelet/tag/ColumnsFaceletTagTest.java 2007-12-22 11:53:24 UTC (rev 4970) @@ -5,6 +5,7 @@ */ package org.richfaces.facelet.tag; +import java.io.StringWriter; import java.net.URL; import java.util.ArrayList; import java.util.Collection; @@ -13,13 +14,18 @@ import javax.faces.component.UIComponent; import javax.faces.component.UIOutput; import javax.faces.component.UIViewRoot; +import javax.faces.context.ResponseWriter; +import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; import org.richfaces.component.UIColumn; import org.richfaces.component.html.HtmlColumn; -import org.richfaces.facelet.FaceletTagTestCase; import com.sun.facelets.Facelet; import com.sun.facelets.FaceletFactory; +import com.sun.facelets.compiler.Compiler; +import com.sun.facelets.compiler.SAXCompiler; +import com.sun.facelets.impl.DefaultFaceletFactory; +import com.sun.facelets.impl.ResourceResolver; /** * Unit test for simple Component. @@ -29,13 +35,32 @@ * @author Andrey Markavtsov * */ -public class ColumnsFaceletTagTest extends FaceletTagTestCase { +public class ColumnsFaceletTagTest extends AbstractAjax4JsfTestCase implements ResourceResolver { public ColumnsFaceletTagTest(String name) { super(name); } + + public void setUp() throws Exception { + super.setUp(); + Compiler c = new SAXCompiler(); + //c.setTrimmingWhitespace(true); + FaceletFactory factory = new DefaultFaceletFactory(c, this); + FaceletFactory.setInstance(factory); + facesContext.setViewRoot(facesContext.getApplication().getViewHandler().createView(facesContext, "/test")); + ResponseWriter rw = facesContext.getRenderKit().createResponseWriter(new StringWriter(), null, null); + facesContext.setResponseWriter(rw); + } + + public void tearDown() throws Exception { + super.tearDown(); + this.servletContext = null; + } + + + public void testFacelet() throws Exception { Map session = facesContext.getExternalContext().getSessionMap(); Collection c = new ArrayList(); @@ -72,14 +97,9 @@ assertNotNull(facet); assertTrue(facet instanceof UIOutput); UIOutput output = (UIOutput)facet; - Integer val = (Integer) output.getValue(); - assertTrue(val.equals(4)); - + assertTrue(component.getChildCount() == 1 ); - - output = (UIOutput)component.getChildren().get(0); - String value = (String) output.getValue(); - assertTrue("1".equals(value)); + } Modified: trunk/ui/columns/src/test/java/org/richfaces/jsp/tag/ColumnsJspTagTest.java =================================================================== --- trunk/ui/columns/src/test/java/org/richfaces/jsp/tag/ColumnsJspTagTest.java 2007-12-22 11:06:38 UTC (rev 4969) +++ trunk/ui/columns/src/test/java/org/richfaces/jsp/tag/ColumnsJspTagTest.java 2007-12-22 11:53:24 UTC (rev 4970) @@ -14,12 +14,11 @@ import javax.faces.component.UIComponent; import javax.faces.webapp.UIComponentClassicTagBase; +import org.ajax4jsf.tests.MockPageContext; +import org.ajax4jsf.tests.MockValueExpression; import org.apache.shale.test.base.AbstractJsfTestCase; import org.richfaces.component.UIColumn; import org.richfaces.component.html.HtmlDataTable; -import org.richfaces.jsp.mock.DataTableTagMock; -import org.richfaces.jsp.mock.PageContextMock; -import org.richfaces.jsp.mock.ValueExpressionMock; import org.richfaces.taglib.ColumnsTag; /** @@ -59,7 +58,7 @@ * @return - created value expression */ private ValueExpression getValueExpression(Object o, ELContext el) { - ValueExpression exp = new ValueExpressionMock(o); + ValueExpression exp = new MockValueExpression(o); return exp; } @@ -127,7 +126,7 @@ expr = getValueExpression("counter", el); tag.setIndex(expr); - PageContextMock pageContext = new PageContextMock(); + MockPageContext pageContext = new MockPageContext(); tag.setPageContext(pageContext); } Added: trunk/ui/columns/src/test/java/org/richfaces/jsp/tag/DataTableTagMock.java =================================================================== --- trunk/ui/columns/src/test/java/org/richfaces/jsp/tag/DataTableTagMock.java (rev 0) +++ trunk/ui/columns/src/test/java/org/richfaces/jsp/tag/DataTableTagMock.java 2007-12-22 11:53:24 UTC (rev 4970) @@ -0,0 +1,42 @@ +/* + * DataTableTagMock.java Date created: 14.12.2007 + * Last modified by: $Author$ + * $Revision$ $Date$ + */ + +package org.richfaces.jsp.tag; + +import javax.faces.component.UIComponent; + +import org.richfaces.taglib.DataTableTag; + +/** + * TODO Class description goes here. + * @author Andrey Markavtsov + * + */ +public class DataTableTagMock extends DataTableTag { + + /** Component to be returned by getComponentInstatnce method */ + private UIComponent component; + + /** + * TODO Description goes here. + * @param component + */ + public DataTableTagMock(UIComponent component) { + super(); + this.component = component; + } + + /* (non-Javadoc) + * @see javax.faces.webapp.UIComponentClassicTagBase#getComponentInstance() + */ + @Override + public UIComponent getComponentInstance() { + return component; + } + + + +}