September 2009 - richfaces-svn-commits

JBoss Rich Faces SVN: r15642 - in root/ui-sandbox/trunk/components/tables/ui: src/main and 7 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: abelevich Date: 2009-09-21 10:05:34 -0400 (Mon, 21 Sep 2009) New Revision: 15642 Added: root/ui-sandbox/trunk/components/tables/ui/src/main/resources/ root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/ root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/faces-config.xml root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/tables.taglib.xml Modified: root/ui-sandbox/trunk/components/tables/ui/pom.xml root/ui-sandbox/trunk/components/tables/ui/src/main/config/component/tables.xml root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UISimpleDataTable.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlSimpleDataTable.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/AbstractSimpleDataTableRenderer.java root/ui-sandbox/trunk/components/tables/ui/src/main/templates/org/richfaces/renderkit/html/simpletable.template.xml Log: add simple/extended dataTables components configs Modified: root/ui-sandbox/trunk/components/tables/ui/pom.xml =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/pom.xml 2009-09-21 14:03:25 UTC (rev 15641) +++ root/ui-sandbox/trunk/components/tables/ui/pom.xml 2009-09-21 14:05:34 UTC (rev 15642) @@ -19,6 +19,16 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> + <configuration> + <library> + <prefix>org.richfaces</prefix> + <taglib> + <uri>http://richfaces.org/a4j</uri> + <shortName>a4j</shortName> + <displayName>Core ajax components tags</displayName> + </taglib> + </library> + </configuration> </plugin> </plugins> </build> Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/config/component/tables.xml =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/config/component/tables.xml 2009-09-21 14:03:25 UTC (rev 15641) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/config/component/tables.xml 2009-09-21 14:05:34 UTC (rev 15642) @@ -21,7 +21,7 @@ <![CDATA[TODO: add description here]]> </description> - <renderer generate="true" override="true"> + <renderer generate="true"> <name>org.richfaces.renderkit.html.SimpleDataTableRenderer</name> <template>org/richfaces/renderkit/html/simpletable.template.xml</template> </renderer> @@ -31,7 +31,7 @@ org.richfaces.taglib.SimpleDataTableTag </classname> <superclass> - org.ajax4jsf.webapp.taglib.HtmlComponentTagBase + org.ajax4jsf.webapp.taglib.UIComponentTagBase </superclass> <test/> </tag> @@ -50,14 +50,14 @@ </description> <renderer generate="true" override="true"> - <name>org.richfaces.ExtendedDataTableRenderer</name> + <name>org.richfaces.renderkit.html.ExtendedDataTableRenderer</name>  </renderer> <tag> <name>extendedDataTable</name> <classname>org.richfaces.taglib.ExtendedDataTableTag</classname> <superclass> - org.ajax4jsf.webapp.taglib.HtmlComponentTagBase + org.ajax4jsf.webapp.taglib.UIComponentTagBase </superclass> <test/> </tag> Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UISimpleDataTable.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UISimpleDataTable.java 2009-09-21 14:03:25 UTC (rev 15641) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UISimpleDataTable.java 2009-09-21 14:05:34 UTC (rev 15642) @@ -6,5 +6,5 @@ * @author Anton Belevich * */ -public abstract class UISimpleDataTable extends UIData{ +public abstract class UISimpleDataTable extends UIData { } Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlSimpleDataTable.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlSimpleDataTable.java 2009-09-21 14:03:25 UTC (rev 15641) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlSimpleDataTable.java 2009-09-21 14:05:34 UTC (rev 15642) @@ -5,4 +5,8 @@ public class HtmlSimpleDataTable extends UISimpleDataTable { public static final String COMPONENT_TYPE = "org.richfaces.SimpleDataTable"; + + public HtmlSimpleDataTable() { + setRendererType("org.richfaces.SimpleDataTableRenderer"); + } } Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/AbstractSimpleDataTableRenderer.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/AbstractSimpleDataTableRenderer.java 2009-09-21 14:03:25 UTC (rev 15641) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/AbstractSimpleDataTableRenderer.java 2009-09-21 14:05:34 UTC (rev 15642) @@ -1,5 +1,11 @@ package org.richfaces.renderkit; +import java.io.IOException; + +import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; +import javax.faces.context.ResponseWriter; + import org.ajax4jsf.renderkit.RendererBase; /** @@ -7,4 +13,9 @@ * */ public abstract class AbstractSimpleDataTableRenderer extends RendererBase { + @Override + public void encodeEnd(FacesContext context, UIComponent component) throws IOException { + ResponseWriter writer = context.getResponseWriter(); + writer.writeText("simpleDataTable", null); + } } Added: root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/faces-config.xml =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/faces-config.xml (rev 0) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/faces-config.xml 2009-09-21 14:05:34 UTC (rev 15642) @@ -0,0 +1,29 @@ +<?xml version='1.0' encoding='UTF-8'?> + +<faces-config xmlns="http://java.sun.com/xml/ns/javaee" + version="2.0"> + + <component> + <component-type>org.richfaces.SimpleDataTable</component-type> + <component-class>org.richfaces.component.html.HtmlSimpleDataTable</component-class> + </component> + + <component> + <component-type>org.richfaces.ExtendedDataTable</component-type> + <component-class>org.richfaces.component.html.HtmlExtendedDataTable</component-class> + </component> + + <render-kit> + <render-kit-id>HTML_BASIC</render-kit-id> + <renderer> + <component-family>javax.faces.Data</component-family> + <renderer-type>org.richfaces.SimpleDataTableRenderer</renderer-type> + <renderer-class>org.richfaces.renderkit.html.SimpleDataTableRenderer</renderer-class> + </renderer> + <renderer> + <component-family>javax.faces.Data</component-family> + <renderer-type>org.richfaces.ExtendedDataTableRenderer</renderer-type> + <renderer-class>org.richfaces.renderkit.html.ExtendedDataTableRenderer</renderer-class> + </renderer> + </render-kit> +</faces-config> \ No newline at end of file Added: root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/tables.taglib.xml =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/tables.taglib.xml (rev 0) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/tables.taglib.xml 2009-09-21 14:05:34 UTC (rev 15642) @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<facelet-taglib version="2.0" xmlns="http://java.sun.com/xml/ns/javaee" id="a4j"> + <namespace>http://richfaces.org/rich</namespace> + + <tag> + <tag-name>simpleDataTable</tag-name> + <component> + <component-type>org.richfaces.SimpleDataTable</component-type> + <renderer-type>org.richfaces.SimpleDataTableRenderer</renderer-type> + </component> + </tag> + <tag> + <tag-name>extendedDataTable</tag-name> + <component> + <component-type>org.richfaces.ExtendedDataTable</component-type> + <renderer-type>org.richfaces.ExtendedDataTableRenderer</renderer-type> + </component> + </tag> +</facelet-taglib> Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/templates/org/richfaces/renderkit/html/simpletable.template.xml =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/templates/org/richfaces/renderkit/html/simpletable.template.xml 2009-09-21 14:03:25 UTC (rev 15641) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/templates/org/richfaces/renderkit/html/simpletable.template.xml 2009-09-21 14:05:34 UTC (rev 15642) @@ -6,6 +6,5 @@ superclass="org.richfaces.renderkit.AbstractSimpleDataTableRenderer" componentclass="org.richfaces.component.UISimpleDataTable"> - - + SimpleDataTable encoding .... </cdk:root> \ No newline at end of file

15 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r15641 - in root/examples-sandbox/trunk: components and 6 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: abelevich Date: 2009-09-21 10:03:25 -0400 (Mon, 21 Sep 2009) New Revision: 15641 Added: root/examples-sandbox/trunk/components/tables/ root/examples-sandbox/trunk/components/tables/pom.xml root/examples-sandbox/trunk/components/tables/src/ root/examples-sandbox/trunk/components/tables/src/main/ root/examples-sandbox/trunk/components/tables/src/main/java/ root/examples-sandbox/trunk/components/tables/src/main/resources/ root/examples-sandbox/trunk/components/tables/src/main/webapp/ root/examples-sandbox/trunk/components/tables/src/main/webapp/META-INF/ root/examples-sandbox/trunk/components/tables/src/main/webapp/META-INF/MANIFEST.MF root/examples-sandbox/trunk/components/tables/src/main/webapp/WEB-INF/ root/examples-sandbox/trunk/components/tables/src/main/webapp/WEB-INF/faces-config.xml root/examples-sandbox/trunk/components/tables/src/main/webapp/WEB-INF/web.xml root/examples-sandbox/trunk/components/tables/src/main/webapp/home.xhtml root/examples-sandbox/trunk/components/tables/src/main/webapp/index.jsp root/examples-sandbox/trunk/components/tables/src/main/webapp/resources/ root/examples-sandbox/trunk/components/tables/src/test/ root/examples-sandbox/trunk/pom.xml Modified: root/examples-sandbox/trunk/components/pom.xml Log: add tables dev sample Modified: root/examples-sandbox/trunk/components/pom.xml =================================================================== --- root/examples-sandbox/trunk/components/pom.xml 2009-09-21 12:35:25 UTC (rev 15640) +++ root/examples-sandbox/trunk/components/pom.xml 2009-09-21 14:03:25 UTC (rev 15641) @@ -1,74 +1,35 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> - <artifactId>root</artifactId> - <groupId>org.richfaces</groupId> - <version>4.0.0-SNAPSHOT</version> + <groupId>org.richfaces</groupId> + <artifactId>examples-sandbox</artifactId> + <version>4.0.0-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> - <artifactId>tests</artifactId> + + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.examples-sandbox</groupId> + <artifactId>components</artifactId> <packaging>pom</packaging> - <name>RichFaces test projects</name> - <url>http://labs.jboss.com/jbossrichfaces/tests</url> - <properties> -  - </properties> -  - <build> - <plugins> - <plugin> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <id>attach-source</id> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <index>true</index> - <manifest> - <addDefaultSpecificationEntries> - true - </addDefaultSpecificationEntries> - <addDefaultImplementationEntries> - true - </addDefaultImplementationEntries> - </manifest> - <manifestEntries> - <mode>development</mode> - <Build-Number>${buildNumber}</Build-Number> - </manifestEntries> - </archive> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - </plugins> - </build> - - <dependencies> - <dependency> - <groupId>org.richfaces.framework</groupId> - <artifactId>jsf-test</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - </dependencies> <modules> - <module>ajax</module> + <module>tables</module> </modules> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.richfaces.ui.components.sandbox</groupId> + <artifactId>${example.componentName}-ui</artifactId> + <version>4.0.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui.components.sandbox</groupId> + <artifactId>${example.componentName}-api</artifactId> + <version>4.0.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui.components.sandbox</groupId> + <artifactId>${example.componentName}-impl</artifactId> + <version>4.0.0-SNAPSHOT</version> + </dependency> + </dependencies> + </dependencyManagement> </project> \ No newline at end of file Added: root/examples-sandbox/trunk/components/tables/pom.xml =================================================================== --- root/examples-sandbox/trunk/components/tables/pom.xml (rev 0) +++ root/examples-sandbox/trunk/components/tables/pom.xml 2009-09-21 14:03:25 UTC (rev 15641) @@ -0,0 +1,79 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 + http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <parent> + <groupId>org.richfaces.examples-sandbox</groupId> + <artifactId>components</artifactId> + <version>4.0.0-SNAPSHOT</version> + </parent> + + <properties> + <example.componentName>tables</example.componentName> + </properties> + + <repositories> + <repository> + <id>repository.jboss.org</id> + <name>Jboss Repository for Maven</name> + <url>http://repository.jboss.org/maven2/</url> + </repository> + <repository> + <id>snapshots.jboss.org</id> + <name>Jboss Snapshots Repository for Maven</name> + <url>http://snapshots.jboss.org/maven2/</url> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + <repository> + <snapshots> + <enabled>true</enabled> + </snapshots> + <id>maven-repository2.dev.java.net</id> + <name>Java.net Repository for Maven 2</name> + <url>http://download.java.net/maven/2</url> + </repository> + </repositories> + + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.examples.components</groupId> + <artifactId>${example.componentName}-demo</artifactId> + <packaging>war</packaging> + <name>RichFaces core demo</name> + + <dependencies> + <dependency> + <groupId>org.richfaces.ui.components.sandbox</groupId> + <artifactId>${example.componentName}-ui</artifactId> + </dependency> + <dependency> + <groupId>org.richfaces.ui.components.sandbox</groupId> + <artifactId>${example.componentName}-api</artifactId> + </dependency> + <dependency> + <groupId>org.richfaces.ui.components.sandbox</groupId> + <artifactId>${example.componentName}-impl</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.cache</groupId> + <artifactId>jbosscache-core</artifactId> + <version>3.1.0.GA</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.5.8</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version>1.5.8</version> + <scope>provided</scope> + </dependency> + </dependencies> + +</project> \ No newline at end of file Added: root/examples-sandbox/trunk/components/tables/src/main/webapp/META-INF/MANIFEST.MF =================================================================== --- root/examples-sandbox/trunk/components/tables/src/main/webapp/META-INF/MANIFEST.MF (rev 0) +++ root/examples-sandbox/trunk/components/tables/src/main/webapp/META-INF/MANIFEST.MF 2009-09-21 14:03:25 UTC (rev 15641) @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + Added: root/examples-sandbox/trunk/components/tables/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- root/examples-sandbox/trunk/components/tables/src/main/webapp/WEB-INF/faces-config.xml (rev 0) +++ root/examples-sandbox/trunk/components/tables/src/main/webapp/WEB-INF/faces-config.xml 2009-09-21 14:03:25 UTC (rev 15641) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<faces-config xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd" + version="2.0"> +</faces-config> Added: root/examples-sandbox/trunk/components/tables/src/main/webapp/WEB-INF/web.xml =================================================================== --- root/examples-sandbox/trunk/components/tables/src/main/webapp/WEB-INF/web.xml (rev 0) +++ root/examples-sandbox/trunk/components/tables/src/main/webapp/WEB-INF/web.xml 2009-09-21 14:03:25 UTC (rev 15641) @@ -0,0 +1,95 @@ +<?xml version='1.0' encoding='UTF-8'?> + + + +<web-app version="2.5" + xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> + + <display-name></display-name> + <description></description> + + <context-param> + <param-name>javax.faces.STATE_SAVING_METHOD</param-name> + <param-value>server</param-value> + </context-param> + + <context-param> + <param-name>javax.faces.DEFAULT_SUFFIX</param-name> + <param-value>.xhtml</param-value> + </context-param> + <context-param> + <param-name>facelets.DEVELOPMENT</param-name> + <param-value>true</param-value> + </context-param> + + <context-param> + <description> + Set this flag to true if you want the JavaServer Faces + Reference Implementation to validate the XML in your + faces-config.xml resources against the DTD. Default + value is false. + </description> + <param-name>com.sun.faces.validateXml</param-name> + <param-value>true</param-value> + </context-param> + +  + <servlet> + <servlet-name>Faces Servlet</servlet-name> + <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + + +  +  + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>/faces/*</url-pattern> + <url-pattern>*.jsf</url-pattern> + </servlet-mapping> + +</web-app> Added: root/examples-sandbox/trunk/components/tables/src/main/webapp/home.xhtml =================================================================== --- root/examples-sandbox/trunk/components/tables/src/main/webapp/home.xhtml (rev 0) +++ root/examples-sandbox/trunk/components/tables/src/main/webapp/home.xhtml 2009-09-21 14:03:25 UTC (rev 15641) @@ -0,0 +1,19 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + 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"> + <f:view contentType="text/html"/> + + <h:head> + <title>Richfaces Tables</title> + </h:head> + + <h:body> + <h:form id="form1"> + <rich:simpleDataTable> + </rich:simpleDataTable> + </h:form> + </h:body> +</html> Added: root/examples-sandbox/trunk/components/tables/src/main/webapp/index.jsp =================================================================== --- root/examples-sandbox/trunk/components/tables/src/main/webapp/index.jsp (rev 0) +++ root/examples-sandbox/trunk/components/tables/src/main/webapp/index.jsp 2009-09-21 14:03:25 UTC (rev 15641) @@ -0,0 +1,5 @@ +<html> +<body> +<h2>Hello World!</h2> +</body> +</html> Added: root/examples-sandbox/trunk/pom.xml =================================================================== --- root/examples-sandbox/trunk/pom.xml (rev 0) +++ root/examples-sandbox/trunk/pom.xml 2009-09-21 14:03:25 UTC (rev 15641) @@ -0,0 +1,130 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 + http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces</groupId> + <artifactId>examples-sandbox</artifactId> + <version>4.0.0-SNAPSHOT</version> + <packaging>pom</packaging> + <name>richfaces sandbox components examples</name> + + <distributionManagement> + <downloadUrl> + http://labs.jboss.com/portal/jbossrichfaces/downloads + </downloadUrl> + <repository> + <id>repository.jboss.org</id> + <uniqueVersion>false</uniqueVersion> + <url>${releaseRepository}</url> + </repository> + <snapshotRepository> + <id>snapshots.jboss.org</id> + <uniqueVersion>true</uniqueVersion> + <url>${snapshotRepository}</url> + </snapshotRepository> +  + </distributionManagement> + <dependencies> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl</artifactId> + <version>4.0.0-SNAPSHOT</version> + </dependency> + +  + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version >1.5.8</version> + </dependency> + +  +  + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>2.0.0-SNAPSHOT</version> +  + </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-impl</artifactId> + <version>2.0.0-SNAPSHOT</version> +  + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + <version>2.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <version>1.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>jstl</groupId> + <artifactId>jstl</artifactId> + <version>1.2</version> + <scope>provided</scope> + </dependency> + </dependencies> + + <modules> + <module>components</module> + </modules> + + <build> + <plugins> + <plugin> + <groupId>org.mortbay.jetty</groupId> + <artifactId>maven-jetty-plugin</artifactId> + <version>6.1.18</version> + <configuration> + <scanIntervalSeconds>10</scanIntervalSeconds> + <connectors> + <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector"> + <port>${jetty.port}</port> + <maxIdleTime>60000</maxIdleTime> + </connector> + </connectors> + </configuration> + </plugin> + <plugin> + <artifactId>maven-eclipse-plugin</artifactId> + <configuration> + <wtpversion>2.0</wtpversion> + <downloadSources>true</downloadSources> + </configuration> + </plugin> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + </plugins> + </build> + + <properties> + <jetty.port>8080</jetty.port> + </properties> +</project> \ No newline at end of file

15 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r15640 - branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest.

by richfaces-svn-commits＠lists.jboss.org

Author: ppitonak(a)redhat.com Date: 2009-09-21 08:35:25 -0400 (Mon, 21 Sep 2009) New Revision: 15640 Modified: branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/AbstractSeleniumRichfacesTestCase.java Log: * added closing browser windows to the method finalizeContext Modified: branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/AbstractSeleniumRichfacesTestCase.java =================================================================== --- branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/AbstractSeleniumRichfacesTestCase.java 2009-09-21 06:42:28 UTC (rev 15639) +++ branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/AbstractSeleniumRichfacesTestCase.java 2009-09-21 12:35:25 UTC (rev 15640) @@ -108,6 +108,7 @@ */ @AfterClass public void finalizeContext() { + selenium.close(); selenium.stop(); selenium = null; contextPath = null;

15 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r15639 - branches/community/3.3.X/samples/richfaces-demo/functional-test.

by richfaces-svn-commits＠lists.jboss.org

Author: lfryc(a)redhat.com Date: 2009-09-21 02:42:28 -0400 (Mon, 21 Sep 2009) New Revision: 15639 Modified: branches/community/3.3.X/samples/richfaces-demo/functional-test/pom.xml Log: - removed generating of test-javadoc in package phase (will be injected directly to hudson build) Modified: branches/community/3.3.X/samples/richfaces-demo/functional-test/pom.xml =================================================================== --- branches/community/3.3.X/samples/richfaces-demo/functional-test/pom.xml 2009-09-20 17:28:25 UTC (rev 15638) +++ branches/community/3.3.X/samples/richfaces-demo/functional-test/pom.xml 2009-09-21 06:42:28 UTC (rev 15639) @@ -73,19 +73,6 @@ </configuration> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <executions> - <execution> - <id>package-test-javadoc</id> - <phase>package</phase> - <goals> - <goal>test-javadoc</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> <artifactId>maven-dependency-plugin</artifactId> <executions> <execution> @@ -259,4 +246,4 @@ <scope>test</scope> </dependency> </dependencies> -</project> +</project> \ No newline at end of file

15 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r15638 - branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/testng/hudson.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2009-09-20 13:28:25 -0400 (Sun, 20 Sep 2009) New Revision: 15638 Modified: branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/testng/hudson/testng-def-def-none-parser.xml Log: Tests configuration reverted to execute all org.testng.* tests Modified: branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/testng/hudson/testng-def-def-none-parser.xml =================================================================== --- branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/testng/hudson/testng-def-def-none-parser.xml 2009-09-20 17:21:41 UTC (rev 15637) +++ branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/testng/hudson/testng-def-def-none-parser.xml 2009-09-20 17:28:25 UTC (rev 15638) @@ -12,12 +12,8 @@ </run> </groups> - <classes> - <class name="org.richfaces.testng.TooltipTest" /> - </classes> - -  + </packages> </test> </suite>

15 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r15637 - in branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/main/webapp: template/autotest and 1 other directory.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2009-09-20 13:21:41 -0400 (Sun, 20 Sep 2009) New Revision: 15637 Modified: branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/main/webapp/pages/tooltip/tooltipAutoTest.xhtml branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/main/webapp/template/autotest/dataTable.xhtml branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/main/webapp/template/autotest/modalPanel.xhtml branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/main/webapp/template/autotest/simple.xhtml Log: Tests templates updated to contain tested component on to of the page and avoid problems with scrolls Modified: branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/main/webapp/pages/tooltip/tooltipAutoTest.xhtml =================================================================== (Binary files differ) Modified: branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/main/webapp/template/autotest/dataTable.xhtml =================================================================== --- branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/main/webapp/template/autotest/dataTable.xhtml 2009-09-20 16:44:07 UTC (rev 15636) +++ branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/main/webapp/template/autotest/dataTable.xhtml 2009-09-20 17:21:41 UTC (rev 15637) @@ -13,14 +13,14 @@ <h:outputText value="Data Table" /> </f:facet> <h:panelGroup columns="1" rendered="#{templateBean.dataTableRowIndex == row}"> + <ui:insert name="outOfFormComponent" /> + <h:form id="autoTestForm"> + <ui:insert name="component" /> + <ui:include src="../../layout/autotest/autoTestHiddens.xhtml" /> + <br/> + <h:message id="_auto_messageId" for="componentId"></h:message> + </h:form> <ui:include src="../../layout/autotest/autoTestControls.xhtml" /> - <h:form id="autoTestForm"> - <ui:include src="../../layout/autotest/autoTestHiddens.xhtml" /> - <ui:insert name="component" /> - <br/> - <h:message id="_auto_messageId" for="componentId"></h:message> - </h:form> - <ui:insert name="outOfFormComponent" /> </h:panelGroup> <h:outputText value="#{row}" rendered="#{templateBean.dataTableRowIndex != row}" /> </rich:column> Modified: branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/main/webapp/template/autotest/modalPanel.xhtml =================================================================== --- branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/main/webapp/template/autotest/modalPanel.xhtml 2009-09-20 16:44:07 UTC (rev 15636) +++ branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/main/webapp/template/autotest/modalPanel.xhtml 2009-09-20 17:21:41 UTC (rev 15637) @@ -15,14 +15,14 @@ <a onclick="Richfaces.hideModalPanel('_Selenium_Test_ModalPanel'); return false;" href="#" >Hide the panel</a> </f:facet> - <ui:include src="../../layout/autotest/autoTestControls.xhtml" /> + <ui:insert name="outOfFormComponent" /> <h:form id="autoTestForm"> + <ui:insert name="component" /> <ui:include src="../../layout/autotest/autoTestHiddens.xhtml" /> - <ui:insert name="component" /> <br/> <h:message id="_auto_messageId" for="componentId"></h:message> </h:form> - <ui:insert name="outOfFormComponent" /> + <ui:include src="../../layout/autotest/autoTestControls.xhtml" /> <ui:include src="../../layout/controlLayout.xhtml" /> </rich:modalPanel> </ui:define> Modified: branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/main/webapp/template/autotest/simple.xhtml =================================================================== --- branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/main/webapp/template/autotest/simple.xhtml 2009-09-20 16:44:07 UTC (rev 15636) +++ branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/main/webapp/template/autotest/simple.xhtml 2009-09-20 17:21:41 UTC (rev 15637) @@ -7,14 +7,14 @@ xmlns:ui="http://java.sun.com/jsf/facelets"> <ui:composition template="../simple.xhtml"> <ui:define name="template"> - <ui:include src="../../layout/autotest/autoTestControls.xhtml" /> + <ui:insert name="outOfFormComponent" /> <h:form id="autoTestForm"> + <ui:insert name="component" /> <ui:include src="../../layout/autotest/autoTestHiddens.xhtml" /> - <ui:insert name="component" /> <br/> <h:message id="_auto_messageId" for="componentId"></h:message> </h:form> - <ui:insert name="outOfFormComponent" /> + <ui:include src="../../layout/autotest/autoTestControls.xhtml" /> </ui:define> </ui:composition> </html> \ No newline at end of file

15 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r15636 - in branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test: testng/hudson and 1 other directory.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2009-09-20 12:44:07 -0400 (Sun, 20 Sep 2009) New Revision: 15636 Modified: branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/testng/hudson/testng-def-def-none-parser.xml Log: Modified resizeWindowToScrenSize() method Switched from all tests to a single TooltipTest Modified: branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java =================================================================== --- branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java 2009-09-20 12:34:49 UTC (rev 15635) +++ branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java 2009-09-20 16:44:07 UTC (rev 15636) @@ -32,6 +32,8 @@ import org.ajax4jsf.bean.Configurator; import org.ajax4jsf.javascript.ScriptUtils; import org.ajax4jsf.template.Template; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.openqa.selenium.server.RemoteControlConfiguration; import org.openqa.selenium.server.SeleniumServer; import org.testng.Assert; @@ -54,6 +56,8 @@ */ public abstract class SeleniumTestBase implements RichSeleniumTest { + private static final Log LOG = LogFactory.getLog(SeleniumTestBase.class); + /** Specifies the time to wait for page rendering */ private static final Integer pageRenderTime = 10000; @@ -1548,8 +1552,23 @@ } public void resizeWindowToScrenSize() { + Integer screenWidth = Integer.parseInt(selenium.getEval("screen.width")); + Integer screenHeight = Integer.parseInt(selenium.getEval("screen.height")); + + LOG.info(String.format("Screen size is %1$s x %2$s", + screenWidth, screenHeight)); + selenium.getEval("(window.top || window).moveTo(0, 0);"); - selenium.getEval("(window.top || window).resizeTo(screen.width, screen.height);"); + + if (screenWidth < 1280) { + screenWidth = 1280; + } + + if (screenHeight < 1024) { + screenHeight = 1024; + } + + selenium.getEval(String.format("(window.top || window).resizeTo(%1$s, %2$s);", + screenWidth, screenHeight)); } - } Modified: branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/testng/hudson/testng-def-def-none-parser.xml =================================================================== --- branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/testng/hudson/testng-def-def-none-parser.xml 2009-09-20 12:34:49 UTC (rev 15635) +++ branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/testng/hudson/testng-def-def-none-parser.xml 2009-09-20 16:44:07 UTC (rev 15636) @@ -12,8 +12,12 @@ </run> </groups> - <packages> + <classes> + <class name="org.richfaces.testng.TooltipTest" /> + </classes> + +  </test> </suite>

15 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r15635 - in branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces: testng and 1 other directory.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2009-09-20 08:34:49 -0400 (Sun, 20 Sep 2009) New Revision: 15635 Modified: branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/CalendarTest.java branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/TooltipTest.java Log: Added window resizing for Calendar and Tooltip tests Modified: branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java =================================================================== --- branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java 2009-09-19 15:30:22 UTC (rev 15634) +++ branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java 2009-09-20 12:34:49 UTC (rev 15635) @@ -1547,5 +1547,9 @@ } + public void resizeWindowToScrenSize() { + selenium.getEval("(window.top || window).moveTo(0, 0);"); + selenium.getEval("(window.top || window).resizeTo(screen.width, screen.height);"); + } } Modified: branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/CalendarTest.java =================================================================== --- branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/CalendarTest.java 2009-09-19 15:30:22 UTC (rev 15634) +++ branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/CalendarTest.java 2009-09-20 12:34:49 UTC (rev 15635) @@ -1780,6 +1780,9 @@ @Test public void testJointPointAndDirectionAttributes(Template template) { renderPage(JOINTPOINT_DIRECTION_TEST_URL, template, null); + + resizeWindowToScrenSize(); + initIds(getParentId()); String topLeftPointLeft = "$('" + inputDateId + "').cumulativeOffset().left"; Modified: branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/TooltipTest.java =================================================================== --- branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/TooltipTest.java 2009-09-19 15:30:22 UTC (rev 15634) +++ branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/TooltipTest.java 2009-09-20 12:34:49 UTC (rev 15635) @@ -96,6 +96,9 @@ public void testCoreAjaxMode(Template template) { AutoTester autoTester = getAutoTester(this); autoTester.renderPage(template, RESET_METHOD); + + resizeWindowToScrenSize(); + writeStatus("Component retrieves data from server; 'defaultContent' facet is handled; listeners fire"); String componentId = autoTester.getClientId(AutoTester.COMPONENT_ID); String contentId = autoTester.getClientId(AutoTester.COMPONENT_ID + "content"); @@ -123,6 +126,9 @@ public void testCoreClientMode(Template template) { AutoTester autoTester = getAutoTester(this); autoTester.renderPage(template, INIT_CLIENT_TEST); + + resizeWindowToScrenSize(); + writeStatus("Check component is activated by defined event(onclick); its positioning and dimensions are ok"); String componentId = autoTester.getClientId(AutoTester.COMPONENT_ID); @@ -221,7 +227,7 @@ @Test public void testStylesAndClassesAndHtmlAttributes(Template template) { - AutoTester autoTester = getAutoTester(this); + AutoTester autoTester = getAutoTester(this); autoTester.renderPage(template, RESET_METHOD); writeStatus("Check style and classes, standard HTML attributes are output to client");

15 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r15634 - branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2009-09-19 11:30:22 -0400 (Sat, 19 Sep 2009) New Revision: 15634 Modified: branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/CalendarTest.java Log: CalendarTest fixed Modified: branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/CalendarTest.java =================================================================== --- branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/CalendarTest.java 2009-09-19 12:56:16 UTC (rev 15633) +++ branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/CalendarTest.java 2009-09-19 15:30:22 UTC (rev 15634) @@ -1789,10 +1789,10 @@ String bottomLeftPointTop = "($('" + inputDateId + "').cumulativeOffset().top + $('" + inputDateId + "').getHeight())"; String topRightPointLeft = "($('" + popupButtonId + "').cumulativeOffset().left + $('" + popupButtonId + "').getWidth())"; - String topRightPointTop = "$('" + popupButtonId + "').cumulativeOffset().top"; + String topRightPointTop = "$('" + inputDateId + "').cumulativeOffset().top"; String bottomRightPointLeft = topRightPointLeft; - String bottomRightPointTop = "($('" + popupButtonId + "').cumulativeOffset().top + $('" + popupButtonId + "').getHeight())"; + String bottomRightPointTop = "($('" + inputDateId + "').cumulativeOffset().top + $('" + inputDateId + "').getHeight())"; testJointPoint("top-left", topLeftPointLeft, topLeftPointTop); testJointPoint("top-right", topRightPointLeft, topRightPointTop);

15 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r15633 - branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2009-09-19 08:56:16 -0400 (Sat, 19 Sep 2009) New Revision: 15633 Modified: branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/DataScrollerTest.java Log: DataScrollerTest fixed Modified: branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/DataScrollerTest.java =================================================================== --- branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/DataScrollerTest.java 2009-09-19 05:38:08 UTC (rev 15632) +++ branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/DataScrollerTest.java 2009-09-19 12:56:16 UTC (rev 15633) @@ -445,14 +445,14 @@ assertClassNames(getPageLinkRefScript(5, dataScrollerTableId), activePageClasses, "'3' link should current", false); assertClassNames(getPageLinkRefScript(3, dataScrollerTableId), inactivePageClasses, "'1' link should be inactive", false); - assertClassNames(getPageLinkRefScript(0, dataScrollerTableId), activeForwardClasses, "'««' control should be accessible", false); - assertClassNames(getPageLinkRefScript(1, dataScrollerTableId), activeForwardClasses, "'«' control should be accessible", false); + assertClassNames(getPageLinkRefScript(0, dataScrollerTableId), activeForwardClasses, "'\u00ab\u00ab' control should be accessible", false); + assertClassNames(getPageLinkRefScript(1, dataScrollerTableId), activeForwardClasses, "'\u00ab' control should be accessible", false); if(paired){ assertClassNames(getPageLinkRefScript(5, secondDataScrollerTableId), activePageClasses, "'3' link should current", false); assertClassNames(getPageLinkRefScript(3, secondDataScrollerTableId), inactivePageClasses, "'1' link should be inactive", false); - assertClassNames(getPageLinkRefScript(0, secondDataScrollerTableId), activeForwardClasses, "'««' control should be accessible", false); - assertClassNames(getPageLinkRefScript(1, secondDataScrollerTableId), activeForwardClasses, "'«' control should be accessible", false); + assertClassNames(getPageLinkRefScript(0, secondDataScrollerTableId), activeForwardClasses, "'\u00ab\u00ab' control should be accessible", false); + assertClassNames(getPageLinkRefScript(1, secondDataScrollerTableId), activeForwardClasses, "'\u00ab' control should be accessible", false); } if(paired){ @@ -468,11 +468,11 @@ clickControl(15, dataScrollerTableId); testData(1, "Page 10"); - assertClassNames(getPageLinkRefScript(15, dataScrollerTableId), inactiveForwardClasses, "'»»' control should be inactive", false); - assertClassNames(getPageLinkRefScript(14, dataScrollerTableId), inactiveForwardClasses, "'»' control should be inactive", false); + assertClassNames(getPageLinkRefScript(15, dataScrollerTableId), inactiveForwardClasses, "'\u00bb' control should be inactive", false); + assertClassNames(getPageLinkRefScript(14, dataScrollerTableId), inactiveForwardClasses, "'\u00bb' control should be inactive", false); if(paired){ - assertClassNames(getPageLinkRefScript(15, secondDataScrollerTableId), inactiveForwardClasses, "'»»' control should be inactive", false); - assertClassNames(getPageLinkRefScript(14, secondDataScrollerTableId), inactiveForwardClasses, "'»' control should be inactive", false); + assertClassNames(getPageLinkRefScript(15, secondDataScrollerTableId), inactiveForwardClasses, "'\u00bb\u00bb' control should be inactive", false); + assertClassNames(getPageLinkRefScript(14, secondDataScrollerTableId), inactiveForwardClasses, "'\u00bb' control should be inactive", false); } if(paired){ @@ -481,12 +481,12 @@ clickControl(1, dataScrollerTableId); } testData(1, "Page 9"); - assertClassNames(getPageLinkRefScript(0, dataScrollerTableId), activeForwardClasses, "'»»' control should be active", false); - assertClassNames(getPageLinkRefScript(1, dataScrollerTableId), activeForwardClasses, "'»' control should be active", false); + assertClassNames(getPageLinkRefScript(0, dataScrollerTableId), activeForwardClasses, "'\u00bb\u00bb' control should be active", false); + assertClassNames(getPageLinkRefScript(1, dataScrollerTableId), activeForwardClasses, "'\u00bb' control should be active", false); assertClassNames(getPageLinkRefScript(11, dataScrollerTableId), activePageClasses, "'9' link should be current", false); if(paired){ - assertClassNames(getPageLinkRefScript(0, secondDataScrollerTableId), activeForwardClasses, "'»»' control should be active", false); - assertClassNames(getPageLinkRefScript(1, secondDataScrollerTableId), activeForwardClasses, "'»' control should be active", false); + assertClassNames(getPageLinkRefScript(0, secondDataScrollerTableId), activeForwardClasses, "'\u00bb\u00bb' control should be active", false); + assertClassNames(getPageLinkRefScript(1, secondDataScrollerTableId), activeForwardClasses, "'\u00bb' control should be active", false); assertClassNames(getPageLinkRefScript(11, secondDataScrollerTableId), activePageClasses, "'9' link should be current", false); } @@ -564,39 +564,39 @@ } private void testControls() { - // Check '««' link + // Check '\u00ab\u00ab' link String text = selenium.getTable("id=" + dataScrollerTableId + ".0.0"); - Assert.assertEquals("\u0171\u0171", text, "DataScroller does not contain '««' link or its position is invalid"); + Assert.assertEquals(text, "\u00ab\u00ab", "DataScroller does not contain '\u00ab\u00ab' link or its position is invalid"); assertClassNames(getPageLinkRefScript(0, dataScrollerTableId),inactiveForwardClasses, "DataScroller rendering failed: ", false); - // Check '«' link + // Check '\u00ab' link text = selenium.getTable("id=" + dataScrollerTableId + ".0.1"); - Assert.assertEquals("\u0171", text, "DataScroller does not contain '«' link or its position is invalid"); + Assert.assertEquals(text, "\u00ab", "DataScroller does not contain '\u00ab' link or its position is invalid"); assertClassNames(getPageLinkRefScript(1, dataScrollerTableId),inactiveForwardClasses, "DataScroller rendering failed: ", false); // Check '1' link text = selenium.getTable("id=" + dataScrollerTableId + ".0.3"); - Assert.assertEquals("1", text, "DataScroller does not contain '1' link or its position is invalid"); + Assert.assertEquals(text, "1", "DataScroller does not contain '1' link or its position is invalid"); assertClassNames(getPageLinkRefScript(3, dataScrollerTableId),activePageClasses, "DataScroller rendering failed: ", false); // Check '5' link text = selenium.getTable("id=" + dataScrollerTableId + ".0.7"); - Assert.assertEquals("5", text, "DataScroller does not contain '5' link or its position is invalid"); + Assert.assertEquals(text, "5", "DataScroller does not contain '5' link or its position is invalid"); assertClassNames(getPageLinkRefScript(7, dataScrollerTableId),inactivePageClasses, "DataScroller rendering failed: ", false); - // Check '»' link + // Check '\u00bb' link text = selenium.getTable("id=" + dataScrollerTableId + ".0.14"); - Assert.assertEquals("\u0187", text, "DataScroller does not contain '»' link or its position is invalid"); + Assert.assertEquals(text, "\u00bb", "DataScroller does not contain '\u00bb' link or its position is invalid"); assertClassNames(getPageLinkRefScript(14, dataScrollerTableId),activeForwardClasses, "DataScroller rendering failed: ", false); - // Check '»»' link + // Check '\u00bb\u00bb' link text = selenium.getTable("id=" + dataScrollerTableId + ".0.15"); - Assert.assertEquals("\u0187\u0187", text, "DataScroller does not contain '»»' link or its position is invalid"); + Assert.assertEquals(text, "\u00bb\u00bb", "DataScroller does not contain '\u00bb\u00bb' link or its position is invalid"); assertClassNames(getPageLinkRefScript(15, dataScrollerTableId),activeForwardClasses, "DataScroller rendering failed: ", false); @@ -604,18 +604,18 @@ private void checkCustomFacets() { String text = selenium.getTable("id=" + dataScrollerTableId + ".0.2"); - Assert.assertEquals("", text, "'Previous' facet should be rendered yet"); + Assert.assertEquals(text, "", "'Previous' facet should be rendered yet"); assertClassNames(getPageLinkRefScript(2, dataScrollerTableId),inactiveForwardClasses, "DataScroller rendering failed: ", false); text = selenium.getTable("id=" + dataScrollerTableId + ".0.13"); - Assert.assertEquals("Next", text, "'Next' facet didnot rendered. DataScroller does not contain 'Next' link or its position is invalid"); + Assert.assertEquals(text, "Next", "'Next' facet didnot rendered. DataScroller does not contain 'Next' link or its position is invalid"); assertClassNames(getPageLinkRefScript(13, dataScrollerTableId),activeForwardClasses, "DataScroller rendering failed: ", false); clickControl(4, dataScrollerTableId); text = selenium.getTable("id=" + dataScrollerTableId + ".0.2"); - Assert.assertEquals("Previous", text, "'Previous' facet didnot be rendered."); + Assert.assertEquals(text, "Previous", "'Previous' facet didnot be rendered."); assertClassNames(getPageLinkRefScript(2, dataScrollerTableId),activeForwardClasses, "DataScroller rendering failed: ", false); @@ -627,7 +627,7 @@ for (int i=1; i <= rowCount; i++) { String text = selenium.getTable("id=" + dataTableId + "."+rowCount+".1"); - Assert.assertEquals(data, text,"Data Table content is invalid"); + Assert.assertEquals(text, data, "Data Table content is invalid"); } }

15 years, 3 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits September 2009