Author: andrei_exadel
Date: 2008-10-02 06:52:54 -0400 (Thu, 02 Oct 2008)
New Revision: 10645
Modified:
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ModalPanelTest.java
Log:
modal panel: test JS api
Modified:
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java
===================================================================
---
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java 2008-10-02
09:52:30 UTC (rev 10644)
+++
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java 2008-10-02
10:52:54 UTC (rev 10645)
@@ -478,6 +478,16 @@
public void AssertVisible(String id) {
Assert.assertTrue(isVisibleById(id));
}
+
+ /**
+ * Asserts DOM node is visible
+ *
+ * @param id -
+ * DOM element id
+ */
+ public void AssertVisible(String id, String message) {
+ Assert.assertTrue(isVisibleById(id), message);
+ }
/**
* Asserts DOM node is not present
@@ -488,7 +498,18 @@
public void AssertNotPresent(String id) {
Assert.assertFalse(isPresentById(id));
}
+
+ /**
+ * Asserts DOM node is not present
+ *
+ * @param id -
+ * DOM element id
+ */
+ public void AssertNotPresent(String id, String message) {
+ Assert.assertFalse(isPresentById(id), message);
+ }
+
/**
* Asserts DOM node is not visible
*
@@ -500,6 +521,17 @@
}
/**
+ * Asserts DOM node is not visible
+ *
+ * @param id -
+ * DOM element id
+ */
+ public void AssertNotVisible(String id, String message) {
+ Assert.assertFalse(isVisibleById(id), message);
+ }
+
+
+ /**
* Asserts DOM node is present
*
* @param id -
Modified:
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ModalPanelTest.java
===================================================================
---
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ModalPanelTest.java 2008-10-02
09:52:30 UTC (rev 10644)
+++
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ModalPanelTest.java 2008-10-02
10:52:54 UTC (rev 10645)
@@ -94,8 +94,57 @@
AssertPresent(panelId);
AssertVisible(panelId);
}
+
+ @Test
+ public void testNotResizeableAndNotMoveable(Template template) {
+ renderPage(template, RESET_METHOD_NAME);
+ writeStatus("Testing not resizeable panel");
+ String panelId = getParentId() + PANEL_CONTAINER_DIV_ID;
+ String contentId = getParentId() + PANEL_CONTENT_DIV_ID;
+ String resizerNId = getParentId() + PANEL_ID + "ResizerN";
+ String resizerSELId = getParentId() + PANEL_ID + "ResizerSEL";
+ String resizerSWUId = getParentId() + PANEL_ID + "ResizerSWU";
+ String headerId = getParentId() + PANEL_HEADER_ID;
+ String cIdvId = getParentId() + PANEL_C_DIV_ID;
+
+ clickChangeAttributes();
+
+ AssertPresent(panelId);
+ AssertVisible(panelId);
+
+ AssertNotPresent(resizerSELId, "Resizeable = false does not work");
+ AssertNotPresent(resizerSWUId, "Resizeable = false does not work");
+ AssertNotPresent(resizerNId, "Resizeable = false does not work");
+
+
+ Integer left = (Integer)getLeftById(cIdvId);
+ Integer top = (Integer)getTopById(cIdvId);
+
+ selenium.dragAndDrop(headerId, "+10,+10");
+
+ Assert.assertTrue(((Integer)getLeftById(cIdvId)).equals(left), "Moveable =
false attribute does not work");
+ Assert.assertTrue(((Integer)getTopById(cIdvId)).equals(top), "Moveable = false
attribute does not work");
+
+
+ }
+
@Test
+ public void testJSApi(Template template) {
+ renderPage(template, RESET_METHOD_NAME);
+ String panelId = getParentId() + PANEL_CONTAINER_DIV_ID;
+
+ AssertNotVisible(panelId);
+ switchPanel(true);
+
+ AssertVisible(panelId, "Modal panel has not opened by JS API");
+
+ switchPanel(false);
+
+ AssertNotVisible(panelId, "Modal panel has not closed by JS API");
+ }
+
+ @Test
public void testLayoutAttributes(Template template) throws Exception {
renderPage(template, RESET_METHOD_NAME);
writeStatus("Testing layout attribute");
@@ -240,4 +289,14 @@
clickById(buttonId);
}
+ private void switchPanel(boolean show) {
+ String panelId = getParentId() + PANEL_ID;
+ if (show) {
+ invokeFromComponent(panelId, "show", null);
+ }else {
+ invokeFromComponent(panelId, "hide", null);
+ }
+
+ }
+
}