JBoss Rich Faces SVN: r22661 - modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCalendar.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2011-08-18 10:38:05 -0400 (Thu, 18 Aug 2011)
New Revision: 22661
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCalendar/TestRichCalendarModel.java
Log:
tests for rich:calendar model put to group 4.2
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCalendar/TestRichCalendarModel.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCalendar/TestRichCalendarModel.java 2011-08-18 14:13:15 UTC (rev 22660)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCalendar/TestRichCalendarModel.java 2011-08-18 14:38:05 UTC (rev 22661)
@@ -47,7 +47,7 @@
return buildUrl(contextPath, "faces/components/richCalendar/dataModel.xhtml");
}
- @Test(groups = "4.0.0.Final")
+ @Test(groups = { "4.0.0.Final", "4.2" })
@IssueTracking("https://issues.jboss.org/browse/RFPL-1222")
public void testClasses() {
selenium.click(input);
@@ -59,22 +59,27 @@
switch (i % 7) {
case 0:
case 6:
- assertTrue(selenium.belongsClass(cellDay.format(i), "yellowDay"), "Weekends should be yellow (cell " + i + ")");
+ assertTrue(selenium.belongsClass(cellDay.format(i), "yellowDay"),
+ "Weekends should be yellow (cell " + i + ")");
break;
case 2:
- assertTrue(selenium.belongsClass(cellDay.format(i), "aquaDay"), "Tuesdays should be blue (cell " + i + ")");
+ assertTrue(selenium.belongsClass(cellDay.format(i), "aquaDay"), "Tuesdays should be blue (cell "
+ + i + ")");
break;
case 4:
- assertTrue(selenium.belongsClass(cellDay.format(i), "aquaDay"), "Thursdays should be blue (cell " + i + ")");
+ assertTrue(selenium.belongsClass(cellDay.format(i), "aquaDay"), "Thursdays should be blue (cell "
+ + i + ")");
break;
default:
- assertFalse(selenium.belongsClass(cellDay.format(i), "aquaDay"), "Mondays, Wednesdays and Fridays should not be styled (cell " + i + ")");
- assertFalse(selenium.belongsClass(cellDay.format(i), "yellowDay"), "Mondays, Wednesdays and Fridays should not be styled (cell " + i + ")");
+ assertFalse(selenium.belongsClass(cellDay.format(i), "aquaDay"),
+ "Mondays, Wednesdays and Fridays should not be styled (cell " + i + ")");
+ assertFalse(selenium.belongsClass(cellDay.format(i), "yellowDay"),
+ "Mondays, Wednesdays and Fridays should not be styled (cell " + i + ")");
}
}
}
- @Test(groups = "4.0.0.Final")
+ @Test(groups = { "4.0.0.Final", "4.2" })
@Override
@IssueTracking("https://issues.jboss.org/browse/RFPL-1222")
public void testApplyButton() {
12 years, 8 months
JBoss Rich Faces SVN: r22660 - modules/tests/metamer/trunk/ftest/src/test/resources.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2011-08-18 10:13:15 -0400 (Thu, 18 Aug 2011)
New Revision: 22660
Added:
modules/tests/metamer/trunk/ftest/src/test/resources/testng-4_2.xml
modules/tests/metamer/trunk/ftest/src/test/resources/testng-dnd.xml
modules/tests/metamer/trunk/ftest/src/test/resources/testng-future.xml
modules/tests/metamer/trunk/ftest/src/test/resources/testng-treemodel.xml
Modified:
modules/tests/metamer/trunk/ftest/src/test/resources/testng-core.xml
modules/tests/metamer/trunk/ftest/src/test/resources/testng-input.xml
modules/tests/metamer/trunk/ftest/src/test/resources/testng-misc.xml
modules/tests/metamer/trunk/ftest/src/test/resources/testng-output.xml
modules/tests/metamer/trunk/ftest/src/test/resources/testng-switchable.xml
modules/tests/metamer/trunk/ftest/src/test/resources/testng-tables.xml
modules/tests/metamer/trunk/ftest/src/test/resources/testng-trees.xml
modules/tests/metamer/trunk/ftest/src/test/resources/testng.xml
Log:
TestNG descriptors updated
Added: modules/tests/metamer/trunk/ftest/src/test/resources/testng-4_2.xml
===================================================================
--- modules/tests/metamer/trunk/ftest/src/test/resources/testng-4_2.xml (rev 0)
+++ modules/tests/metamer/trunk/ftest/src/test/resources/testng-4_2.xml 2011-08-18 14:13:15 UTC (rev 22660)
@@ -0,0 +1,15 @@
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="seleniumTest">
+
+ <test name="All Components">
+ <groups>
+ <run>
+ <include name="4.2" />
+ </run>
+ </groups>
+
+ <packages>
+ <package name="org.richfaces.tests.metamer.ftest.*" />
+ </packages>
+ </test>
+</suite>
Modified: modules/tests/metamer/trunk/ftest/src/test/resources/testng-core.xml
===================================================================
--- modules/tests/metamer/trunk/ftest/src/test/resources/testng-core.xml 2011-08-18 14:12:04 UTC (rev 22659)
+++ modules/tests/metamer/trunk/ftest/src/test/resources/testng-core.xml 2011-08-18 14:13:15 UTC (rev 22660)
@@ -2,12 +2,13 @@
<suite name="seleniumTest">
<test name="Core Components">
- <groups>
- <run>
- <exclude name="4.Future" />
- </run>
- </groups>
-
+ <groups>
+ <run>
+ <exclude name="4.2" />
+ <exclude name="4.Future" />
+ </run>
+ </groups>
+
<packages>
<package name="org.richfaces.tests.metamer.ftest.a4jActionListener" />
<package name="org.richfaces.tests.metamer.ftest.a4jAjax" />
Added: modules/tests/metamer/trunk/ftest/src/test/resources/testng-dnd.xml
===================================================================
--- modules/tests/metamer/trunk/ftest/src/test/resources/testng-dnd.xml (rev 0)
+++ modules/tests/metamer/trunk/ftest/src/test/resources/testng-dnd.xml 2011-08-18 14:13:15 UTC (rev 22660)
@@ -0,0 +1,20 @@
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="seleniumTest">
+
+ <test name="Miscellaneous Components">
+ <groups>
+ <run>
+ <exclude name="4.2" />
+ <exclude name="4.Future" />
+ </run>
+ </groups>
+
+ <packages>
+ <package name="org.richfaces.tests.metamer.ftest.richDragIndicator" />
+ <package name="org.richfaces.tests.metamer.ftest.richDragSource" />
+ <package name="org.richfaces.tests.metamer.ftest.richDropTarget" />
+ </packages>
+ </test>
+
+</suite>
+
Added: modules/tests/metamer/trunk/ftest/src/test/resources/testng-future.xml
===================================================================
--- modules/tests/metamer/trunk/ftest/src/test/resources/testng-future.xml (rev 0)
+++ modules/tests/metamer/trunk/ftest/src/test/resources/testng-future.xml 2011-08-18 14:13:15 UTC (rev 22660)
@@ -0,0 +1,15 @@
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="seleniumTest">
+
+ <test name="All Components">
+ <groups>
+ <run>
+ <include name="4.Future" />
+ </run>
+ </groups>
+
+ <packages>
+ <package name="org.richfaces.tests.metamer.ftest.*" />
+ </packages>
+ </test>
+</suite>
Modified: modules/tests/metamer/trunk/ftest/src/test/resources/testng-input.xml
===================================================================
--- modules/tests/metamer/trunk/ftest/src/test/resources/testng-input.xml 2011-08-18 14:12:04 UTC (rev 22659)
+++ modules/tests/metamer/trunk/ftest/src/test/resources/testng-input.xml 2011-08-18 14:13:15 UTC (rev 22660)
@@ -2,19 +2,24 @@
<suite name="seleniumTest">
<test name="Input Components">
- <groups>
- <run>
- <exclude name="4.Future" />
- </run>
- </groups>
-
+ <groups>
+ <run>
+ <exclude name="4.2" />
+ <exclude name="4.Future" />
+ </run>
+ </groups>
+
<packages>
<package name="org.richfaces.tests.metamer.ftest.richAutocomplete" />
<package name="org.richfaces.tests.metamer.ftest.richCalendar" />
+ <package name="org.richfaces.tests.metamer.ftest.richEditor" />
+ <package name="org.richfaces.tests.metamer.ftest.richFileUpload" />
<package name="org.richfaces.tests.metamer.ftest.richInplaceInput" />
<package name="org.richfaces.tests.metamer.ftest.richInplaceSelect" />
<package name="org.richfaces.tests.metamer.ftest.richInputNumberSlider" />
<package name="org.richfaces.tests.metamer.ftest.richInputNumberSpinner" />
+ <package name="org.richfaces.tests.metamer.ftest.richOrderingList" />
+ <package name="org.richfaces.tests.metamer.ftest.richPickList" />
<package name="org.richfaces.tests.metamer.ftest.richSelect" />
</packages>
</test>
Modified: modules/tests/metamer/trunk/ftest/src/test/resources/testng-misc.xml
===================================================================
--- modules/tests/metamer/trunk/ftest/src/test/resources/testng-misc.xml 2011-08-18 14:12:04 UTC (rev 22659)
+++ modules/tests/metamer/trunk/ftest/src/test/resources/testng-misc.xml 2011-08-18 14:13:15 UTC (rev 22660)
@@ -2,25 +2,29 @@
<suite name="seleniumTest">
<test name="Miscellaneous Components">
- <groups>
- <run>
- <exclude name="4.Future" />
- </run>
- </groups>
-
+ <groups>
+ <run>
+ <exclude name="4.2" />
+ <exclude name="4.Future" />
+ </run>
+ </groups>
+
<packages>
<package name="org.richfaces.tests.metamer.ftest.hCommandButton" />
<package name="org.richfaces.tests.metamer.ftest.richComponentControl" />
<package name="org.richfaces.tests.metamer.ftest.richDropDownMenu" />
<package name="org.richfaces.tests.metamer.ftest.richFunctions" />
<package name="org.richfaces.tests.metamer.ftest.richGraphValidator" />
+ <package name="org.richfaces.tests.metamer.ftest.richHashParam" />
<package name="org.richfaces.tests.metamer.ftest.richJQuery" />
<package name="org.richfaces.tests.metamer.ftest.richMenuGroup" />
<package name="org.richfaces.tests.metamer.ftest.richMenuItem" />
<package name="org.richfaces.tests.metamer.ftest.richMenuSeparator" />
- <package name="org.richfaces.tests.metamer.ftest.richToggleControl" />
<package name="org.richfaces.tests.metamer.ftest.richMessage" />
<package name="org.richfaces.tests.metamer.ftest.richMessages" />
+ <package name="org.richfaces.tests.metamer.ftest.richNotify" />
+ <package name="org.richfaces.tests.metamer.ftest.richToggleControl" />
+ <package name="org.richfaces.tests.metamer.ftest.richValidator" />
</packages>
</test>
Modified: modules/tests/metamer/trunk/ftest/src/test/resources/testng-output.xml
===================================================================
--- modules/tests/metamer/trunk/ftest/src/test/resources/testng-output.xml 2011-08-18 14:12:04 UTC (rev 22659)
+++ modules/tests/metamer/trunk/ftest/src/test/resources/testng-output.xml 2011-08-18 14:13:15 UTC (rev 22660)
@@ -2,17 +2,19 @@
<suite name="seleniumTest">
<test name="Output Components">
- <groups>
- <run>
- <exclude name="4.Future" />
- </run>
- </groups>
-
- <classes>
+ <groups>
+ <run>
+ <exclude name="4.2" />
+ <exclude name="4.Future" />
+ </run>
+ </groups>
+
+ <classes>
<class name="org.richfaces.tests.metamer.ftest.richPanel.TestRichPanel" />
</classes>
-
+
<packages>
+ <package name="org.richfaces.tests.metamer.ftest.richPanel" />
<package name="org.richfaces.tests.metamer.ftest.richPopupPanel" />
<package name="org.richfaces.tests.metamer.ftest.richProgressBar" />
<package name="org.richfaces.tests.metamer.ftest.richToolbar" />
Modified: modules/tests/metamer/trunk/ftest/src/test/resources/testng-switchable.xml
===================================================================
--- modules/tests/metamer/trunk/ftest/src/test/resources/testng-switchable.xml 2011-08-18 14:12:04 UTC (rev 22659)
+++ modules/tests/metamer/trunk/ftest/src/test/resources/testng-switchable.xml 2011-08-18 14:13:15 UTC (rev 22660)
@@ -2,23 +2,24 @@
<suite name="seleniumTest">
<test name="Switchable Components">
- <groups>
- <run>
- <exclude name="4.Future" />
- </run>
- </groups>
-
+ <groups>
+ <run>
+ <exclude name="4.2" />
+ <exclude name="4.Future" />
+ </run>
+ </groups>
+
<packages>
<package name="org.richfaces.tests.metamer.ftest.richAccordion" />
<package name="org.richfaces.tests.metamer.ftest.richAccordionItem" />
<package name="org.richfaces.tests.metamer.ftest.richCollapsiblePanel" />
+ <package name="org.richfaces.tests.metamer.ftest.richPanelMenu" />
+ <package name="org.richfaces.tests.metamer.ftest.richPanelMenuGroup" />
+ <package name="org.richfaces.tests.metamer.ftest.richPanelMenuItem" />
<package name="org.richfaces.tests.metamer.ftest.richTab" />
<package name="org.richfaces.tests.metamer.ftest.richTabPanel" />
<package name="org.richfaces.tests.metamer.ftest.richTogglePanel" />
<package name="org.richfaces.tests.metamer.ftest.richTogglePanelItem" />
- <package name="org.richfaces.tests.metamer.ftest.richPanelMenu" />
- <package name="org.richfaces.tests.metamer.ftest.richPanelMenuGroup" />
- <package name="org.richfaces.tests.metamer.ftest.richPanelMenuItem" />
</packages>
</test>
Modified: modules/tests/metamer/trunk/ftest/src/test/resources/testng-tables.xml
===================================================================
--- modules/tests/metamer/trunk/ftest/src/test/resources/testng-tables.xml 2011-08-18 14:12:04 UTC (rev 22659)
+++ modules/tests/metamer/trunk/ftest/src/test/resources/testng-tables.xml 2011-08-18 14:13:15 UTC (rev 22660)
@@ -2,21 +2,23 @@
<suite name="seleniumTest">
<test name="Table Components">
- <groups>
- <run>
- <exclude name="4.Future" />
- </run>
- </groups>
-
+ <groups>
+ <run>
+ <exclude name="4.2" />
+ <exclude name="4.Future" />
+ </run>
+ </groups>
+
<packages>
<package name="org.richfaces.tests.metamer.ftest.richCollapsibleSubTable" />
<package name="org.richfaces.tests.metamer.ftest.richCollapsibleSubTableToggler" />
<package name="org.richfaces.tests.metamer.ftest.richColumn" />
<package name="org.richfaces.tests.metamer.ftest.richColumnGroup" />
<package name="org.richfaces.tests.metamer.ftest.richDataGrid" />
+ <package name="org.richfaces.tests.metamer.ftest.richDataScroller" />
<package name="org.richfaces.tests.metamer.ftest.richDataTable" />
- <package name="org.richfaces.tests.metamer.ftest.richDataScroller" />
<package name="org.richfaces.tests.metamer.ftest.richExtendedDataTable" />
+ <package name="org.richfaces.tests.metamer.ftest.richList" />
</packages>
</test>
Added: modules/tests/metamer/trunk/ftest/src/test/resources/testng-treemodel.xml
===================================================================
--- modules/tests/metamer/trunk/ftest/src/test/resources/testng-treemodel.xml (rev 0)
+++ modules/tests/metamer/trunk/ftest/src/test/resources/testng-treemodel.xml 2011-08-18 14:13:15 UTC (rev 22660)
@@ -0,0 +1,18 @@
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="seleniumTest">
+
+ <test name="Tree Components">
+ <groups>
+ <run>
+ <exclude name="4.2" />
+ <exclude name="4.Future" />
+ </run>
+ </groups>
+
+ <packages>
+ <package name="org.richfaces.tests.metamer.ftest.richTreeModelAdaptor" />
+ </packages>
+ </test>
+
+</suite>
+
Modified: modules/tests/metamer/trunk/ftest/src/test/resources/testng-trees.xml
===================================================================
--- modules/tests/metamer/trunk/ftest/src/test/resources/testng-trees.xml 2011-08-18 14:12:04 UTC (rev 22659)
+++ modules/tests/metamer/trunk/ftest/src/test/resources/testng-trees.xml 2011-08-18 14:13:15 UTC (rev 22660)
@@ -2,16 +2,16 @@
<suite name="seleniumTest">
<test name="Tree Components">
- <groups>
- <run>
- <exclude name="4.Future" />
- </run>
- </groups>
-
+ <groups>
+ <run>
+ <exclude name="4.2" />
+ <exclude name="4.Future" />
+ </run>
+ </groups>
+
<packages>
<package name="org.richfaces.tests.metamer.ftest.richTree" />
<package name="org.richfaces.tests.metamer.ftest.richTreeNode" />
- <package name="org.richfaces.tests.metamer.ftest.richTreeModelAdaptor" />
</packages>
</test>
Modified: modules/tests/metamer/trunk/ftest/src/test/resources/testng.xml
===================================================================
--- modules/tests/metamer/trunk/ftest/src/test/resources/testng.xml 2011-08-18 14:12:04 UTC (rev 22659)
+++ modules/tests/metamer/trunk/ftest/src/test/resources/testng.xml 2011-08-18 14:13:15 UTC (rev 22660)
@@ -1,77 +1,16 @@
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
<suite name="seleniumTest">
- <test name="All Components">
- <groups>
- <run>
- <exclude name="4.Future" />
- </run>
- </groups>
+ <test name="All Components">
+ <groups>
+ <run>
+ <exclude name="4.2" />
+ <exclude name="4.Future" />
+ </run>
+ </groups>
- <packages>
- <package name="org.richfaces.tests.metamer.ftest.a4jActionListener" />
- <package name="org.richfaces.tests.metamer.ftest.a4jAjax" />
- <package name="org.richfaces.tests.metamer.ftest.a4jAttachQueue" />
- <package name="org.richfaces.tests.metamer.ftest.a4jCommandButton" />
- <package name="org.richfaces.tests.metamer.ftest.a4jCommandLink" />
- <package name="org.richfaces.tests.metamer.ftest.a4jJSFunction" />
- <package name="org.richfaces.tests.metamer.ftest.a4jLog" />
- <package name="org.richfaces.tests.metamer.ftest.a4jMediaOutput" />
- <package name="org.richfaces.tests.metamer.ftest.a4jOutputPanel" />
- <package name="org.richfaces.tests.metamer.ftest.a4jParam" />
- <package name="org.richfaces.tests.metamer.ftest.a4jPoll" />
- <package name="org.richfaces.tests.metamer.ftest.a4jQueue" />
- <package name="org.richfaces.tests.metamer.ftest.a4jRegion" />
- <package name="org.richfaces.tests.metamer.ftest.a4jRepeat" />
- <package name="org.richfaces.tests.metamer.ftest.a4jStatus" />
- <package name="org.richfaces.tests.metamer.ftest.richAutocomplete" />
- <package name="org.richfaces.tests.metamer.ftest.richCalendar" />
- <package name="org.richfaces.tests.metamer.ftest.richInplaceInput" />
- <package name="org.richfaces.tests.metamer.ftest.richInplaceSelect" />
- <package name="org.richfaces.tests.metamer.ftest.richInputNumberSlider" />
- <package name="org.richfaces.tests.metamer.ftest.richInputNumberSpinner" />
- <package name="org.richfaces.tests.metamer.ftest.richSelect" />
- <package name="org.richfaces.tests.metamer.ftest.richCollapsibleSubTable" />
- <package name="org.richfaces.tests.metamer.ftest.richCollapsibleSubTableToggler" />
- <package name="org.richfaces.tests.metamer.ftest.richColumn" />
- <package name="org.richfaces.tests.metamer.ftest.richColumnGroup" />
- <package name="org.richfaces.tests.metamer.ftest.richDataGrid" />
- <package name="org.richfaces.tests.metamer.ftest.richDataTable" />
- <package name="org.richfaces.tests.metamer.ftest.richDataScroller" />
- <package name="org.richfaces.tests.metamer.ftest.richExtendedDataTable" />
- <package name="org.richfaces.tests.metamer.ftest.richTree" />
- <package name="org.richfaces.tests.metamer.ftest.richTreeNode" />
- <package name="org.richfaces.tests.metamer.ftest.richTreeModelAdaptor" />
- <package name="org.richfaces.tests.metamer.ftest.hCommandButton" />
- <package name="org.richfaces.tests.metamer.ftest.richComponentControl" />
- <package name="org.richfaces.tests.metamer.ftest.richDropDownMenu" />
- <package name="org.richfaces.tests.metamer.ftest.richFunctions" />
- <package name="org.richfaces.tests.metamer.ftest.richGraphValidator" />
- <package name="org.richfaces.tests.metamer.ftest.richJQuery" />
- <package name="org.richfaces.tests.metamer.ftest.richMenuGroup" />
- <package name="org.richfaces.tests.metamer.ftest.richMenuItem" />
- <package name="org.richfaces.tests.metamer.ftest.richMenuSeparator" />
- <package name="org.richfaces.tests.metamer.ftest.richMessage"/>
- <package name="org.richfaces.tests.metamer.ftest.richMessages"/>
- <package name="org.richfaces.tests.metamer.ftest.richToggleControl" />
- <package name="org.richfaces.tests.metamer.ftest.richAccordion" />
- <package name="org.richfaces.tests.metamer.ftest.richAccordionItem" />
- <package name="org.richfaces.tests.metamer.ftest.richCollapsiblePanel" />
- <package name="org.richfaces.tests.metamer.ftest.richPanel" />
- <package name="org.richfaces.tests.metamer.ftest.richPopupPanel" />
- <package name="org.richfaces.tests.metamer.ftest.richProgressBar" />
- <package name="org.richfaces.tests.metamer.ftest.richTab" />
- <package name="org.richfaces.tests.metamer.ftest.richTabPanel" />
- <package name="org.richfaces.tests.metamer.ftest.richTogglePanel" />
- <package name="org.richfaces.tests.metamer.ftest.richTogglePanelItem" />
- <package name="org.richfaces.tests.metamer.ftest.richToolbar" />
- <package name="org.richfaces.tests.metamer.ftest.richToolbarGroup" />
- <package name="org.richfaces.tests.metamer.ftest.richTooltip" />
- <package name="org.richfaces.tests.metamer.ftest.richPanelMenu" />
- <package name="org.richfaces.tests.metamer.ftest.richPanelMenuGroup" />
- <package name="org.richfaces.tests.metamer.ftest.richPanelMenuItem" />
- </packages>
- </test>
-
+ <packages>
+ <package name="org.richfaces.tests.metamer.ftest.*" />
+ </packages>
+ </test>
</suite>
-
12 years, 8 months
JBoss Rich Faces SVN: r22659 - modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richList.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2011-08-18 10:12:04 -0400 (Thu, 18 Aug 2011)
New Revision: 22659
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richList/TestSimple.java
Log:
test for rich:list fixed
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richList/TestSimple.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richList/TestSimple.java 2011-08-18 13:14:25 UTC (rev 22658)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richList/TestSimple.java 2011-08-18 14:12:04 UTC (rev 22659)
@@ -78,26 +78,26 @@
}
@Test
- @Use(field = "event", value = "events")
+ @Use(field = "event", value = "EVENTS")
public void testEvent() {
testFireEvent(event, list.getRoot());
}
@Test
- @Use(field = "event", value = "events")
+ @Use(field = "event", value = "EVENTS")
public void testRowEvent() {
testFireEvent(event, list.getRow(1), "row" + event.getEventName());
testFireEvent(event, list.getRow(rows), "row" + event.getEventName());
}
@Test
- @Use(field = "first", value = "ints")
+ @Use(field = "first", value = "INTS")
public void testFirstAttribute() {
verifyList();
}
@Test
- @Use(field = "rows", value = "ints")
+ @Use(field = "rows", value = "INTS")
public void testRowsAttribute() {
verifyList();
}
12 years, 8 months
JBoss Rich Faces SVN: r22658 - in modules/tests/metamer/trunk: ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPickList and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: jjamrich
Date: 2011-08-18 09:14:25 -0400 (Thu, 18 Aug 2011)
New Revision: 22658
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/richPickList/simple.xhtml
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPickList/RichPickListComponentAttribute.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPickList/TestPickList.java
Log:
Merge branch 'rfpl-1603'
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richPickList/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richPickList/simple.xhtml 2011-08-18 12:23:51 UTC (rev 22657)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richPickList/simple.xhtml 2011-08-18 13:14:25 UTC (rev 22658)
@@ -98,6 +98,7 @@
ontargetmouseout="#{richPickListBean.attributes['ontargetmouseout'].value}"
ontargetmouseover="#{richPickListBean.attributes['ontargetmouseover'].value}"
ontargetmouseup="#{richPickListBean.attributes['ontargetmouseup'].value}"
+ orderable="#{richPickListBean.attributes['orderable'].value}"
removeAllText="#{richPickListBean.attributes['removeAllText'].value}"
removeText="#{richPickListBean.attributes['removeText'].value}"
rendered="#{richPickListBean.attributes['rendered'].value}"
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPickList/RichPickListComponentAttribute.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPickList/RichPickListComponentAttribute.java 2011-08-18 12:23:51 UTC (rev 22657)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPickList/RichPickListComponentAttribute.java 2011-08-18 13:14:25 UTC (rev 22658)
@@ -267,6 +267,10 @@
public void setOntargetmouseup(String ontargetmouseup) {
setProperty("ontargetmouseup", ontargetmouseup);
}
+
+ public void setOrderable(Boolean orderable) {
+ setProperty("orderable", orderable);
+ }
public void setRemoveAllText(String removeAllText) {
setProperty("removeAllText", removeAllText);
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPickList/TestPickList.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPickList/TestPickList.java 2011-08-18 12:23:51 UTC (rev 22657)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPickList/TestPickList.java 2011-08-18 13:14:25 UTC (rev 22658)
@@ -60,6 +60,9 @@
private JQueryLocator sourceCaptionLocator = pjq("div[id$=pickListSource] div.rf-pick-source-caption");
private JQueryLocator pickListCtrl = pjq("div.rf-pick-lst-scrl");
+ private JQueryLocator pickListOrderingControlsContainer = pjq("table[id$=pickListTarget] td:eq(1)");
+ private JQueryLocator pickListOrderingCtrlFormat =
+ pickListOrderingControlsContainer.getDescendant(jq("tr td button:contains({0})"));
private JQueryLocator pickListSrcItems = pjq("div[id$=pickListSourceItems]");
private JQueryLocator pickListSrcItem = pickListSrcItems.getChild(jq("div[id$=pickListItem{0}]"));
@@ -86,6 +89,7 @@
private String STYLE_CLASS_ITEM_DISABLED = "rf-pick-opt-dis";
private String STYLE_CLASS_BTN_DISABLED = "rf-pick-btn-dis";
private String STYLE_CLASS_ITEM_SELECTED = "rf-pick-sel";
+ private String STYLE_CLASS_ORD_BTN_DISABLED = "rf-ord-btn-dis";
private String phaseListenerLogFormat = "*3 value changed: {0} -> {1}";
@@ -124,6 +128,11 @@
selenium.click(removeAllBtn);
}
+ private String getOrderBtnClass(String label) {
+ return selenium.getAttribute(
+ pickListOrderingCtrlFormat.format(label).getAttribute(classAttr));
+ }
+
@Test
public void testAddAllText() {
String label = "xxx";
@@ -137,7 +146,7 @@
attributes.setAddText(label);
assertTrue(label.equals(selenium.getText(addBtn)));
}
-
+
// @Test
public void testColumnClasses() {
// TODO JJa 2011-08-05: ask Brian about this attr:
@@ -493,6 +502,74 @@
public void testOntargetmouseup() {
testFireEvent(new Event("targetmouseup"), pickListTop);
}
+
+ @Test
+ public void testOrderable() {
+
+ // firstly check ordering controls doesn't appear near pickList if not "orderable"
+ attributes.setOrderable(Boolean.FALSE);
+ assertFalse(selenium.isElementPresent(pickListOrderingControlsContainer));
+
+ // then make sure that controls appear near pickList when allow ordering behavior
+ attributes.setOrderable(Boolean.TRUE);
+ assertTrue(selenium.isElementPresent(pickListOrderingControlsContainer));
+
+ // then add some items to target list
+ addItem("Alaska");
+ addItem("California");
+ addItem("Delaware");
+
+ // all items should remain selected and in this case ordering controls should be disabled
+ String classAttrVal = selenium.getAttribute(
+ pickListTrgtItemStageByText.format("Alaska").getAttribute(classAttr));
+
+ assertTrue(classAttrVal != null);
+ assertTrue(classAttrVal.contains(STYLE_CLASS_ITEM_SELECTED));
+
+ classAttrVal = selenium.getAttribute(
+ pickListTrgtItemStageByText.format("California").getAttribute(classAttr));
+
+ assertTrue(classAttrVal != null);
+ assertTrue(classAttrVal.contains(STYLE_CLASS_ITEM_SELECTED));
+
+ classAttrVal = selenium.getAttribute(
+ pickListTrgtItemStageByText.format("Delaware").getAttribute(classAttr));
+
+ assertTrue(classAttrVal != null);
+ assertTrue(classAttrVal.contains(STYLE_CLASS_ITEM_SELECTED));
+
+ // so check ordering controls if they are disabled
+ assertTrue(getOrderBtnClass("First").contains(STYLE_CLASS_ORD_BTN_DISABLED));
+ assertTrue(getOrderBtnClass("Up").contains(STYLE_CLASS_ORD_BTN_DISABLED));
+ assertTrue(getOrderBtnClass("Down").contains(STYLE_CLASS_ORD_BTN_DISABLED));
+ assertTrue(getOrderBtnClass("Last").contains(STYLE_CLASS_ORD_BTN_DISABLED));
+
+ // now is time to select one item. This should cause ordering controls enable
+ selenium.click(pickListTrgtItemStageByText.format("Alaska"));
+
+ // since it was first item, "Down" and "Last" buttons should be enabled
+ assertTrue(getOrderBtnClass("First").contains(STYLE_CLASS_ORD_BTN_DISABLED));
+ assertTrue(getOrderBtnClass("Up").contains(STYLE_CLASS_ORD_BTN_DISABLED));
+ assertFalse(getOrderBtnClass("Down").contains(STYLE_CLASS_ORD_BTN_DISABLED));
+ assertFalse(getOrderBtnClass("Last").contains(STYLE_CLASS_ORD_BTN_DISABLED));
+
+ // move "Alaska" to last
+ selenium.click(pickListOrderingCtrlFormat.format("Last"));
+
+ // verify that "Alaska" is last item (select 3rd item, and verify text)
+ assertTrue("Alaska".equals(
+ selenium.getText(pickListTrgtItemsStage.getChild(jq("div.rf-pick-opt:eq(2)")))));
+
+ // then move "Alaska" one step "up"
+ selenium.click(pickListOrderingCtrlFormat.format("Up"));
+ assertTrue("Alaska".equals(
+ selenium.getText(pickListTrgtItemsStage.getChild(jq("div.rf-pick-opt:eq(1)")))));
+
+ // and then verify if all items are submitted in user defined order as well
+ selenium.click(a4jSubmit);
+ waitModel.until(textEquals.locator(output).text("[California, Alaska, Delaware]"));
+
+ }
@Test
public void testRemoveAllText() {
12 years, 8 months
JBoss Rich Faces SVN: r22656 - modules/tests/metamer/trunk/application/src/main/webapp/WEB-INF.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2011-08-18 05:23:42 -0400 (Thu, 18 Aug 2011)
New Revision: 22656
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/WEB-INF/web.xml
Log:
Metamer switched from development mode to production because of a bug in Mojarra 2.1
Modified: modules/tests/metamer/trunk/application/src/main/webapp/WEB-INF/web.xml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/WEB-INF/web.xml 2011-08-18 07:43:16 UTC (rev 22655)
+++ modules/tests/metamer/trunk/application/src/main/webapp/WEB-INF/web.xml 2011-08-18 09:23:42 UTC (rev 22656)
@@ -8,10 +8,11 @@
<welcome-file>faces/index.xhtml</welcome-file>
</welcome-file-list>
- <context-param>
+ <!-- disabled because of a bug in Mojarra 2.1 showing an error message on every page -->
+ <!-- <context-param>
<param-name>javax.faces.PROJECT_STAGE</param-name>
<param-value>Development</param-value>
- </context-param>
+ </context-param>-->
<context-param>
<param-name>javax.faces.STATE_SAVING_METHOD</param-name>
<param-value>server</param-value>
12 years, 8 months
JBoss Rich Faces SVN: r22655 - in modules/tests/metamer/trunk: ftest and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2011-08-18 03:43:16 -0400 (Thu, 18 Aug 2011)
New Revision: 22655
Modified:
modules/tests/metamer/trunk/ftest-source/pom.xml
modules/tests/metamer/trunk/ftest/pom.xml
modules/tests/metamer/trunk/pom.xml
Log:
versions of maven plugins updated
Modified: modules/tests/metamer/trunk/ftest/pom.xml
===================================================================
--- modules/tests/metamer/trunk/ftest/pom.xml 2011-08-18 07:11:54 UTC (rev 22654)
+++ modules/tests/metamer/trunk/ftest/pom.xml 2011-08-18 07:43:16 UTC (rev 22655)
@@ -308,6 +308,7 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>1.6</version>
<executions>
<execution>
<id>copy-test-classes</id>
Modified: modules/tests/metamer/trunk/ftest-source/pom.xml
===================================================================
--- modules/tests/metamer/trunk/ftest-source/pom.xml 2011-08-18 07:11:54 UTC (rev 22654)
+++ modules/tests/metamer/trunk/ftest-source/pom.xml 2011-08-18 07:43:16 UTC (rev 22655)
@@ -89,6 +89,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
+ <version>2.9</version>
<configuration>
<skip>true</skip>
</configuration>
Modified: modules/tests/metamer/trunk/pom.xml
===================================================================
--- modules/tests/metamer/trunk/pom.xml 2011-08-18 07:11:54 UTC (rev 22654)
+++ modules/tests/metamer/trunk/pom.xml 2011-08-18 07:43:16 UTC (rev 22655)
@@ -166,7 +166,7 @@
<plugins>
<plugin>
<artifactId>maven-release-plugin</artifactId>
- <version>2.2</version>
+ <version>2.2.1</version>
<configuration>
<arguments>-Pmyfaces,war-myfaces,war-jee6-bundled-mojarra,war-jee6-bundled-myfaces -Dselenium.test.skip=true
-Dselenium.server.skip=true</arguments>
12 years, 8 months
JBoss Rich Faces SVN: r22654 - in modules/tests/metamer/trunk: ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSlider and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2011-08-18 03:11:54 -0400 (Thu, 18 Aug 2011)
New Revision: 22654
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/richTree/simple.xhtml
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSlider/TestRichSlider.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSlider/TestRichSliderFAjax.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTree/TestTreeSimple.java
Log:
added issue tracking information
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richTree/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richTree/simple.xhtml 2011-08-17 23:42:17 UTC (rev 22653)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richTree/simple.xhtml 2011-08-18 07:11:54 UTC (rev 22654)
@@ -256,7 +256,7 @@
<a4j:commandButton id="expandAll" value="Expand All" action="#{richTreeBean.expandAll}" render="#{nestedComponentId}" />
<a4j:commandButton id="collapseAll" value="Collapse All" action="#{richTreeBean.collapseAll}" render="#{nestedComponentId}" />
- <a4j:outputPanel ajaxRendered="true">
+ <a4j:outputPanel id="panel" ajaxRendered="true">
<h:panelGrid columns="2">
<h:outputLabel value="Test Loading Facet:" />
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSlider/TestRichSlider.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSlider/TestRichSlider.java 2011-08-17 23:42:17 UTC (rev 22653)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSlider/TestRichSlider.java 2011-08-18 07:11:54 UTC (rev 22654)
@@ -561,6 +561,7 @@
}
@Test
+ @IssueTracking("https://issues.jboss.org/browse/RF-11314")
public void testShowTooltip() {
selenium.click(pjq("input[type=radio][name$=showTooltipInput][value=true]"));
selenium.waitForPageToLoad();
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSlider/TestRichSliderFAjax.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSlider/TestRichSliderFAjax.java 2011-08-17 23:42:17 UTC (rev 22653)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSlider/TestRichSliderFAjax.java 2011-08-18 07:11:54 UTC (rev 22654)
@@ -24,6 +24,8 @@
import static org.jboss.test.selenium.utils.URLUtils.buildUrl;
import java.net.URL;
+
+import org.richfaces.tests.metamer.ftest.annotations.IssueTracking;
import org.richfaces.tests.metamer.ftest.annotations.Use;
import org.testng.annotations.Test;
@@ -88,6 +90,7 @@
@Test
@Override
+ @IssueTracking("https://issues.jboss.org/browse/RF-11314")
public void testClick() {
super.testClick();
}
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTree/TestTreeSimple.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTree/TestTreeSimple.java 2011-08-17 23:42:17 UTC (rev 22653)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTree/TestTreeSimple.java 2011-08-18 07:11:54 UTC (rev 22654)
@@ -224,6 +224,7 @@
}
@Test
+ @IssueTracking("https://issues.jboss.org/browse/RF-11319")
public void testSelectionClientSideEvents() {
String[] events = new String[] { "beforeselectionchange", "begin", "beforedomupdate", "complete",
"selectionchange" };
12 years, 8 months
JBoss Rich Faces SVN: r22653 - modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPickList.
by richfaces-svn-commits＠lists.jboss.org
Author: jjamrich
Date: 2011-08-17 19:42:17 -0400 (Wed, 17 Aug 2011)
New Revision: 22653
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPickList/TestPickList.java
Log:
Removed unnecesary code
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPickList/TestPickList.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPickList/TestPickList.java 2011-08-17 23:41:58 UTC (rev 22652)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPickList/TestPickList.java 2011-08-17 23:42:17 UTC (rev 22653)
@@ -627,15 +627,6 @@
// valueChangeListener output as 4th record
waitModel.until(textEquals.locator(phaseListenerFormat.format(3))
.text(format(phaseListenerLogFormat, "[richfaces]", "[richfaces, Alabama]")));
- .text(format(phaseListenerLogFormat, "[]", "[richfaces]")));
-
- addItem("Alabama");
- selenium.click(a4jSubmit);
-
- // valueChangeListener output as 4th record
- listenerText = selenium.getText(phaseListenerFormat.format(3));
- assertEquals(listenerText, format(phaseListenerLogFormat, "[richfaces]", "[richfaces, Alabama]"),
- "Value change listener was not invoked or not in expected order");
}
/**
12 years, 8 months
JBoss Rich Faces SVN: r22652 - modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPickList.
by richfaces-svn-commits＠lists.jboss.org
Author: jjamrich
Date: 2011-08-17 19:41:58 -0400 (Wed, 17 Aug 2011)
New Revision: 22652
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPickList/TestPickList.java
Log:
RFPL-1612: add tests for min|maxListWidth|Height and height|width for pickList
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPickList/TestPickList.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPickList/TestPickList.java 2011-08-17 23:41:40 UTC (rev 22651)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPickList/TestPickList.java 2011-08-17 23:41:58 UTC (rev 22652)
@@ -59,6 +59,8 @@
private JQueryLocator targetCaptionLocator = pjq("div[id$=pickListTarget] div.rf-pick-target-caption");
private JQueryLocator sourceCaptionLocator = pjq("div[id$=pickListSource] div.rf-pick-source-caption");
+ private JQueryLocator pickListCtrl = pjq("div.rf-pick-lst-scrl");
+
private JQueryLocator pickListSrcItems = pjq("div[id$=pickListSourceItems]");
private JQueryLocator pickListSrcItem = pickListSrcItems.getChild(jq("div[id$=pickListItem{0}]"));
private JQueryLocator pickListSrcItemByText = pickListSrcItems.getChild(jq("div.rf-pick-opt:contains({0})"));
@@ -223,24 +225,48 @@
assertTrue(classVal.contains(itemClass));
}
- // @Test
+ @Test
public void testListHeight() {
- // attributes.setListHeight(listHeight);
+ String listHeight = "333";
+ attributes.setListHeight(listHeight);
+
+ String found = selenium.getAttribute(pickListCtrl.getAttribute(styleAttr));
+
+ assertTrue(found != null);
+ assertTrue(found.contains(listHeight));
}
- // @Test
+ @Test
public void testListWidth() {
- // attributes.setListWidth(listWidth)setMaxListHeight(maxListHeight);
+ String listWidth = "222";
+ attributes.setListWidth(listWidth);
+
+ String found = selenium.getAttribute(pickListCtrl.getAttribute(styleAttr));
+
+ assertTrue(found != null);
+ assertTrue(found.contains(listWidth));
}
- // @Test
+ @Test
public void testMaxListHeight() {
- // attributes.setMaxListHeight(maxListHeight);
+ String maxListHeight = "345";
+ attributes.setMaxListHeight(maxListHeight);
+
+ String found = selenium.getAttribute(pickListCtrl.getAttribute(styleAttr));
+
+ assertTrue(found != null);
+ assertTrue(found.contains(maxListHeight));
}
- // @Test
+ @Test
public void testMinListHeight() {
- // attributes.setMinListHeight(minListHeight);
+ String minListHeight = "234";
+ attributes.setMinListHeight(minListHeight);
+
+ String found = selenium.getAttribute(pickListCtrl.getAttribute(styleAttr));
+
+ assertTrue(found != null);
+ assertTrue(found.contains(minListHeight));
}
@Test
12 years, 8 months