4:55 p.m.
Author: andrei_exadel
Date: 2008-10-02 10:55:50 -0400 (Thu, 02 Oct 2008)
New Revision: 10650
Modified:
trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/ModalPanelTestBean.java
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/modalPanel/modalPanelTest.xhtml
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ModalPanelTest.java
Log:
Modal panel: test autosized
Modified:
trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/ModalPanelTestBean.java
===================================================================
---
trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/ModalPanelTestBean.java 2008-10-02
12:29:07 UTC (rev 10649)
+++
trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/ModalPanelTestBean.java 2008-10-02
14:55:50 UTC (rev 10650)
@@ -17,6 +17,7 @@
private Boolean showWhenRendered = false;
private Boolean moveable = true;
private Boolean resizeable = true;
+ private Boolean autosized = false;
private String input;
/**
* @return the rendered
@@ -79,12 +80,20 @@
return null;
}
+ public String setAutosized() {
+ resizeable = false;
+ autosized = true;
+ showWhenRendered = true;
+ return null;
+ }
+
public String reset(){
rendered = true;
showWhenRendered = false;
moveable = true;
resizeable = true;
input = null;
+ autosized = false;
return null;
}
@@ -100,5 +109,17 @@
public void setInput(String input) {
this.input = input;
}
+ /**
+ * @return the autosized
+ */
+ public Boolean getAutosized() {
+ return autosized;
+ }
+ /**
+ * @param autosized the autosized to set
+ */
+ public void setAutosized(Boolean autosized) {
+ this.autosized = autosized;
+ }
}
Modified:
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/modalPanel/modalPanelTest.xhtml
===================================================================
(Binary files differ)
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
12:29:07 UTC (rev 10649)
+++
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ModalPanelTest.java 2008-10-02
14:55:50 UTC (rev 10650)
@@ -24,6 +24,7 @@
private final static String RESET_ID="reset";
private final static String CHANGE_RENDERED_ID="change_rendered";
private final static String CHANGE_ATTRIBUTES_ID="change_attributes";
+ private final static String CHANGE_AUTOSIZED_ID = "set_autosized";
private final static String HIDE_ID="hide";
private final static String SHOW_ID="show";
private final static String PANEL_C_DIV_ID = PANEL_ID + "CDiv";
@@ -101,7 +102,6 @@
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";
@@ -248,6 +248,47 @@
}
+ @Test
+ public void testAutosized(Template template) {
+ renderPage(template, RESET_METHOD_NAME);
+
+ String contentId = getParentId() + PANEL_CONTENT_DIV_ID;
+ String panelId = getParentId() + PANEL_CONTAINER_DIV_ID;
+ String resizerNId = getParentId() + PANEL_ID + "ResizerN";
+ String resizerSELId = getParentId() + PANEL_ID + "ResizerSEL";
+ String resizerSWUId = getParentId() + PANEL_ID + "ResizerSWU";
+ String cIdvId = getParentId() + PANEL_C_DIV_ID;
+
+
+ clickShow();
+
+ String width = getWidth(contentId);
+ String height = getHeight(contentId);
+
+ clickSetAutosized();
+
+ AssertVisible(panelId);
+ AssertNotPresent(resizerSELId, "Autosized panel should not be
resizeable");
+ AssertNotPresent(resizerSWUId, "Autosized panel should not be
resizeable");
+ AssertNotPresent(resizerNId, "Autosized panel should not be resizeable");
+
+ Assert.assertFalse(getWidth(contentId).equals(width), "Panel was not
autosized");
+ Assert.assertFalse(getHeight(contentId).equals(height), "Panel was not
autosized");
+
+ //check moveable
+ writeStatus("Check moveability of autosized panel");
+ String headerId = getParentId() + PANEL_HEADER_ID;
+
+ Integer left = (Integer)getLeftById(cIdvId);
+ Integer top = (Integer)getTopById(cIdvId);
+
+ selenium.dragAndDrop(headerId, "+10,+10");
+
+ Assert.assertFalse(((Integer)getLeftById(cIdvId)).equals(left), "Autosized
panel should be moved");
+ Assert.assertFalse(((Integer)getTopById(cIdvId)).equals(top), "Autosized panel
should be moved");
+
+ }
+
private String getWidth(String id) {
String w = runScript("$('"+id+"').style.width", false);
@@ -264,6 +305,12 @@
writeStatus("Click reset button");
clickCommandAndWait(buttonId);
}
+
+ private void clickSetAutosized() {
+ String buttonId = getParentId() + FORM_ID + CHANGE_AUTOSIZED_ID;
+ writeStatus("Click set autosized button");
+ clickCommandAndWait(buttonId);
+ }
private void clickChangeRendered() {
String buttonId = getParentId() + FORM_ID + CHANGE_RENDERED_ID;