Author: lfryc(a)redhat.com Date: 2011-02-10 08:28:04 -0500 (Thu, 10 Feb 2011) New Revision: 21597 Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenu/simple.xhtml modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenu/TestPanelMenuSimple.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/TestPanelMenuGroupSimple.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuItem/TestPanelMenuItemClientSideHandlers.java Log: rich:panelMenu - tests fixed and added issue tracking (RF-10158, RF-10302, RF-10485, RF-10486) Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenu/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenu/simple.xhtml 2011-02-10 12:54:41 UTC (rev 21596) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenu/simple.xhtml 2011-02-10 13:28:04 UTC (rev 21597) @@ -64,7 +64,7 @@ groupExpandedRightIcon="#{richPanelMenuBean.attributes['groupExpandedRightIcon'].value}" groupMode="#{richPanelMenuBean.attributes['groupMode'].value}" immediate="#{richPanelMenuBean.attributes['immediate'].value}" - itemClass="#{richPanelMenuBean.attributes['topItemClass'].value}" + itemClass="#{richPanelMenuBean.attributes['itemClass'].value}" itemDisabledClass="#{richPanelMenuBean.attributes['itemDisabledClass'].value}" itemDisabledLeftIcon="#{richPanelMenuBean.attributes['itemDisabledLeftIcon'].value}" itemDisabledRightIcon="#{richPanelMenuBean.attributes['itemDisabledRightIcon'].value}" Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenu/TestPanelMenuSimple.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenu/TestPanelMenuSimple.java 2011-02-10 12:54:41 UTC (rev 21596) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenu/TestPanelMenuSimple.java 2011-02-10 13:28:04 UTC (rev 21597) @@ -28,6 +28,7 @@ import org.jboss.test.selenium.css.CssProperty; import org.richfaces.PanelMenuMode; 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.Test; @@ -42,6 +43,7 @@ Boolean expandSingle; @Test + @IssueTracking("https://issues.jboss.org/browse/RF-10158") public void testDisabled() { attributes.setGroupMode(PanelMenuMode.client); attributes.setDisabled(false); @@ -118,8 +120,9 @@ public void testTopItemClass() { super.testStyleClass(item3, "topItemClass"); } - + @Test + @IssueTracking("https://issues.jboss.org/browse/RF-10302") public void testWidth() { attributes.setWidth("300px"); assertEquals(selenium.getStyle(menu, CssProperty.WIDTH), "300px"); Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/TestPanelMenuGroupSimple.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/TestPanelMenuGroupSimple.java 2011-02-10 12:54:41 UTC (rev 21596) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/TestPanelMenuGroupSimple.java 2011-02-10 13:28:04 UTC (rev 21597) @@ -6,6 +6,8 @@ import org.jboss.test.selenium.GuardRequest; import org.jboss.test.selenium.request.RequestType; +import org.richfaces.PanelMenuMode; +import org.richfaces.tests.metamer.ftest.annotations.IssueTracking; import org.testng.annotations.Test; /** @@ -32,6 +34,7 @@ @Test public void testDisabled() { + menu.setGroupMode(null); assertFalse(topGroup.isDisabled()); attributes.setDisabled(true); @@ -152,24 +155,14 @@ @Test public void testSelectable() { - attributes.setSelectable(false); + menu.setGroupMode(PanelMenuMode.ajax); - new GuardRequest(RequestType.XHR) { - public void command() { - topGroup.toggle(); - } - }.waitRequest(); - + attributes.setSelectable(false); + topGroup.toggle(); assertFalse(topGroup.isSelected()); attributes.setSelectable(true); - - new GuardRequest(RequestType.XHR) { - public void command() { - topGroup.toggle(); - } - }.waitRequest(); - + topGroup.toggle(); assertTrue(topGroup.isSelected()); } @@ -183,6 +176,7 @@ } @Test + @IssueTracking("https://issues.jboss.org/browse/RF-10485") public void testStyle() { super.testStyle(topGroup, "style"); } Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuItem/TestPanelMenuItemClientSideHandlers.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuItem/TestPanelMenuItemClientSideHandlers.java 2011-02-10 12:54:41 UTC (rev 21596) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuItem/TestPanelMenuItemClientSideHandlers.java 2011-02-10 13:28:04 UTC (rev 21597) @@ -28,10 +28,9 @@ import java.net.URL; -import org.jboss.test.selenium.GuardRequest; -import org.jboss.test.selenium.request.RequestType; 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.model.PanelMenu; import org.testng.annotations.Test; @@ -59,6 +58,7 @@ } @Test + @IssueTracking("https://issues.jboss.org/browse/RF-10486") @Use(field = "event", value = "ajaxEvents") public void testClientSideEvent() { attributes.setMode(ajax); @@ -69,6 +69,7 @@ } @Test + @IssueTracking("https://issues.jboss.org/browse/RF-10486") public void testClientSideEventsOrderClient() { attributes.setMode(client); menu.setItemMode(client); @@ -78,6 +79,7 @@ } @Test + @IssueTracking("https://issues.jboss.org/browse/RF-10486") public void testClientSideEventsOrderAjax() { attributes.setMode(ajax); menu.setItemMode(ajax);