[richfaces-svn-commits] JBoss Rich Faces SVN: r11994 - in trunk/test-applications/seleniumTest/richfaces/src: main/webapp/pages/modalPanel and 2 other directories.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Tue Dec 23 10:52:11 EST 2008
Author: andrei_exadel
Date: 2008-12-23 10:52:11 -0500 (Tue, 23 Dec 2008)
New Revision: 11994
Added:
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/modalPanel/testTrimOverlayedElements.xhtml
Modified:
trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/Configurator.java
trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/ModalPanelTestBean.java
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:
trimOverlayed test; template parameters
Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/Configurator.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/Configurator.java 2008-12-23 14:26:04 UTC (rev 11993)
+++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/Configurator.java 2008-12-23 15:52:11 UTC (rev 11994)
@@ -20,6 +20,11 @@
*/
package org.ajax4jsf.bean;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.ajax4jsf.template.Template;
+
public class Configurator {
private static final String[] LOAD_STRATEGIES = new String[] {"DEFAULT", "ALL"};
@@ -30,6 +35,8 @@
private static int currentStrategyIndex = 0;
+ private static Object[][] templates = null;
+
public Configurator() {}
public String getLoadScriptStrategy() {
@@ -47,5 +54,35 @@
public static void setLoadStyleStrategy(String strategy) {
loadStyleStrategy = strategy;
}
+
+ /**
+ * @return the templates
+ */
+ public static Object[][] getTemplates() {
+ return templates;
+ }
+
+ /**
+ * @param templates the templates to set
+ */
+ public static void setTemplates(String templateExpr) {
+ if (templateExpr != null) {
+ String[] array = new String[]{};
+ if(null != templateExpr) {
+ array = templateExpr.split(",");
+ }
+
+ List<Object[]> list = new ArrayList<Object[]>();
+ for (String string : array) {
+ Object[] elem = new Object[] {Template.valueOf(string.toUpperCase())};
+ list.add(elem);
+ }
+
+ templates = (Object[][]) list.toArray(new Object[0][0]);
+ }else {
+ templates = new Object[][] { { Template.SIMPLE }, { Template.DATA_TABLE }, { Template.DATA_TABLE2 }, { Template.MODAL_PANEL } };
+ }
+
+ }
}
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-12-23 14:26:04 UTC (rev 11993)
+++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/ModalPanelTestBean.java 2008-12-23 15:52:11 UTC (rev 11994)
@@ -33,6 +33,7 @@
private Boolean resizeable = true;
private Boolean autosized = false;
private Boolean keepVisualState = false;
+ private Boolean trimOverlayedElements = true;
private String input;
/**
* @return the rendered
@@ -108,6 +109,11 @@
return null;
}
+ public String changeTrimOverlayed() {
+ trimOverlayedElements = false;
+ return null;
+ }
+
public String reset(){
rendered = true;
showWhenRendered = false;
@@ -116,6 +122,7 @@
input = null;
autosized = false;
keepVisualState = false;
+ trimOverlayedElements = true;
return null;
}
@@ -155,5 +162,17 @@
public void setKeepVisualState(Boolean keepVisualState) {
this.keepVisualState = keepVisualState;
}
+ /**
+ * @return the trimOverlayedElements
+ */
+ public Boolean getTrimOverlayedElements() {
+ return trimOverlayedElements;
+ }
+ /**
+ * @param trimOverlayedElements the trimOverlayedElements to set
+ */
+ public void setTrimOverlayedElements(Boolean trimOverlayedElements) {
+ this.trimOverlayedElements = trimOverlayedElements;
+ }
}
Added: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/modalPanel/testTrimOverlayedElements.xhtml
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/modalPanel/testTrimOverlayedElements.xhtml (rev 0)
+++ trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/modalPanel/testTrimOverlayedElements.xhtml 2008-12-23 15:52:11 UTC (rev 11994)
@@ -0,0 +1,46 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets">
+
+<ui:composition template="#{templateBean.template}">
+ <ui:define name="style">
+ </ui:define>
+ <ui:define name="component">
+ <rich:modalPanel id="test_panel"
+ top="101"
+ left="102"
+ width="103"
+ height="104"
+ zindex="12"
+ showWhenRendered="false"
+ minWidth="70"
+ minHeight="70"
+ trimOverlayedElements="#{modalPanelBean.trimOverlayedElements}"
+ styleClass="noclass">
+ <f:facet name="header">
+ <h:outputText id="header" value="header" />
+ </f:facet>
+ <div style="position: absolute; width: 50px; left: -20px; top: 18px; color: red">
+ Richfaces
+ </div>
+ <h:form id="_f">
+ <h:outputText value="Richfaces modal panel" /><br/><br/>
+ <h:inputText id="input" value="#{modalPanelBean.input}" style="width: 20px"></h:inputText><br/>
+ <h:commandLink id="hide" onclick="Richfaces.hideModalPanel('test_panel'); return false;" value="Hide panel" /><br/>
+ <h:commandLink id="submit" value="Submit"></h:commandLink>
+ </h:form>
+ </rich:modalPanel>
+ <h:form id="form">
+ <a href="#" id="show" onclick="Richfaces.showModalPanel('test_panel'); return false;">Open</a>
+ <h:selectBooleanCheckbox id="trimOverlayed" value="#{modalPanelBean.trimOverlayedElements}"></h:selectBooleanCheckbox>
+ <h:commandButton id="submit" value="Submit"></h:commandButton>
+ </h:form>
+
+
+ </ui:define>
+</ui:composition>
+</html>
\ No newline at end of file
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-12-23 14:26:04 UTC (rev 11993)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java 2008-12-23 15:52:11 UTC (rev 11994)
@@ -40,6 +40,7 @@
import org.testng.annotations.BeforeSuite;
import org.testng.annotations.BeforeTest;
import org.testng.annotations.DataProvider;
+import org.testng.annotations.Optional;
import org.testng.annotations.Parameters;
import com.thoughtworks.selenium.DefaultSelenium;
@@ -130,7 +131,8 @@
@DataProvider(name = "templates")
protected Object[][] templates() {
- return new Object[][] { { Template.SIMPLE }, { Template.DATA_TABLE }, { Template.DATA_TABLE2 }, { Template.MODAL_PANEL } };
+ //return new Object[][] { { Template.SIMPLE }, { Template.DATA_TABLE }, { Template.DATA_TABLE2 }, { Template.MODAL_PANEL } };
+ return Configurator.getTemplates();
//return this.data;
}
@@ -212,10 +214,11 @@
}
@BeforeTest
- @Parameters({"loadStyleStrategy", "loadScriptStrategy"})
- protected void loadConfiguration(String loadStyleStrategy, String loadScriptStrategy) throws Exception {
- Configurator.setLoadScriptStrategy(loadScriptStrategy);
+ @Parameters({"loadStyleStrategy", "loadScriptStrategy", "templates"})
+ protected void loadConfiguration(String loadStyleStrategy, String loadScriptStrategy, @Optional String templates) throws Exception {
+ Configurator.setLoadScriptStrategy(loadScriptStrategy);
Configurator.setLoadStyleStrategy(loadStyleStrategy);
+ Configurator.setTemplates(templates);
}
/**
@@ -1369,7 +1372,7 @@
public void assertStyleAttributes(String id, Map<String, String> styleAttrs) {
for (String a : styleAttrs.keySet()) {
String actualStyle = getStyleAttributeString(id, a);
- Assert.assertEquals(actualStyle, styleAttrs.get(a), "Style attribute invalid. Expected ["+styleAttrs.get(a)+"]. But was ["+actualStyle+"]");
+ Assert.assertEquals(actualStyle, styleAttrs.get(a), "Style attribute invalid. Expected ["+ a + "="+ styleAttrs.get(a)+"]. But was ["+a + "=" + actualStyle+"]");
}
}
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-12-23 14:26:04 UTC (rev 11993)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ModalPanelTest.java 2008-12-23 15:52:11 UTC (rev 11994)
@@ -20,6 +20,9 @@
*/
package org.richfaces.testng;
+import java.util.HashMap;
+import java.util.Map;
+
import org.ajax4jsf.template.Template;
import org.richfaces.SeleniumTestBase;
import org.testng.Assert;
@@ -32,6 +35,7 @@
*/
public class ModalPanelTest extends SeleniumTestBase {
+ static final String TRIM_OVERLAYED_TEST = "pages/modalPanel/testTrimOverlayedElements.xhtml";
private final static String PANEL_ID="test_panel";
private final static String FORM_ID="form:";
private final static String FORM2_ID="_f:";
@@ -57,8 +61,35 @@
public String getTestUrl() {
return "pages/modalPanel/modalPanelTest.xhtml";
}
+
+ @Test
+ public void testTrimOverlayedElementsAttribute(Template template) {
+ renderPage(TRIM_OVERLAYED_TEST, template, RESET_METHOD_NAME);
+
+ String booleanId = getParentId() + FORM_ID + "trimOverlayed";
+ String submitId = getParentId() +FORM_ID + "submit";
+ String showButtonId = "show";
+
+ clickById(showButtonId);
+
+ Map<String, String> styles = new HashMap<String, String>();
+ styles.put("position", "relative");
+ styles.put("z-index", "0");
+
+ assertStyleAttributes(getParentId() + PANEL_CONTENT_DIV_ID, styles);
+
+ selenium.click(booleanId);
+ //selenium.check(booleanId);
+ clickCommandAndWait(submitId);
+ clickById(showButtonId);
+
+ styles.clear();
+ styles.put("position", "static");
+
+ assertStyleAttributes(getParentId() + PANEL_CONTENT_DIV_ID, styles);
+ }
- @Test
+ //@Test
public void testModalPanel(Template template) throws Exception {
renderPage(template, RESET_METHOD_NAME);
writeStatus("Testing modal panel");
@@ -80,7 +111,7 @@
}
- @Test
+ //@Test
public void testRenderedAttribute(Template template) throws Exception {
renderPage(template, RESET_METHOD_NAME);
writeStatus("Testing rendered attribute");
@@ -95,7 +126,7 @@
}
- @Test
+ //@Test
public void testShowWhenRenderedAttribute(Template template) throws Exception {
renderPage(template, RESET_METHOD_NAME);
writeStatus("Testing showWhenRendered attribute");
@@ -111,7 +142,7 @@
AssertVisible(panelId);
}
- @Test
+ //@Test
public void testNotResizeableAndNotMoveable(Template template) {
renderPage(template, RESET_METHOD_NAME);
writeStatus("Testing not resizeable panel");
@@ -144,7 +175,7 @@
}
- @Test
+ //@Test
public void testJSApi(Template template) {
renderPage(template, RESET_METHOD_NAME);
String panelId = getParentId() + PANEL_CONTAINER_DIV_ID;
@@ -159,7 +190,7 @@
AssertNotVisible(panelId, "Modal panel has not closed by JS API");
}
- @Test
+ //@Test
public void testLayoutAttributes(Template template) throws Exception {
renderPage(template, RESET_METHOD_NAME);
writeStatus("Testing layout attribute");
@@ -195,7 +226,7 @@
assertClassNames(panelContainerId, new String [] {"rich-modalpanel"}, "", true);
}
- @Test
+ //@Test
public void testDragByHeader(Template template) {
renderPage(template, RESET_METHOD_NAME);
@@ -219,7 +250,7 @@
}
- @Test
+ // @Test
public void testMinWidthAndMinHeight(Template template) {
renderPage(template, RESET_METHOD_NAME);
@@ -238,7 +269,7 @@
}
- @Test
+ //@Test
public void testNestedInputAndCommand(Template template) {
renderPage(template, RESET_METHOD_NAME);
@@ -263,7 +294,7 @@
}
- @Test
+ //@Test
public void testAutosized(Template template) {
renderPage(template, RESET_METHOD_NAME);
@@ -304,7 +335,7 @@
}
- @Test
+ // @Test
public void testKeepVisualState(Template template) {
renderPage(template, RESET_METHOD_NAME);
String message = "KeepVisualState attribute does not work";
More information about the richfaces-svn-commits
mailing list