Author: sergeyhalipov
Date: 2008-05-20 13:35:55 -0400 (Tue, 20 May 2008)
New Revision: 8662
Modified:
trunk/test-applications/seleniumTest/src/main/webapp/template/modalPanel.xhtml
trunk/test-applications/seleniumTest/src/test/java/org/ajax4jsf/test/base/Templates.java
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/AjaxCommandButtonTest.java
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/AjaxCommandLinkTest.java
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/AjaxPollTest.java
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/AjaxRegionTest.java
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/AjaxStatusTest.java
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/CalendarTest.java
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/ComboBoxTest.java
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/ContextMenuTest.java
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/DropDownMenuTest.java
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/InplaceSelectTest.java
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/InputNumberSpinnerTest.java
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/JSFunctionTest.java
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/KeepAliveTest.java
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/LoadScriptTest.java
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/LoadStyleTest.java
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/OrderingListTest.java
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/PanelBarTest.java
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/PanelMenuTest.java
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/PickListTest.java
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/ProgressBarTest.java
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/SimpleTogglePanelTest.java
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/TabPanelTest.java
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/TogglePanelTest.java
Log:
Selenium tests: Modal panel template was added.
Modified: trunk/test-applications/seleniumTest/src/main/webapp/template/modalPanel.xhtml
===================================================================
(Binary files differ)
Modified:
trunk/test-applications/seleniumTest/src/test/java/org/ajax4jsf/test/base/Templates.java
===================================================================
---
trunk/test-applications/seleniumTest/src/test/java/org/ajax4jsf/test/base/Templates.java 2008-05-20
17:18:35 UTC (rev 8661)
+++
trunk/test-applications/seleniumTest/src/test/java/org/ajax4jsf/test/base/Templates.java 2008-05-20
17:35:55 UTC (rev 8662)
@@ -21,10 +21,10 @@
public static Templates MODALPANEL = new Templates("modalPanel");
private void setParentId(SeleniumTestBase test) {
- if ("simple".equals(template)) {
+ if ("dataTable".equals(template)) {
+ test.setParentId(COMPONENT_PREFIX_INSIDE_TABLE);
+ } else {
test.setParentId(COMPONENT_PREFIX_SIMPLE);
- } else if ("dataTable".equals(template)) {
- test.setParentId(COMPONENT_PREFIX_INSIDE_TABLE);
}
}
Modified:
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/AjaxCommandButtonTest.java
===================================================================
---
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/AjaxCommandButtonTest.java 2008-05-20
17:18:35 UTC (rev 8661)
+++
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/AjaxCommandButtonTest.java 2008-05-20
17:35:55 UTC (rev 8662)
@@ -36,6 +36,7 @@
public void testAjaxCommandButtonComponent() throws Exception {
_testAjaxCommandButtonComponent(Templates.SIMPLE);
_testAjaxCommandButtonComponent(Templates.DATATABLE);
+ _testAjaxCommandButtonComponent(Templates.MODALPANEL);
}
private void _testAjaxCommandButtonComponent(Templates template) {
Modified:
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/AjaxCommandLinkTest.java
===================================================================
---
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/AjaxCommandLinkTest.java 2008-05-20
17:18:35 UTC (rev 8661)
+++
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/AjaxCommandLinkTest.java 2008-05-20
17:35:55 UTC (rev 8662)
@@ -35,6 +35,7 @@
public void testAjaxCommandLinkComponent() throws Exception {
_testAjaxCommandLinkComponent(Templates.SIMPLE);
_testAjaxCommandLinkComponent(Templates.DATATABLE);
+ _testAjaxCommandLinkComponent(Templates.MODALPANEL);
}
private void _testAjaxCommandLinkComponent(Templates template) {
Modified:
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/AjaxPollTest.java
===================================================================
---
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/AjaxPollTest.java 2008-05-20
17:18:35 UTC (rev 8661)
+++
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/AjaxPollTest.java 2008-05-20
17:35:55 UTC (rev 8662)
@@ -42,6 +42,7 @@
public void testAjaxPollComponent() {
_testAjaxPollComponent(Templates.SIMPLE);
_testAjaxPollComponent(Templates.DATATABLE);
+ _testAjaxPollComponent(Templates.MODALPANEL);
}
private void _testAjaxPollComponent(Templates template) {
Modified:
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/AjaxRegionTest.java
===================================================================
---
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/AjaxRegionTest.java 2008-05-20
17:18:35 UTC (rev 8661)
+++
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/AjaxRegionTest.java 2008-05-20
17:35:55 UTC (rev 8662)
@@ -32,7 +32,9 @@
@Test
public void testAjaxRegionComponent() throws Exception {
+ _testAjaxRegionComponent(Templates.SIMPLE);
_testAjaxRegionComponent(Templates.DATATABLE);
+ _testAjaxRegionComponent(Templates.MODALPANEL);
}
private void _testAjaxRegionComponent(Templates template) {
Modified:
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/AjaxStatusTest.java
===================================================================
---
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/AjaxStatusTest.java 2008-05-20
17:18:35 UTC (rev 8661)
+++
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/AjaxStatusTest.java 2008-05-20
17:35:55 UTC (rev 8662)
@@ -33,7 +33,9 @@
@Test
public void testAjaxStatusComponent() throws Exception {
+ _testAjaxStatusComponent(Templates.SIMPLE);
_testAjaxStatusComponent(Templates.DATATABLE);
+ _testAjaxStatusComponent(Templates.MODALPANEL);
}
private void _testAjaxStatusComponent(Templates template) {
Modified:
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/CalendarTest.java
===================================================================
---
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/CalendarTest.java 2008-05-20
17:18:35 UTC (rev 8661)
+++
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/CalendarTest.java 2008-05-20
17:35:55 UTC (rev 8662)
@@ -64,7 +64,8 @@
@Test
public void testContextMenuComponent() throws Exception {
_testSelectDateComponent(Templates.SIMPLE);
-// _testCalendarComponent(Templates.DATATABLE);
+ _testCalendarComponent(Templates.DATATABLE);
+ _testCalendarComponent(Templates.MODALPANEL);
}
private void _testCalendarComponent(Templates template) {
Modified:
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/ComboBoxTest.java
===================================================================
---
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/ComboBoxTest.java 2008-05-20
17:18:35 UTC (rev 8661)
+++
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/ComboBoxTest.java 2008-05-20
17:35:55 UTC (rev 8662)
@@ -35,6 +35,7 @@
public void testComboBoxComponent() throws Exception {
_testComboBoxComponent(Templates.SIMPLE);
_testComboBoxComponent(Templates.DATATABLE);
+ _testComboBoxComponent(Templates.MODALPANEL);
}
private void _testComboBoxComponent(Templates template) {
Modified:
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/ContextMenuTest.java
===================================================================
---
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/ContextMenuTest.java 2008-05-20
17:18:35 UTC (rev 8661)
+++
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/ContextMenuTest.java 2008-05-20
17:35:55 UTC (rev 8662)
@@ -57,6 +57,7 @@
public void testContextMenuComponent() throws Exception {
_testContextMenuComponent(Templates.SIMPLE);
_testContextMenuComponent(Templates.DATATABLE);
+ _testContextMenuComponent(Templates.MODALPANEL);
}
private void _testContextMenuComponent(Templates template) {
Modified:
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/DropDownMenuTest.java
===================================================================
---
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/DropDownMenuTest.java 2008-05-20
17:18:35 UTC (rev 8661)
+++
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/DropDownMenuTest.java 2008-05-20
17:35:55 UTC (rev 8662)
@@ -34,6 +34,7 @@
public void testDropDownMenuComponent() throws Exception {
_testDropDownMenuComponent(Templates.SIMPLE);
_testDropDownMenuComponent(Templates.DATATABLE);
+ _testDropDownMenuComponent(Templates.MODALPANEL);
}
private void _testDropDownMenuComponent(Templates template) {
Modified:
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/InplaceSelectTest.java
===================================================================
---
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/InplaceSelectTest.java 2008-05-20
17:18:35 UTC (rev 8661)
+++
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/InplaceSelectTest.java 2008-05-20
17:35:55 UTC (rev 8662)
@@ -35,6 +35,7 @@
public void testInplaceSelectComponent() throws Exception {
_testInplaceSelectComponent(Templates.SIMPLE);
_testInplaceSelectComponent(Templates.DATATABLE);
+ _testInplaceSelectComponent(Templates.MODALPANEL);
}
private void _testInplaceSelectComponent(Templates template) {
Modified:
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/InputNumberSpinnerTest.java
===================================================================
---
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/InputNumberSpinnerTest.java 2008-05-20
17:18:35 UTC (rev 8661)
+++
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/InputNumberSpinnerTest.java 2008-05-20
17:35:55 UTC (rev 8662)
@@ -36,7 +36,8 @@
public void testInputNumberSpinnerComponent() throws Exception {
_testInputNumberSpinnerComponent(Templates.SIMPLE);
//it looks as if the spinner does not work inside rich:dataTable
- //_testInputNumberSpinnerComponent(Templates.DATATABLE);
+ _testInputNumberSpinnerComponent(Templates.DATATABLE);
+ _testInputNumberSpinnerComponent(Templates.MODALPANEL);
}
private void _testInputNumberSpinnerComponent(Templates template) {
Modified:
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/JSFunctionTest.java
===================================================================
---
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/JSFunctionTest.java 2008-05-20
17:18:35 UTC (rev 8661)
+++
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/JSFunctionTest.java 2008-05-20
17:35:55 UTC (rev 8662)
@@ -34,7 +34,9 @@
@Test
public void testJSFunctionComponent() throws Exception {
+ _testJSFunctionComponent(Templates.SIMPLE);
_testJSFunctionComponent(Templates.DATATABLE);
+ _testJSFunctionComponent(Templates.MODALPANEL);
}
private void _testJSFunctionComponent(Templates template) {
Modified:
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/KeepAliveTest.java
===================================================================
---
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/KeepAliveTest.java 2008-05-20
17:18:35 UTC (rev 8661)
+++
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/KeepAliveTest.java 2008-05-20
17:35:55 UTC (rev 8662)
@@ -32,7 +32,9 @@
@Test
public void testKeepAliveComponent() throws Exception {
+ _testKeepAliveComponent(Templates.SIMPLE);
_testKeepAliveComponent(Templates.DATATABLE);
+ _testKeepAliveComponent(Templates.MODALPANEL);
}
private void _testKeepAliveComponent(Templates template) {
Modified:
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/LoadScriptTest.java
===================================================================
---
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/LoadScriptTest.java 2008-05-20
17:18:35 UTC (rev 8661)
+++
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/LoadScriptTest.java 2008-05-20
17:35:55 UTC (rev 8662)
@@ -34,7 +34,9 @@
@Test
public void testLoadScriptComponent() throws Exception {
+ _testLoadScriptComponent(Templates.SIMPLE);
_testLoadScriptComponent(Templates.DATATABLE);
+ _testLoadScriptComponent(Templates.MODALPANEL);
}
private void _testLoadScriptComponent(Templates template) {
Modified:
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/LoadStyleTest.java
===================================================================
---
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/LoadStyleTest.java 2008-05-20
17:18:35 UTC (rev 8661)
+++
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/LoadStyleTest.java 2008-05-20
17:35:55 UTC (rev 8662)
@@ -34,7 +34,9 @@
@Test
public void testLoadStyleComponent() throws Exception {
+ _testLoadStyleComponent(Templates.SIMPLE);
_testLoadStyleComponent(Templates.DATATABLE);
+ _testLoadStyleComponent(Templates.MODALPANEL);
}
private void _testLoadStyleComponent(Templates template) {
Modified:
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/OrderingListTest.java
===================================================================
---
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/OrderingListTest.java 2008-05-20
17:18:35 UTC (rev 8661)
+++
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/OrderingListTest.java 2008-05-20
17:35:55 UTC (rev 8662)
@@ -78,6 +78,7 @@
public void testOrderingListComponent() throws Exception {
_testOrderingListComponent(Templates.SIMPLE);
_testOrderingListComponent(Templates.DATATABLE);
+ _testOrderingListComponent(Templates.MODALPANEL);
}
private void _testOrderingListComponent(Templates template) {
Modified:
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/PanelBarTest.java
===================================================================
---
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/PanelBarTest.java 2008-05-20
17:18:35 UTC (rev 8661)
+++
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/PanelBarTest.java 2008-05-20
17:35:55 UTC (rev 8662)
@@ -57,8 +57,9 @@
@Test
public void testPanelBarComponent() throws Exception {
- renderPage("/faces/pages/panelBar/panelBarTest.xhtml");
_testPanelBarComponent(Templates.SIMPLE);
+ _testPanelBarComponent(Templates.DATATABLE);
+ _testPanelBarComponent(Templates.MODALPANEL);
}
private void _testPanelBarComponent(Templates template) {
Modified:
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/PanelMenuTest.java
===================================================================
---
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/PanelMenuTest.java 2008-05-20
17:18:35 UTC (rev 8661)
+++
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/PanelMenuTest.java 2008-05-20
17:35:55 UTC (rev 8662)
@@ -37,12 +37,15 @@
_testPanelMenuComponent(Templates.SIMPLE);
_testPanelMenuComponent(Templates.DATATABLE);
+ _testPanelMenuComponent(Templates.MODALPANEL);
_testPanelMenuComponentSingleMode(Templates.SIMPLE);
_testPanelMenuComponentSingleMode(Templates.DATATABLE);
+ _testPanelMenuComponentSingleMode(Templates.MODALPANEL);
_testPanelMenuItemAction(Templates.SIMPLE);
_testPanelMenuItemAction(Templates.DATATABLE);
+ _testPanelMenuItemAction(Templates.MODALPANEL);
}
Modified:
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/PickListTest.java
===================================================================
---
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/PickListTest.java 2008-05-20
17:18:35 UTC (rev 8661)
+++
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/PickListTest.java 2008-05-20
17:35:55 UTC (rev 8662)
@@ -35,6 +35,7 @@
public void testPickListComponent() throws Exception {
_testPickListComponent(Templates.SIMPLE);
_testPickListComponent(Templates.DATATABLE);
+ _testPickListComponent(Templates.MODALPANEL);
}
private void _testPickListComponent(Templates template) {
Modified:
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/ProgressBarTest.java
===================================================================
---
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/ProgressBarTest.java 2008-05-20
17:18:35 UTC (rev 8661)
+++
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/ProgressBarTest.java 2008-05-20
17:35:55 UTC (rev 8662)
@@ -37,6 +37,7 @@
public void testProgressBarComponent() {
_testProgressBarComponent(Templates.SIMPLE);
_testProgressBarComponent(Templates.DATATABLE);
+ _testProgressBarComponent(Templates.MODALPANEL);
}
private void _testProgressBarComponent(Templates template) {
Modified:
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/SimpleTogglePanelTest.java
===================================================================
---
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/SimpleTogglePanelTest.java 2008-05-20
17:18:35 UTC (rev 8661)
+++
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/SimpleTogglePanelTest.java 2008-05-20
17:35:55 UTC (rev 8662)
@@ -57,6 +57,7 @@
public void testSimpleTogglePanelComponent() throws Exception {
_testSimpleTogglePanelComponent(Templates.SIMPLE);
_testSimpleTogglePanelComponent(Templates.DATATABLE);
+ _testSimpleTogglePanelComponent(Templates.MODALPANEL);
}
private void _testSimpleTogglePanelComponent(Templates template) {
Modified:
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/TabPanelTest.java
===================================================================
---
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/TabPanelTest.java 2008-05-20
17:18:35 UTC (rev 8661)
+++
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/TabPanelTest.java 2008-05-20
17:35:55 UTC (rev 8662)
@@ -64,6 +64,7 @@
public void testTabPanelComponent() throws Exception {
_testRichTabPanelComponent(Templates.SIMPLE);
_testRichTabPanelComponent(Templates.DATATABLE);
+ _testRichTabPanelComponent(Templates.MODALPANEL);
}
private void _testRichTabPanelComponent(Templates template) {
Modified:
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/TogglePanelTest.java
===================================================================
---
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/TogglePanelTest.java 2008-05-20
17:18:35 UTC (rev 8661)
+++
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/TogglePanelTest.java 2008-05-20
17:35:55 UTC (rev 8662)
@@ -60,6 +60,7 @@
public void testTogglePanelComponent() throws Exception {
_testTogglePanelComponent(Templates.SIMPLE);
_testTogglePanelComponent(Templates.DATATABLE);
+ _testTogglePanelComponent(Templates.MODALPANEL);
}
private void _testTogglePanelComponent(Templates template) {