JBoss Rich Faces SVN: r21873 - in modules/tests/metamer/trunk: ftest and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2011-02-22 10:39:35 -0500 (Tue, 22 Feb 2011)
New Revision: 21873
Modified:
modules/tests/metamer/trunk/ftest-source/pom.xml
modules/tests/metamer/trunk/ftest/pom.xml
modules/tests/metamer/trunk/pom.xml
Log:
tied on release versions - richfaces:4.0.0.20110220-CR1 and richfaces-selenium:1.5.2.SP5
Modified: modules/tests/metamer/trunk/ftest/pom.xml
===================================================================
--- modules/tests/metamer/trunk/ftest/pom.xml 2011-02-22 15:38:22 UTC (rev 21872)
+++ modules/tests/metamer/trunk/ftest/pom.xml 2011-02-22 15:39:35 UTC (rev 21873)
@@ -25,7 +25,7 @@
<parent>
<artifactId>functional-test-jboss-ci-template</artifactId>
<groupId>org.jboss.test.richfaces-selenium</groupId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.2.SP5</version>
</parent>
<groupId>org.richfaces.tests</groupId>
Modified: modules/tests/metamer/trunk/ftest-source/pom.xml
===================================================================
--- modules/tests/metamer/trunk/ftest-source/pom.xml 2011-02-22 15:38:22 UTC (rev 21872)
+++ modules/tests/metamer/trunk/ftest-source/pom.xml 2011-02-22 15:39:35 UTC (rev 21873)
@@ -37,7 +37,7 @@
<dependency>
<artifactId>root</artifactId>
<groupId>org.jboss.test.richfaces-selenium</groupId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.2.SP5</version>
<scope>import</scope>
<type>pom</type>
</dependency>
Modified: modules/tests/metamer/trunk/pom.xml
===================================================================
--- modules/tests/metamer/trunk/pom.xml 2011-02-22 15:38:22 UTC (rev 21872)
+++ modules/tests/metamer/trunk/pom.xml 2011-02-22 15:39:35 UTC (rev 21873)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.richfaces.examples</groupId>
<artifactId>richfaces-example-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.20110220-CR1</version>
</parent>
<groupId>org.richfaces.tests</groupId>
@@ -124,7 +124,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<richfaces.checkstyle.version>2</richfaces.checkstyle.version>
- <version.richfaces>4.0.0-SNAPSHOT</version.richfaces>
+ <version.richfaces>4.0.0.20110220-CR1</version.richfaces>
</properties>
<dependencyManagement>
13 years, 2 months
JBoss Rich Faces SVN: r21871 - in modules/tests/metamer/trunk/application/src/main/webapp: templates and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2011-02-22 09:49:58 -0500 (Tue, 22 Feb 2011)
New Revision: 21871
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/resources/metamer/attributes.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/header.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/list.xhtml
Log:
added parameter "for" for labels
added parameter "alt" for images
Modified: modules/tests/metamer/trunk/application/src/main/webapp/resources/metamer/attributes.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/resources/metamer/attributes.xhtml 2011-02-22 14:31:38 UTC (rev 21870)
+++ modules/tests/metamer/trunk/application/src/main/webapp/resources/metamer/attributes.xhtml 2011-02-22 14:49:58 UTC (rev 21871)
@@ -28,7 +28,7 @@
<c:if test="#{not fn:contains(cc.attrs.exclude, entry.key)}">
<h:panelGroup layout="block">
<h:outputLabel id="#{entry.key}Label" value="#{entry.key}" style="margin-right: 5px;" for="#{entry.key}Input"/>
- <h:graphicImage value="/resources/images/help.png" title="#{entry.value.help}"
+ <h:graphicImage value="/resources/images/help.png" title="#{entry.value.help}" alt="help for attribute #{entry.key}"
rendered="#{entry.value.help != null}" height="18px;"
style="vertical-align: middle;" styleClass="attribute-help" >
</h:graphicImage>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/header.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/header.xhtml 2011-02-22 14:31:38 UTC (rev 21870)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/header.xhtml 2011-02-22 14:49:58 UTC (rev 21871)
@@ -1,12 +1,11 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!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:a4j="http://richfaces.org/a4j"
- xmlns:rich="http://richfaces.org/rich">
+ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.org/rich">
<!--
JBoss, Home of Professional Open Source
-Copyright 2010, Red Hat, Inc. and individual contributors
+Copyright 2010-2011, Red Hat, Inc. and individual contributors
by the @authors tag. See the copyright.txt in the distribution for a
full listing of individual contributors.
@@ -55,7 +54,7 @@
<h:selectBooleanCheckbox id="a4jLogCheckbox" value="false" onchange="showOrHideLog()" />
- <h:outputLabel id="a4jStatusLabel" value="Status" />
+ <h:outputLabel id="a4jStatusLabel" value="Status" for="a4jStatusPanel"/>
<a4j:outputPanel id="a4jStatusPanel" ajaxRendered="true">
<a4j:status id="a4jStatus" onstop="updateLog('#{phasesBean.phases}')">
<f:facet name="start">
@@ -64,20 +63,20 @@
</a4j:status>
</a4j:outputPanel>
- <h:outputLabel value="Locale" />
+ <h:outputLabel id="localeLabel" value="Locale" for="locale" />
<h:outputText id="locale" value="#{facesContext.viewRoot.locale}" />
- <h:outputText id="showUiDebugLabel" value="Show ui:debug" />
+ <h:outputLabel id="showUiDebugLabel" value="Show ui:debug" for="showUiDebug" />
<h:outputText id="showUiDebug" value="Ctrl+Shift+L" />
- <h:outputLabel value="Render Checker" />
+ <h:outputLabel id="renderCheckerLabel" value="Render Checker" for="renderChecker"/>
<a4j:outputPanel id="renderChecker">
<h:outputText value="#{phasesBean.date}">
<f:convertDateTime pattern="HH:MM:ss.SSS" />
</h:outputText>
</a4j:outputPanel>
- <h:outputLabel value="Status Checker" />
+ <h:outputLabel id="statusCheckerLabel" value="Status Checker" for="statusChecker" />
<a4j:outputPanel id="statusCheckerPanel">
<a4j:status id="statusChecker" name="statusChecker" onstop="updateStatusChecker()" />
<h:outputText id="statusCheckerOutput" value="" />
Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/list.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/list.xhtml 2011-02-22 14:31:38 UTC (rev 21870)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/list.xhtml 2011-02-22 14:49:58 UTC (rev 21871)
@@ -35,7 +35,7 @@
<h:body>
<h:panelGrid columns="2" style="float: left; ">
<h:link id="goHomeLink" outcome="/index">
- <h:graphicImage id="goHomeImage" library="images" name="home.png" title="Go Home" style="width: 36px;"/>
+ <h:graphicImage id="goHomeImage" library="images" name="home.png" title="Go Home" style="width: 36px;" alt="Go Home"/>
</h:link>
<h:panelGroup style="font-size: xx-large; font-weight: bold;">
13 years, 2 months
JBoss Rich Faces SVN: r21870 - in modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest: a4jStatus and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2011-02-22 09:31:38 -0500 (Tue, 22 Feb 2011)
New Revision: 21870
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jRepeat/TestSimple.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jStatus/TestFacets.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jStatus/TestInstantAttributes.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jStatus/TestReferencedUsage.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jStatus/TestSimple.java
Log:
added issue tracking RFPL-1186
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jRepeat/TestSimple.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jRepeat/TestSimple.java 2011-02-22 14:30:48 UTC (rev 21869)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jRepeat/TestSimple.java 2011-02-22 14:31:38 UTC (rev 21870)
@@ -30,6 +30,7 @@
import org.richfaces.tests.metamer.ftest.AbstractMetamerTest;
import org.richfaces.tests.metamer.ftest.annotations.Inject;
+import org.richfaces.tests.metamer.ftest.annotations.IssueTracking;
import org.richfaces.tests.metamer.ftest.annotations.Use;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
@@ -81,12 +82,14 @@
}
@Test
+ @IssueTracking("https://issues.jboss.org/browse/RF-10589")
@Use(field = "first", ints = { -1, 0, 1, ELEMENTS_TOTAL / 2, ELEMENTS_TOTAL - 1, ELEMENTS_TOTAL, ELEMENTS_TOTAL + 1 })
public void testFirstAttribute() {
verifyRepeat();
}
@Test
+ @IssueTracking("https://issues.jboss.org/browse/RF-10589")
@Use(field = "rows", ints = { -2, -1, 0, 1, ELEMENTS_TOTAL / 2, ELEMENTS_TOTAL - 1, ELEMENTS_TOTAL,
ELEMENTS_TOTAL + 1 })
public void testRowsAttribute() {
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jStatus/TestFacets.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jStatus/TestFacets.java 2011-02-22 14:30:48 UTC (rev 21869)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jStatus/TestFacets.java 2011-02-22 14:31:38 UTC (rev 21870)
@@ -26,6 +26,7 @@
import java.net.URL;
import org.jboss.test.selenium.locator.ElementLocator;
+import org.richfaces.tests.metamer.ftest.annotations.IssueTracking;
import org.testng.annotations.Test;
/**
@@ -41,6 +42,7 @@
}
@Test
+ @IssueTracking("https://issues.jboss.org/browse/RFPL-1186")
public void testInterleavedChangingOfFacets() {
for (int i = 0; i < 13; i++) {
ElementLocator<?> button = (i % 2 == 0) ? button2 : buttonError;
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jStatus/TestInstantAttributes.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jStatus/TestInstantAttributes.java 2011-02-22 14:30:48 UTC (rev 21869)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jStatus/TestInstantAttributes.java 2011-02-22 14:31:38 UTC (rev 21870)
@@ -38,6 +38,7 @@
* @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a>
* @version $Revision$
*/
+@IssueTracking("https://issues.jboss.org/browse/RFPL-1186")
public class TestInstantAttributes extends AbstracStatusTest {
StatusAttributes attributes = new StatusAttributes() {
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jStatus/TestReferencedUsage.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jStatus/TestReferencedUsage.java 2011-02-22 14:30:48 UTC (rev 21869)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jStatus/TestReferencedUsage.java 2011-02-22 14:31:38 UTC (rev 21870)
@@ -29,12 +29,14 @@
import org.jboss.cheiron.halt.XHRHalter;
import org.jboss.test.selenium.locator.JQueryLocator;
import org.jboss.test.selenium.waiting.retrievers.TextRetriever;
+import org.richfaces.tests.metamer.ftest.annotations.IssueTracking;
import org.testng.annotations.Test;
/**
* @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a>
* @version $Revision$
*/
+@IssueTracking("https://issues.jboss.org/browse/RFPL-1186")
public class TestReferencedUsage extends AbstracStatusTest {
JQueryLocator status1 = pjq("span[id$=status1]");
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jStatus/TestSimple.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jStatus/TestSimple.java 2011-02-22 14:30:48 UTC (rev 21869)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jStatus/TestSimple.java 2011-02-22 14:31:38 UTC (rev 21870)
@@ -32,12 +32,14 @@
import org.jboss.cheiron.halt.XHRHalter;
import org.jboss.test.selenium.locator.JQueryLocator;
import org.jboss.test.selenium.waiting.retrievers.TextRetriever;
+import org.richfaces.tests.metamer.ftest.annotations.IssueTracking;
import org.testng.annotations.Test;
/**
* @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a>
* @version $Revision$
*/
+@IssueTracking("https://issues.jboss.org/browse/RFPL-1186")
public class TestSimple extends AbstracStatusTest {
StatusAttributes attributes = new StatusAttributes();
13 years, 2 months
JBoss Rich Faces SVN: r21869 - modules/tests/metamer/trunk/application/src/main/webapp/templates.
by richfaces-svn-commits＠lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2011-02-22 09:30:48 -0500 (Tue, 22 Feb 2011)
New Revision: 21869
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat1.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat2.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable1.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable2.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable1.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable2.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat1.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat2.xhtml
Log:
fixed templates - item renamed as less conflicting names in format container<template>Item
Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat1.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat1.xhtml 2011-02-22 14:30:05 UTC (rev 21868)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat1.xhtml 2011-02-22 14:30:48 UTC (rev 21869)
@@ -28,11 +28,11 @@
<ui:composition>
<ul>
- <a4j:repeat value="#{templateBean.dataTableModel}" var="item" id="containerA4JRepeat1">
- <li><h:panelGroup columns="1" rendered="#{item == 'row 1'}">
+ <a4j:repeat value="#{templateBean.dataTableModel}" var="containerA4JRepeatItem" id="containerA4JRepeat1">
+ <li><h:panelGroup columns="1" rendered="#{containerA4JRepeatItem == 'row 1'}">
<ui:decorate template="#{templateBean.nextTemplate}.xhtml" />
</h:panelGroup>
- <h:outputText value="#{item}" rendered="#{item != 'row 1'}" /></li>
+ <h:outputText value="#{containerA4JRepeatItem}" rendered="#{containerA4JRepeatItem != 'row 1'}" /></li>
</a4j:repeat>
</ul>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat2.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat2.xhtml 2011-02-22 14:30:05 UTC (rev 21868)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat2.xhtml 2011-02-22 14:30:48 UTC (rev 21869)
@@ -28,11 +28,11 @@
<ui:composition>
<ul>
- <a4j:repeat value="#{templateBean.dataTableModel}" var="item" id="containerA4JRepeat2">
- <li><h:panelGroup columns="1" rendered="#{item == 'row 2'}">
+ <a4j:repeat value="#{templateBean.dataTableModel}" var="containerA4JRepeatItem" id="containerA4JRepeat2">
+ <li><h:panelGroup columns="1" rendered="#{containerA4JRepeatItem == 'row 2'}">
<ui:decorate template="#{templateBean.nextTemplate}.xhtml" />
</h:panelGroup>
- <h:outputText value="#{item}" rendered="#{item != 'row 2'}" /></li>
+ <h:outputText value="#{containerA4JRepeatItem}" rendered="#{containerA4JRepeatItem != 'row 2'}" /></li>
</a4j:repeat>
</ul>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable1.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable1.xhtml 2011-02-22 14:30:05 UTC (rev 21868)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable1.xhtml 2011-02-22 14:30:48 UTC (rev 21869)
@@ -27,15 +27,15 @@
<ui:composition>
- <h:dataTable value="#{templateBean.dataTableModel}" var="item" id="containerHDataTable1">
+ <h:dataTable value="#{templateBean.dataTableModel}" var="containerHDataTableItem" id="containerHDataTable1">
<h:column>
<f:facet name="header">
<h:outputText value="JSF Data Table" />
</f:facet>
- <h:panelGroup columns="1" rendered="#{item == 'row 1'}">
+ <h:panelGroup columns="1" rendered="#{containerHDataTableItem == 'row 1'}">
<ui:decorate template="#{templateBean.nextTemplate}.xhtml" />
</h:panelGroup>
- <h:outputText value="#{item}" rendered="#{item != 'row 1'}" />
+ <h:outputText value="#{containerHDataTableItem}" rendered="#{containerHDataTableItem != 'row 1'}" />
</h:column>
</h:dataTable>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable2.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable2.xhtml 2011-02-22 14:30:05 UTC (rev 21868)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable2.xhtml 2011-02-22 14:30:48 UTC (rev 21869)
@@ -27,15 +27,15 @@
<ui:composition>
- <h:dataTable value="#{templateBean.dataTableModel}" var="item" id="containerHDataTable1">
+ <h:dataTable value="#{templateBean.dataTableModel}" var="containerHDataTableItem" id="containerHDataTable1">
<h:column>
<f:facet name="header">
<h:outputText value="JSF Data Table" />
</f:facet>
- <h:panelGroup columns="1" rendered="#{item == 'row 2'}">
+ <h:panelGroup columns="1" rendered="#{containerHDataTableItem == 'row 2'}">
<ui:decorate template="#{templateBean.nextTemplate}.xhtml" />
</h:panelGroup>
- <h:outputText value="#{item}" rendered="#{item != 'row 2'}" />
+ <h:outputText value="#{containerHDataTableItem}" rendered="#{containerHDataTableItem != 'row 2'}" />
</h:column>
</h:dataTable>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable1.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable1.xhtml 2011-02-22 14:30:05 UTC (rev 21868)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable1.xhtml 2011-02-22 14:30:48 UTC (rev 21869)
@@ -27,15 +27,15 @@
<ui:composition>
- <rich:dataTable value="#{templateBean.dataTableModel}" var="item" id="containerRichDataTable1" rowKeyVar="row">
+ <rich:dataTable value="#{templateBean.dataTableModel}" var="containerRichDataTableItem" id="containerRichDataTable1" rowKeyVar="row">
<rich:column>
<f:facet name="header">
<h:outputText value="Rich Data Table" />
</f:facet>
- <h:panelGroup columns="1" rendered="#{item == 'row 1'}">
+ <h:panelGroup columns="1" rendered="#{containerRichDataTableItem == 'row 1'}">
<ui:decorate template="#{templateBean.nextTemplate}.xhtml" />
</h:panelGroup>
- <h:outputText value="#{item}" rendered="#{item != 'row 1'}" />
+ <h:outputText value="#{containerRichDataTableItem}" rendered="#{containerRichDataTableItem != 'row 1'}" />
</rich:column>
</rich:dataTable>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable2.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable2.xhtml 2011-02-22 14:30:05 UTC (rev 21868)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable2.xhtml 2011-02-22 14:30:48 UTC (rev 21869)
@@ -27,15 +27,15 @@
<ui:composition>
- <rich:dataTable value="#{templateBean.dataTableModel}" var="item" id="containerRichDataTable2" rowKeyVar="row">
+ <rich:dataTable value="#{templateBean.dataTableModel}" var="containerRichDataTableItem" id="containerRichDataTable2" rowKeyVar="row">
<rich:column>
<f:facet name="header">
<h:outputText value="Rich Data Table" />
</f:facet>
- <h:panelGroup columns="1" rendered="#{item == 'row 2'}">
+ <h:panelGroup columns="1" rendered="#{containerRichDataTableItem == 'row 2'}">
<ui:decorate template="#{templateBean.nextTemplate}.xhtml" />
</h:panelGroup>
- <h:outputText value="#{item}" rendered="#{item != 'row 2'}" />
+ <h:outputText value="#{containerRichDataTableItem}" rendered="#{containerRichDataTableItem != 'row 2'}" />
</rich:column>
</rich:dataTable>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat1.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat1.xhtml 2011-02-22 14:30:05 UTC (rev 21868)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat1.xhtml 2011-02-22 14:30:48 UTC (rev 21869)
@@ -28,11 +28,11 @@
<ui:composition>
<ol>
- <ui:repeat value="#{templateBean.dataTableModel}" var="uiRepeatTemplateItem" id="containerUiRepeat1">
- <li><h:panelGroup columns="1" rendered="#{uiRepeatTemplateItem == 'row 1'}">
+ <ui:repeat value="#{templateBean.dataTableModel}" var="containerUiRepeatItem" id="containerUiRepeat1">
+ <li><h:panelGroup columns="1" rendered="#{containerUiRepeatItem == 'row 1'}">
<ui:decorate template="#{templateBean.nextTemplate}.xhtml" />
</h:panelGroup>
- <h:outputText value="#{uiRepeatTemplateItem}" rendered="#{uiRepeatTemplateItem != 'row 1'}" /></li>
+ <h:outputText value="#{containerUiRepeatItem}" rendered="#{containerUiRepeatItem != 'row 1'}" /></li>
</ui:repeat>
</ol>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat2.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat2.xhtml 2011-02-22 14:30:05 UTC (rev 21868)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat2.xhtml 2011-02-22 14:30:48 UTC (rev 21869)
@@ -28,11 +28,11 @@
<ui:composition>
<ol>
- <ui:repeat value="#{templateBean.dataTableModel}" var="uiRepeatTemplateItem" id="containerUiRepeat2">
- <li><h:panelGroup columns="1" rendered="#{uiRepeatTemplateItem == 'row 2'}">
+ <ui:repeat value="#{templateBean.dataTableModel}" var="containerUiRepeatItem" id="containerUiRepeat2">
+ <li><h:panelGroup columns="1" rendered="#{containerUiRepeatItem == 'row 2'}">
<ui:decorate template="#{templateBean.nextTemplate}.xhtml" />
</h:panelGroup>
- <h:outputText value="#{uiRepeatTemplateItem}" rendered="#{uiRepeatTemplateItem != 'row 2'}" /></li>
+ <h:outputText value="#{containerUiRepeatItem}" rendered="#{containerUiRepeatItem != 'row 2'}" /></li>
</ui:repeat>
</ol>
13 years, 2 months
JBoss Rich Faces SVN: r21868 - in modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest: a4jActionListener and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2011-02-22 09:30:05 -0500 (Tue, 22 Feb 2011)
New Revision: 21868
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jActionListener/TestA4JActionListener.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAttachQueue/TestNestedAttachQueue.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jOutputPanel/TestA4JOutputPanel.java
Log:
test fixes + issue tracking
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java 2011-02-22 12:48:54 UTC (rev 21867)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java 2011-02-22 14:30:05 UTC (rev 21868)
@@ -198,8 +198,7 @@
ElementLocator<?> eventInput = pjq("input[id$=on" + attributeName + "Input]");
String value = "metamerEvents += \"" + event.getEventName() + " \"";
- selenium.type(eventInput, value);
- selenium.waitForPageToLoad(TIMEOUT);
+ guardHttp(selenium).type(eventInput, value);
selenium.fireEvent(element, event);
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jActionListener/TestA4JActionListener.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jActionListener/TestA4JActionListener.java 2011-02-22 12:48:54 UTC (rev 21867)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jActionListener/TestA4JActionListener.java 2011-02-22 14:30:05 UTC (rev 21868)
@@ -29,6 +29,7 @@
import org.jboss.test.selenium.locator.JQueryLocator;
import org.jboss.test.selenium.waiting.selenium.SeleniumCondition;
import org.richfaces.tests.metamer.ftest.AbstractMetamerTest;
+import org.richfaces.tests.metamer.ftest.annotations.IssueTracking;
import org.testng.annotations.Test;
/**
@@ -111,6 +112,7 @@
}
@Test
+ @IssueTracking("https://issues.jboss.org/browse/RF-10585")
public void testInvokeListenerMethodCC() {
final String msg = "Method expression listener called from composite component";
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAttachQueue/TestNestedAttachQueue.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAttachQueue/TestNestedAttachQueue.java 2011-02-22 12:48:54 UTC (rev 21867)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAttachQueue/TestNestedAttachQueue.java 2011-02-22 14:30:05 UTC (rev 21868)
@@ -22,10 +22,12 @@
package org.richfaces.tests.metamer.ftest.a4jAttachQueue;
import static org.jboss.test.selenium.utils.URLUtils.buildUrl;
+import static org.testng.Assert.assertFalse;
import java.net.URL;
import org.jboss.cheiron.halt.XHRHalter;
+import org.jboss.test.selenium.encapsulated.JavaScript;
import org.richfaces.tests.metamer.ftest.AbstractMetamerTest;
import org.richfaces.tests.metamer.ftest.a4jQueue.QueueAttributes;
import org.richfaces.tests.metamer.ftest.a4jQueue.QueueModel;
@@ -72,6 +74,7 @@
}
@Test
+ @IssueTracking("https://issues.jboss.org/browse/RFPL-1186")
public void testNoDelay() {
attributesAttachQueue1.setRequestDelay(0);
@@ -96,6 +99,7 @@
}
@Test
+ @IssueTracking("https://issues.jboss.org/browse/RFPL-1186")
public void testTimingOneQueueTwoEvents() {
queue.initializeTimes();
@@ -114,9 +118,10 @@
}
@Test
- @IssueTracking("https://issues.jboss.org/browse/RF-9328")
public void testRendered() {
attributesAttachQueue1.setRequestDelay(1500);
+ attributesAttachQueue1.setOnRequestQueue(JavaScript.js("alert('requestQueued')"));
+ attributesAttachQueue1.setOnRequestDequeue(JavaScript.js("alert('requestDequeued')"));
attributesAttachQueue1.setRendered(false);
queue.initializeTimes();
@@ -124,6 +129,6 @@
// check that no requestDelay is applied while renderer=false
queue.checkTimes(0);
- // TODO should check that no attributes is applied with renderes=false
+ assertFalse(selenium.isAlertPresent());
}
}
\ No newline at end of file
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jOutputPanel/TestA4JOutputPanel.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jOutputPanel/TestA4JOutputPanel.java 2011-02-22 12:48:54 UTC (rev 21867)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jOutputPanel/TestA4JOutputPanel.java 2011-02-22 14:30:05 UTC (rev 21868)
@@ -21,6 +21,7 @@
*******************************************************************************/
package org.richfaces.tests.metamer.ftest.a4jOutputPanel;
+import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guardHttp;
import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guardXhr;
import static org.jboss.test.selenium.locator.LocatorFactory.jq;
import static org.jboss.test.selenium.utils.URLUtils.buildUrl;
@@ -35,6 +36,7 @@
import org.jboss.test.selenium.locator.JQueryLocator;
import org.richfaces.tests.metamer.ftest.AbstractMetamerTest;
import org.richfaces.tests.metamer.ftest.annotations.Inject;
+import org.richfaces.tests.metamer.ftest.annotations.IssueTracking;
import org.richfaces.tests.metamer.ftest.annotations.Use;
import org.richfaces.tests.metamer.ftest.annotations.Uses;
import org.testng.annotations.Test;
@@ -75,8 +77,7 @@
JQueryLocator element = null;
if ("inline".equals(layout)) {
- selenium.click(pjq("input[name$=layoutInput][value=inline]"));
- selenium.waitForPageToLoad(TIMEOUT);
+ guardHttp(selenium).click(pjq("input[name$=layoutInput][value=inline]"));
element = outputSpan;
} else {
element = outputDiv;
@@ -95,12 +96,12 @@
}
@Test
+ @IssueTracking("https://issues.jboss.org/browse/RF-10555")
public void testAjaxRendered() {
JQueryLocator ajaxRenderedInput = pjq("input[type=radio][name$=ajaxRenderedInput][value=false]");
JQueryLocator reRenderAllImage = jq("div.header img[id$=reRenderAllImage]");
- selenium.click(ajaxRenderedInput);
- selenium.waitForPageToLoad(TIMEOUT);
+ guardHttp(selenium).click(ajaxRenderedInput);
selenium.click(increaseCounterButton);
selenium.click(increaseCounterButton);
@@ -131,13 +132,11 @@
assertTrue(selenium.isElementPresent(outputDiv), "Div should be rendered on the beginning.");
assertFalse(selenium.isElementPresent(outputSpan), "Div should be rendered on the beginning.");
- selenium.click(optionInline);
- selenium.waitForPageToLoad(TIMEOUT);
+ guardHttp(selenium).click(optionInline);
assertFalse(selenium.isElementPresent(outputDiv), "Span should be rendered when inline is set.");
assertTrue(selenium.isElementPresent(outputSpan), "Span should be rendered when inline is set.");
- selenium.click(optionBlock);
- selenium.waitForPageToLoad(TIMEOUT);
+ guardHttp(selenium).click(optionBlock);
assertTrue(selenium.isElementPresent(outputDiv), "Div should be rendered when block is set.");
assertFalse(selenium.isElementPresent(outputSpan), "Div should be rendered when block is set.");
@@ -153,8 +152,7 @@
JQueryLocator renderedInputFalse = pjq("input[type=radio][name$=renderedInput][value=false]");
JQueryLocator renderedInputTrue = pjq("input[type=radio][name$=renderedInput][value=true]");
- selenium.click(renderedInputFalse);
- selenium.waitForPageToLoad(TIMEOUT);
+ guardHttp(selenium).click(renderedInputFalse);
assertFalse(selenium.isElementPresent(outputDiv), "Panel should not be rendered.");
String timeValue = selenium.getText(time);
@@ -164,8 +162,7 @@
guardXhr(selenium).click(increaseCounterButton);
waitGui.failWith("Page was not updated").waitForChange(timeValue, retrieveText.locator(time));
- selenium.click(renderedInputTrue);
- selenium.waitForPageToLoad(TIMEOUT);
+ guardHttp(selenium).click(renderedInputTrue);
assertTrue(selenium.isElementPresent(outputDiv), "Panel should be rendered.");
String counter = selenium.getText(outputDiv);
13 years, 2 months
JBoss Rich Faces SVN: r21867 - modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2011-02-22 07:48:54 -0500 (Tue, 22 Feb 2011)
New Revision: 21867
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanel.java
Log:
test for bypassUpdates in tabPanel fixed
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanel.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanel.java 2011-02-22 12:48:17 UTC (rev 21866)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanel.java 2011-02-22 12:48:54 UTC (rev 21867)
@@ -29,8 +29,6 @@
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.assertNotSame;
-import static org.testng.Assert.fail;
import java.net.URL;
@@ -150,7 +148,7 @@
phaseInfo.assertPhases(PhaseId.RESTORE_VIEW, PhaseId.APPLY_REQUEST_VALUES, PhaseId.PROCESS_VALIDATIONS,
PhaseId.RENDER_RESPONSE);
- phaseInfo.assertListener(PhaseId.APPLY_REQUEST_VALUES, "item changed: tab1 -> tab3");
+ phaseInfo.assertListener(PhaseId.PROCESS_VALIDATIONS, "item changed: tab1 -> tab3");
}
@Test
13 years, 2 months
JBoss Rich Faces SVN: r21866 - modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2011-02-22 07:48:17 -0500 (Tue, 22 Feb 2011)
New Revision: 21866
Modified:
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTabPanelBean.java
Log:
added workaround for missing attribute
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTabPanelBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTabPanelBean.java 2011-02-22 12:47:49 UTC (rev 21865)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTabPanelBean.java 2011-02-22 12:48:17 UTC (rev 21866)
@@ -61,6 +61,10 @@
// will be tested in another way
attributes.remove("converter");
attributes.remove("itemChangeListener");
+
+ // remove as soon as https://issues.jboss.org/browse/RF-10588 is fixed
+ attributes.setAttribute("bypassUpdates", null);
+ attributes.get("bypassUpdates").setType(Boolean.class);
}
public Attributes getAttributes() {
13 years, 2 months
JBoss Rich Faces SVN: r21865 - modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSpinner.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2011-02-22 07:47:49 -0500 (Tue, 22 Feb 2011)
New Revision: 21865
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSpinner/TestRichSpinner.java
Log:
added issue tracking info
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSpinner/TestRichSpinner.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSpinner/TestRichSpinner.java 2011-02-22 12:47:19 UTC (rev 21864)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSpinner/TestRichSpinner.java 2011-02-22 12:47:49 UTC (rev 21865)
@@ -318,6 +318,7 @@
}
@Test
+ @IssueTracking("https://issues.jboss.org/browse/RF-10581")
public void testOndownclick() {
testFireEvent(Event.CLICK, down, "downclick");
}
13 years, 2 months
JBoss Rich Faces SVN: r21864 - modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSpinner.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2011-02-22 07:47:19 -0500 (Tue, 22 Feb 2011)
New Revision: 21864
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSpinner/fAjax.xhtml
Log:
event added to f:ajax in spinner sample
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSpinner/fAjax.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSpinner/fAjax.xhtml 2011-02-22 12:46:46 UTC (rev 21863)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSpinner/fAjax.xhtml 2011-02-22 12:47:19 UTC (rev 21864)
@@ -84,7 +84,7 @@
valueChangeListener="#{richBean.valueChangeListener}"
>
- <f:ajax render="output :phasesPanel" />
+ <f:ajax event="change" render="output :phasesPanel" />
</rich:inputNumberSpinner>
13 years, 2 months