Author: ppitonak(a)redhat.com Date: 2011-05-05 10:40:57 -0400 (Thu, 05 May 2011) New Revision: 22470 Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java modules/tests/metamer/trunk/application/src/main/webapp/index.xhtml modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jActionListener/TestA4JActionListener.java Log: index page fixed in order to work in all containers test for a4j:actionListener fixed Property changes on: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean ___________________________________________________________________ Added: svn:ignore + .RichBean.java.swp Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java 2011-05-05 10:40:09 UTC (rev 22469) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java 2011-05-05 14:40:57 UTC (rev 22470) @@ -277,14 +277,26 @@ return richComponents; } + public Object[] getRichComponentsList() { + return richComponents.keySet().toArray(); + } + public Map<String, String> getA4jComponents() { return a4jComponents; } + public Object[] getA4jComponentsList() { + return a4jComponents.keySet().toArray(); + } + public Map<String, String> getOtherComponents() { return otherComponents; } + public Object[] getOtherComponentsList() { + return otherComponents.keySet().toArray(); + } + public String getContainer() { return container; } Modified: modules/tests/metamer/trunk/application/src/main/webapp/index.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/index.xhtml 2011-05-05 10:40:09 UTC (rev 22469) +++ modules/tests/metamer/trunk/application/src/main/webapp/index.xhtml 2011-05-05 14:40:57 UTC (rev 22470) @@ -48,19 +48,19 @@ <rich:tab id="a4jComponentsTab" header="A4J"> <h:panelGrid id="a4jComponents" columns="3" columnClasses="valign-top,valign-top,valign-top"> - <rich:list id="a4jComponentsList1" value="#{richBean.a4jComponents.entrySet().toArray()}" + <rich:list id="a4jComponentsList1" value="#{richBean.a4jComponentsList}" var="entry" rows="30" style="width: 350px"> - <h:link outcome="/components/#{entry.key}/list" value="#{entry.value}" styleClass="link"/> + <h:link outcome="/components/#{entry}/list" value="#{richBean.a4jComponents[entry]}" styleClass="link"/> </rich:list> - <rich:list id="a4jComponentsList2" value="#{richBean.a4jComponents.entrySet().toArray()}" + <rich:list id="a4jComponentsList2" value="#{richBean.a4jComponentsList}" var="entry" first="30" rows="30" style="width: 350px"> - <h:link outcome="/components/#{entry.key}/list" value="#{entry.value}" styleClass="link"/> + <h:link outcome="/components/#{entry}/list" value="#{richBean.a4jComponents[entry]}" styleClass="link"/> </rich:list> - <rich:list id="a4jComponentsList3" value="#{richBean.a4jComponents.entrySet().toArray()}" + <rich:list id="a4jComponentsList3" value="#{richBean.a4jComponentsList}" var="entry" first="60" rows="30" style="width: 350px"> - <h:link outcome="/components/#{entry.key}/list" value="#{entry.value}" styleClass="link"/> + <h:link outcome="/components/#{entry.key}/list" value="#{richBean.a4jComponents[entry]}" styleClass="link"/> </rich:list> </h:panelGrid> </rich:tab> @@ -68,19 +68,19 @@ <rich:tab id="richComponentsTab" header="Rich"> <h:panelGrid id="richComponents" columns="3" columnClasses="valign-top,valign-top,valign-top"> - <rich:list id="richComponentsList1" value="#{richBean.richComponents.entrySet().toArray()}" + <rich:list id="richComponentsList1" value="#{richBean.richComponentsList}" var="entry" rows="30" style="width: 350px"> - <h:link outcome="/components/#{entry.key}/list" value="#{entry.value}" styleClass="link"/> + <h:link outcome="/components/#{entry}/list" value="#{richBean.richComponents[entry]}" styleClass="link"/> </rich:list> - <rich:list id="richComponentsList2" value="#{richBean.richComponents.entrySet().toArray()}" + <rich:list id="richComponentsList2" value="#{richBean.richComponentsList}" var="entry" first="30" rows="30" style="width: 350px"> - <h:link outcome="/components/#{entry.key}/list" value="#{entry.value}" styleClass="link"/> + <h:link outcome="/components/#{entry}/list" value="#{richBean.richComponents[entry]}" styleClass="link"/> </rich:list> - <rich:list id="richComponentsList3" value="#{richBean.richComponents.entrySet().toArray()}" + <rich:list id="richComponentsList3" value="#{richBean.richComponentsList}" var="entry" first="60" rows="30" style="width: 350px"> - <h:link outcome="/components/#{entry.key}/list" value="#{entry.value}" styleClass="link"/> + <h:link outcome="/components/#{entry}/list" value="#{richBean.richComponents[entry]}" styleClass="link"/> </rich:list> </h:panelGrid> </rich:tab> @@ -88,19 +88,19 @@ <rich:tab id="otherComponentsTab" header="Other"> <h:panelGrid id="otherComponents" columns="3" columnClasses="valign-top,valign-top,valign-top"> - <rich:list id="otherComponentsList1" value="#{richBean.otherComponents.entrySet().toArray()}" + <rich:list id="otherComponentsList1" value="#{richBean.otherComponentsList}" var="entry" rows="30" style="width: 350px"> - <h:link outcome="/components/#{entry.key}/list" value="#{entry.value}" styleClass="link"/> + <h:link outcome="/components/#{entry}/list" value="#{richBean.otherComponents[entry]}" styleClass="link"/> </rich:list> - <rich:list id="otherComponentsList2" value="#{richBean.otherComponents.entrySet().toArray()}" + <rich:list id="otherComponentsList2" value="#{richBean.otherComponentsList}" var="entry" first="30" rows="30" style="width: 350px"> - <h:link outcome="/components/#{entry.key}/list" value="#{entry.value}" styleClass="link"/> + <h:link outcome="/components/#{entry}/list" value="#{richBean.otherComponents[entry]}" styleClass="link"/> </rich:list> - <rich:list id="otherComponentsList3" value="#{richBean.otherComponents.entrySet().toArray()}" + <rich:list id="otherComponentsList3" value="#{richBean.otherComponentsList}" var="entry" first="60" rows="30" style="width: 350px"> - <h:link outcome="/components/#{entry.key}/list" value="#{entry.value}" styleClass="link"/> + <h:link outcome="/components/#{entry}/list" value="#{richBean.otherComponents[entry]}" styleClass="link"/> </rich:list> </h:panelGrid> </rich:tab> 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-05-05 10:40:09 UTC (rev 22469) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jActionListener/TestA4JActionListener.java 2011-05-05 14:40:57 UTC (rev 22470) @@ -55,7 +55,7 @@ public void testInvokeListenerByType() { final String hashCodeRegExp = "@[0-9a-fA-F]{1,}$"; final String msg = "Implementation of ActionListener created and called: " - + "org.richfaces.tests.metamer.bean.A4JActionListenerBean$ActionListenerImpl"; + + "org.richfaces.tests.metamer.bean.a4j.A4JActionListenerBean$ActionListenerImpl"; selenium.click(invokeButtonType); waitGui.until(elementPresent.locator(message));