JBoss Rich Faces SVN: r21035 - in modules/tests/metamer/trunk: application/src/main/webapp/components/a4jCommandButton and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2011-01-14 12:05:06 -0500 (Fri, 14 Jan 2011)
New Revision: 21035
Removed:
modules/tests/metamer/trunk/application/src/main/webapp/resources/css/a4jCommandButton.css
Modified:
modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/A4JCommandButtonBean.properties
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jCommandButton/simple.xhtml
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jCommandButton/TestA4JCommandButton.java
Log:
* sample for a4j:commandButton fixed
* added 8 new tests for command button
* refactoring of tests
Modified: modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/A4JCommandButtonBean.properties
===================================================================
--- modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/A4JCommandButtonBean.properties 2011-01-14 16:24:44 UTC (rev 21034)
+++ modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/A4JCommandButtonBean.properties 2011-01-14 17:05:06 UTC (rev 21035)
@@ -8,8 +8,8 @@
attr.actionListener.toUpperCaseActionListener=toUpperCaseActionListener
attr.actionListener.null=
-attr.styleClass.bold=bold
-attr.styleClass.strike=strike
-attr.styleClass.big=big
-attr.styleClass.wide=wide
-attr.styleClass.none=
\ No newline at end of file
+attr.type.submit=submit
+attr.type.button=button
+attr.type.reset=reset
+attr.type.nonvalid=nonvalid
+attr.type.null=
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jCommandButton/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jCommandButton/simple.xhtml 2011-01-14 16:24:44 UTC (rev 21034)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jCommandButton/simple.xhtml 2011-01-14 17:05:06 UTC (rev 21035)
@@ -6,7 +6,7 @@
<!--
JBoss, Home of Professional Open Source
-Copyright 2010, Red Hat, Inc. and individual contributors
+Copyright 2010-2011, Red Hat, Inc. and individual contributors
by the @authors tag. See the copyright.txt in the distribution for a
full listing of individual contributors.
@@ -34,8 +34,6 @@
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
-
- <h:outputStylesheet library="css" name="a4jCommandButton.css"/>
</ui:define>
<ui:define name="outOfTemplateBefore">
Deleted: modules/tests/metamer/trunk/application/src/main/webapp/resources/css/a4jCommandButton.css
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/resources/css/a4jCommandButton.css 2011-01-14 16:24:44 UTC (rev 21034)
+++ modules/tests/metamer/trunk/application/src/main/webapp/resources/css/a4jCommandButton.css 2011-01-14 17:05:06 UTC (rev 21035)
@@ -1,16 +0,0 @@
-.big {
- height: 40px;
- width: 200px;
-}
-
-.wide {
- width: 200px;
-}
-
-.bold {
- font-weight: bold;
-}
-
-.strike {
- text-decoration: line-through;
-}
\ No newline at end of file
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jCommandButton/TestA4JCommandButton.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jCommandButton/TestA4JCommandButton.java 2011-01-14 16:24:44 UTC (rev 21034)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jCommandButton/TestA4JCommandButton.java 2011-01-14 17:05:06 UTC (rev 21035)
@@ -1,6 +1,6 @@
/*******************************************************************************
* JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc. and individual contributors
+ * Copyright 2010-2011, Red Hat, Inc. and individual contributors
* by the @authors tag. See the copyright.txt in the distribution for a
* full listing of individual contributors.
*
@@ -19,17 +19,23 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*******************************************************************************/
-
package org.richfaces.tests.metamer.ftest.a4jCommandButton;
+import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guardNoRequest;
+import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guardXhr;
+import static org.jboss.test.selenium.locator.LocatorFactory.jq;
+import static org.jboss.test.selenium.locator.option.OptionLocatorFactory.optionLabel;
import static org.jboss.test.selenium.utils.URLUtils.buildUrl;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
import java.net.URL;
+import javax.faces.event.PhaseId;
+
import org.jboss.test.selenium.dom.Event;
+import org.jboss.test.selenium.encapsulated.JavaScript;
import org.jboss.test.selenium.locator.Attribute;
import org.jboss.test.selenium.locator.AttributeLocator;
import org.jboss.test.selenium.locator.JQueryLocator;
@@ -58,8 +64,8 @@
@Test(groups = "client-side-perf")
public void testSimpleClick() {
- selenium.typeKeys(input, "RichFaces 4");
- selenium.click(button);
+ guardNoRequest(selenium).typeKeys(input, "RichFaces 4");
+ guardXhr(selenium).click(button);
waitGui.until(textEquals.locator(output1).text("RichFaces 4"));
@@ -76,8 +82,8 @@
@Test
@IssueTracking("https://issues.jboss.org/browse/RF-9665")
public void testSimpleClickUnicode() {
- selenium.typeKeys(input, "ľščťžýáíéňô");
- selenium.click(button);
+ guardNoRequest(selenium).typeKeys(input, "ľščťžýáíéňô");
+ guardXhr(selenium).click(button);
waitGui.until(textEquals.locator(output1).text("ľščťžýáíéňô"));
@@ -93,31 +99,27 @@
@Test
public void testAction() {
- JQueryLocator doubleStringAction = pjq("input[value=doubleStringAction]");
- JQueryLocator first6CharsAction = pjq("input[value=first6CharsAction]");
- JQueryLocator toUpperCaseAction = pjq("input[value=toUpperCaseAction]");
-
- selenium.click(doubleStringAction);
- selenium.waitForPageToLoad(TIMEOUT);
+ selenium.click(pjq("input[name$=actionInput][value=doubleStringAction]"));
+ selenium.waitForPageToLoad();
selenium.typeKeys(input, "RichFaces 4");
- selenium.click(button);
+ guardXhr(selenium).click(button);
waitGui.until(textEquals.locator(output1).text("RichFaces 4"));
String output = selenium.getText(output2);
assertEquals(output, "RichFaces 4RichFaces 4",
- "output2 when 'RichFaces 4' in input and doubleStringAction selected");
+ "output2 when 'RichFaces 4' in input and doubleStringAction selected");
- selenium.click(first6CharsAction);
- selenium.waitForPageToLoad(TIMEOUT);
+ selenium.click(pjq("input[name$=actionInput][value=first6CharsAction]"));
+ selenium.waitForPageToLoad();
selenium.typeKeys(input, "RichFaces 4ň");
- selenium.click(button);
+ guardXhr(selenium).click(button);
waitGui.until(textEquals.locator(output1).text("RichFaces 4ň"));
output = selenium.getText(output2);
assertEquals(output, "RichFa", "output2 when 'RichFaces 4ň' in input and first6CharsAction selected");
- selenium.click(toUpperCaseAction);
- selenium.waitForPageToLoad(TIMEOUT);
+ selenium.click(pjq("input[name$=actionInput][value=toUpperCaseAction]"));
+ selenium.waitForPageToLoad();
selenium.typeKeys(input, "RichFaces 4ě");
- selenium.click(button);
+ guardXhr(selenium).click(button);
waitGui.until(textEquals.locator(output1).text("RichFaces 4ě"));
output = selenium.getText(output2);
assertEquals(output, "RICHFACES 4Ě", "output2 when 'RichFaces 4ě' in input and toUpperCaseAction selected");
@@ -125,50 +127,160 @@
@Test
public void testActionListener() {
- JQueryLocator doubleStringActionListener = pjq("input[value=doubleStringActionListener]");
- JQueryLocator first6CharsActionListener = pjq("input[value=first6CharsActionListener]");
- JQueryLocator toUpperCaseActionListener = pjq("input[value=toUpperCaseActionListener]");
-
- selenium.click(doubleStringActionListener);
- selenium.waitForPageToLoad(TIMEOUT);
+ selenium.click(pjq("input[name$=actionListenerInput][value=doubleStringActionListener]"));
+ selenium.waitForPageToLoad();
selenium.typeKeys(input, "RichFaces 4");
- selenium.click(button);
+ guardXhr(selenium).click(button);
waitGui.until(textEquals.locator(output1).text("RichFaces 4"));
String output = selenium.getText(output3);
assertEquals(output, "RichFaces 4RichFaces 4",
- "output2 when 'RichFaces 4' in input and doubleStringActionListener selected");
+ "output2 when 'RichFaces 4' in input and doubleStringActionListener selected");
- selenium.click(first6CharsActionListener);
- selenium.waitForPageToLoad(TIMEOUT);
+ selenium.click(pjq("input[name$=actionListenerInput][value=first6CharsActionListener]"));
+ selenium.waitForPageToLoad();
selenium.typeKeys(input, "RichFaces 4ň");
- selenium.click(button);
+ guardXhr(selenium).click(button);
waitGui.until(textEquals.locator(output1).text("RichFaces 4ň"));
output = selenium.getText(output3);
assertEquals(output, "RichFa", "output2 when 'RichFaces 4ň' in input and first6CharsActionListener selected");
- selenium.click(toUpperCaseActionListener);
- selenium.waitForPageToLoad(TIMEOUT);
+ selenium.click(pjq("input[name$=actionListenerInput][value=toUpperCaseActionListener]"));
+ selenium.waitForPageToLoad();
selenium.typeKeys(input, "RichFaces 4ě");
- selenium.click(button);
+ guardXhr(selenium).click(button);
waitGui.until(textEquals.locator(output1).text("RichFaces 4ě"));
output = selenium.getText(output3);
assertEquals(output, "RICHFACES 4Ě",
- "output2 when 'RichFaces 4ě' in input and toUpperCaseActionListener selected");
+ "output2 when 'RichFaces 4ě' in input and toUpperCaseActionListener selected");
}
@Test
+ public void testBypassUpdates() {
+ selenium.click(pjq("input[type=radio][name$=bypassUpdatesInput][value=true]"));
+ selenium.waitForPageToLoad();
+
+ String reqTime = selenium.getText(time);
+ guardXhr(selenium).click(button);
+ waitGui.failWith("Page was not updated").waitForChange(reqTime, retrieveText.locator(time));
+
+ assertEquals(selenium.getText(output1), "", "Output 1 should not change");
+ assertEquals(selenium.getText(output2), "", "Output 2 should not change");
+ assertEquals(selenium.getText(output3), "", "Output 3 should not change");
+ assertPhases(PhaseId.RESTORE_VIEW, PhaseId.APPLY_REQUEST_VALUES, PhaseId.PROCESS_VALIDATIONS,
+ PhaseId.RENDER_RESPONSE);
+
+ String listenerOutput = selenium.getText(jq("div#phasesPanel li:eq(3)"));
+ assertEquals(listenerOutput, "* action listener invoked", "Action listener's output");
+ listenerOutput = selenium.getText(jq("div#phasesPanel li:eq(4)"));
+ assertEquals(listenerOutput, "* action invoked", "Action's output");
+ }
+
+ @Test
+ public void testData() {
+ selenium.type(pjq("input[type=text][id$=dataInput]"), "RichFaces 4");
+ selenium.waitForPageToLoad();
+
+ selenium.type(pjq("input[type=text][id$=oncompleteInput]"), "data = event.data");
+ selenium.waitForPageToLoad();
+
+ String reqTime = selenium.getText(time);
+
+ selenium.type(input, "some input text");
+ guardXhr(selenium).click(button);
+ waitGui.failWith("Page was not updated").waitForChange(reqTime, retrieveText.locator(time));
+
+ String data = selenium.getEval(new JavaScript("window.data"));
+ assertEquals(data, "RichFaces 4", "Data sent with ajax request");
+ }
+
+ @Test
public void testDisabled() {
- JQueryLocator disabledCheckbox = pjq("input[type=radio][name$=disabledInput][value=true]");
- AttributeLocator<?> disabledAttribute = button.getAttribute(new Attribute("disabled"));
+ AttributeLocator disabledAttribute = button.getAttribute(new Attribute("disabled"));
- selenium.click(disabledCheckbox);
- selenium.waitForPageToLoad(TIMEOUT);
+ selenium.click(pjq("input[name$=disabledInput][value=true]"));
+ selenium.waitForPageToLoad();
String isDisabled = selenium.getAttribute(disabledAttribute);
assertEquals(isDisabled.toLowerCase(), "disabled", "The value of attribute disabled");
}
@Test
+ public void testExecute() {
+ selenium.type(pjq("input[type=text][id$=executeInput]"), "input executeChecker");
+ selenium.waitForPageToLoad();
+
+ selenium.type(input, "RichFaces 4");
+ guardXhr(selenium).click(button);
+ waitGui.failWith("Page was not updated").waitForChangeAndReturn("", retrieveText.locator(output1));
+
+ JQueryLocator logItems = jq("ul.phases-list li:eq({0})");
+ for (int i = 0; i < 6; i++) {
+ if ("* executeChecker".equals(selenium.getText(logItems.format(i)))) {
+ return;
+ }
+ }
+
+ fail("Attribute execute does not work");
+ }
+
+ @Test
+ public void testImmediate() {
+ selenium.click(pjq("input[type=radio][name$=immediateInput][value=true]"));
+ selenium.waitForPageToLoad();
+
+ String reqTime = selenium.getText(time);
+ guardXhr(selenium).click(button);
+ waitGui.failWith("Page was not updated").waitForChange(reqTime, retrieveText.locator(time));
+
+ assertEquals(selenium.getText(output1), "", "Output 1 should not change");
+ assertEquals(selenium.getText(output2), "", "Output 2 should not change");
+ assertEquals(selenium.getText(output3), "", "Output 3 should not change");
+ assertPhases(PhaseId.RESTORE_VIEW, PhaseId.APPLY_REQUEST_VALUES, PhaseId.RENDER_RESPONSE);
+
+ String listenerOutput = selenium.getText(jq("div#phasesPanel li:eq(2)"));
+ assertEquals(listenerOutput, "* action listener invoked", "Action listener's output");
+ listenerOutput = selenium.getText(jq("div#phasesPanel li:eq(3)"));
+ assertEquals(listenerOutput, "* action invoked", "Action's output");
+ }
+
+ @Test
+ public void testLimitRender() {
+ selenium.click(pjq("input[type=radio][name$=limitRenderInput][value=true]"));
+ selenium.waitForPageToLoad();
+
+ String timeValue = selenium.getText(time);
+
+ selenium.type(input, "RichFaces 4");
+ guardXhr(selenium).click(button);
+ waitGui.failWith("Page was not updated").waitForChange("", retrieveText.locator(output1));
+
+ assertEquals(selenium.getText(time), timeValue, "Ajax-rendered a4j:outputPanel shouldn't change");
+ }
+
+ @Test
+ public void testEvents() {
+ selenium.type(pjq("input[type=text][id$=onbeginInput]"), "metamerEvents += \"begin \"");
+ selenium.waitForPageToLoad();
+ selenium.type(pjq("input[type=text][id$=onbeforedomupdateInput]"), "metamerEvents += \"beforedomupdate \"");
+ selenium.waitForPageToLoad();
+ selenium.type(pjq("input[type=text][id$=oncompleteInput]"), "metamerEvents += \"complete \"");
+ selenium.waitForPageToLoad();
+
+ selenium.getEval(new JavaScript("window.metamerEvents = \"\";"));
+
+ selenium.type(input, "RichFaces 4");
+ guardXhr(selenium).click(button);
+ waitGui.failWith("Page was not updated").waitForChange("", retrieveText.locator(output1));
+
+ String[] events = selenium.getEval(new JavaScript("window.metamerEvents")).split(" ");
+
+ assertEquals(events.length, 3, "3 events should be fired.");
+ assertEquals(events[0], "begin", "Attribute onbegin doesn't work");
+ assertEquals(events[1], "beforedomupdate", "Attribute onbeforedomupdate doesn't work");
+ assertEquals(events[2], "complete", "Attribute oncomplete doesn't work");
+ }
+
+ @Test
public void testOnclick() {
testFireEvent(Event.CLICK, button);
}
@@ -223,10 +335,10 @@
JQueryLocator renderInput = pjq("input[name$=renderInput]");
selenium.type(renderInput, "output1");
- selenium.waitForPageToLoad(TIMEOUT);
+ selenium.waitForPageToLoad();
selenium.typeKeys(input, "aaa");
- selenium.click(button);
+ guardXhr(selenium).click(button);
waitGui.until(textEquals.locator(output1).text("aaa"));
@@ -240,10 +352,10 @@
assertEquals(output, "", "output3 when 'aaa' in input and 'output1' set to be rerendered");
selenium.type(renderInput, "output2 output3");
- selenium.waitForPageToLoad(TIMEOUT);
+ selenium.waitForPageToLoad();
selenium.typeKeys(input, "bbb");
- selenium.click(button);
+ guardXhr(selenium).click(button);
waitGui.until(textEquals.locator(output2).text("bbb"));
@@ -260,57 +372,60 @@
@Test
public void testRendered() {
- JQueryLocator renderedCheckbox = pjq("input[name$=renderedInput]");
-
- selenium.click(renderedCheckbox);
- selenium.waitForPageToLoad(TIMEOUT);
+ selenium.click(pjq("input[name$=renderedInput][value=false]"));
+ selenium.waitForPageToLoad();
assertFalse(selenium.isElementPresent(button), "Button should not be displayed");
}
@Test
+ public void testStyle() {
+ testStyle(button, "style");
+ }
+
+ @Test
@IssueTracking("https://issues.jboss.org/browse/RF-9307")
public void testStyleClass() {
- JQueryLocator wide = pjq("input[name$=styleClassInput][value=wide]");
- JQueryLocator big = pjq("input[name$=styleClassInput][value=big]");
- JQueryLocator none = pjq("input[name$=styleClassInput][value=]");
+ testStyleClass(button, "styleClass");
+ }
- final AttributeLocator<?> classAttribute = button.getAttribute(new Attribute("class"));
+ @Test
+ public void testTitle() {
+ testTitle(button);
+ }
- selenium.click(wide);
- selenium.waitForPageToLoad(TIMEOUT);
- assertTrue(selenium.belongsClass(button, "wide"), "Button's class was not changed to 'wide'");
+ @Test
+ @IssueTracking("https://issues.jboss.org/browse/RF-10115")
+ public void testType() {
+ AttributeLocator attr = button.getAttribute(Attribute.TYPE);
+ JQueryLocator typeInput = pjq("select[id$=typeInput]");
- selenium.click(big);
- selenium.waitForPageToLoad(TIMEOUT);
- assertTrue(selenium.belongsClass(button, "big"), "Button's class was not changed to 'big'");
+ selenium.select(typeInput, optionLabel("nonvalid"));
+ selenium.waitForPageToLoad();
+ assertEquals(selenium.getAttribute(attr), "submit", "Button's type");
- selenium.click(none);
- selenium.waitForPageToLoad(TIMEOUT);
- assertFalse(selenium.isAttributePresent(classAttribute), "Button's class was not removed.");
- }
+ selenium.select(typeInput, optionLabel("reset"));
+ selenium.waitForPageToLoad();
+ assertEquals(selenium.getAttribute(attr), "reset", "Button's type");
- @Test
- public void testStyle() {
- JQueryLocator styleInput = pjq("input[id$=styleInput]");
- final AttributeLocator<?> attribute = button.getAttribute(new Attribute("style"));
- final String value = "font-size: 20px;";
+ selenium.select(typeInput, optionLabel("submit"));
+ selenium.waitForPageToLoad();
+ assertEquals(selenium.getAttribute(attr), "submit", "Button's type");
- selenium.type(styleInput, value);
- selenium.waitForPageToLoad(TIMEOUT);
-
- assertEquals(selenium.getAttribute(attribute), value, "Style of the button did not change");
+ selenium.select(typeInput, optionLabel("button"));
+ selenium.waitForPageToLoad();
+ assertEquals(selenium.getAttribute(attr), "button", "Button's type");
+
+ selenium.select(typeInput, optionLabel("null"));
+ selenium.waitForPageToLoad();
+ assertEquals(selenium.getAttribute(attr), "submit", "Button's type");
}
@Test
public void testValue() {
- JQueryLocator valueInput = pjq("input[id$=valueInput]");
- final AttributeLocator<?> attribute = button.getAttribute(new Attribute("value"));
- final String value = "new label";
+ selenium.type(pjq("input[id$=valueInput]"), "new label");
+ selenium.waitForPageToLoad(TIMEOUT);
- selenium.type(valueInput, value);
- selenium.waitForPageToLoad(TIMEOUT);
-
- assertEquals(selenium.getAttribute(attribute), value, "Value of the button did not change");
+ AttributeLocator attribute = button.getAttribute(new Attribute("value"));
+ assertEquals(selenium.getAttribute(attribute), "new label", "Value of the button did not change.");
}
-
}
13 years, 11 months
JBoss Rich Faces SVN: r21034 - trunk/ui/input/ui/src/main/templates.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2011-01-14 11:24:44 -0500 (Fri, 14 Jan 2011)
New Revision: 21034
Modified:
trunk/ui/input/ui/src/main/templates/inputnumberspinner.template.xml
Log:
RF-10095
Modified: trunk/ui/input/ui/src/main/templates/inputnumberspinner.template.xml
===================================================================
--- trunk/ui/input/ui/src/main/templates/inputnumberspinner.template.xml 2011-01-14 16:02:27 UTC (rev 21033)
+++ trunk/ui/input/ui/src/main/templates/inputnumberspinner.template.xml 2011-01-14 16:24:44 UTC (rev 21034)
@@ -39,12 +39,14 @@
</cc:interface>
<cc:implementation>
<span id="#{clientId}" class="rf-insp #{component.attributes['styleClass']}" cdk:passThroughWithExclusions="id class" >
+ <cdk:object name="inputSize" type="Integer" cast="true" value="#{component.attributes['inputSize']}" />
<input name="#{clientId}" type="text"
class="rf-insp-inp #{component.attributes['inputClass']}" value="#{getInputValue(facesContext, component)}"
cdk:passThrough="accesskey disabled maxlength onblur onfocus onclick:oninputclick ondblclick:oninputdblclick onkeydown:oninputkeydown
onkeypress:oninputkeypress onkeyup:oninputkeyup onmousedown:oninputmousedown onmousemove:oninputmousemove onmouseout:oninputmouseout
- onmouseover:oninputmouseover onmouseup:oninputmouseup onselect size:inputSize tabindex"
- readonly="#{!component.attributes['enableManualInput']}" autocomplete="#{component.attributes['disableBrowserAutoComplete'] ? 'off' : ''}" />
+ onmouseover:oninputmouseover onmouseup:oninputmouseup onselect tabindex"
+ readonly="#{!component.attributes['enableManualInput']}" autocomplete="#{component.attributes['disableBrowserAutoComplete'] ? 'off' : ''}"
+ size="#{inputSize > 0 ? inputSize : null}"/>
<span class="rf-insp-btns">
<span class="rf-insp-inc#{component.attributes['disabled'] ? '-dis' : ''}" cdk:passThrough="onclick:onupclick" />
<span class="rf-insp-dec#{component.attributes['disabled'] ? '-dis' : ''}" cdk:passThrough="onclick:ondownclick" />
13 years, 11 months
JBoss Rich Faces SVN: r21033 - modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTable.
by richfaces-svn-commits＠lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2011-01-14 11:02:27 -0500 (Fri, 14 Jan 2011)
New Revision: 21033
Added:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTable/TestCollapsibleSubTableScroller.java
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTable/AbstractCollapsibleSubTableTest.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTable/CollapsibleSubTableAttributes.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTable/TestCollapsibleSubTableFacets.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTable/TestCollapsibleSubTableSimple.java
Log:
rich:collapsibleSubTable - automated Scroller sample (RFPL-731)
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTable/AbstractCollapsibleSubTableTest.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTable/AbstractCollapsibleSubTableTest.java 2011-01-14 16:01:38 UTC (rev 21032)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTable/AbstractCollapsibleSubTableTest.java 2011-01-14 16:02:27 UTC (rev 21033)
@@ -1,3 +1,24 @@
+/*******************************************************************************
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc. and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ *******************************************************************************/
package org.richfaces.tests.metamer.ftest.richCollapsibleSubTable;
import java.util.LinkedList;
@@ -3,4 +24,6 @@
import java.util.List;
+import org.jboss.test.selenium.request.RequestType;
+import org.richfaces.ExpandMode;
import org.richfaces.tests.metamer.bean.Model;
import org.richfaces.tests.metamer.ftest.AbstractMetamerTest;
@@ -17,6 +40,10 @@
import com.google.common.base.Predicate;
import com.google.common.collect.Collections2;
+/**
+ * @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a>
+ * @version $Revision$
+ */
public abstract class AbstractCollapsibleSubTableTest extends AbstractMetamerTest {
private static final List<Employee> EMPLOYEES = Model.unmarshallEmployees();
@@ -39,6 +66,10 @@
CollapsibleSubTable secondSubtable;
CollapsibleSubTableToggler secondToggler;
+ @Inject
+ @Use(empty = true)
+ ExpandMode expandMode;
+
@BeforeMethod
public void configure() {
if (configuration != null) {
@@ -77,4 +108,15 @@
return name;
}
}
+
+ protected RequestType getRequestTypeForExpandMode() {
+ switch (expandMode) {
+ case ajax:
+ return RequestType.XHR;
+ case server:
+ return RequestType.HTTP;
+ default:
+ return RequestType.NONE;
+ }
+ }
}
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTable/CollapsibleSubTableAttributes.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTable/CollapsibleSubTableAttributes.java 2011-01-14 16:01:38 UTC (rev 21032)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTable/CollapsibleSubTableAttributes.java 2011-01-14 16:02:27 UTC (rev 21033)
@@ -1,3 +1,24 @@
+/*******************************************************************************
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc. and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ *******************************************************************************/
package org.richfaces.tests.metamer.ftest.richCollapsibleSubTable;
import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guardXhr;
@@ -11,6 +32,10 @@
import org.richfaces.model.SortMode;
import org.richfaces.tests.metamer.ftest.AbstractComponentAttributes;
+/**
+ * @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a>
+ * @version $Revision$
+ */
public class CollapsibleSubTableAttributes extends AbstractComponentAttributes {
JQueryLocator showDataLocator = pjq("input[id$=noDataCheckbox]");
@@ -43,6 +68,10 @@
public void setRows(Integer rows) {
setProperty("rows", rows);
}
+
+ public Integer getRows() {
+ return Integer.valueOf(getProperty("rows"));
+ }
public void setSortMode(SortMode sortMode) {
setProperty("sortMode", sortMode);
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTable/TestCollapsibleSubTableFacets.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTable/TestCollapsibleSubTableFacets.java 2011-01-14 16:01:38 UTC (rev 21032)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTable/TestCollapsibleSubTableFacets.java 2011-01-14 16:02:27 UTC (rev 21033)
@@ -1,3 +1,24 @@
+/*******************************************************************************
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc. and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ *******************************************************************************/
package org.richfaces.tests.metamer.ftest.richCollapsibleSubTable;
import static org.jboss.test.selenium.utils.URLUtils.buildUrl;
@@ -9,6 +30,10 @@
import org.testng.annotations.Test;
+/**
+ * @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a>
+ * @version $Revision$
+ */
public class TestCollapsibleSubTableFacets extends AbstractCollapsibleSubTableTest {
private static final String SAMPLE_STRING = "Abc123!@#ĚščСам";
Added: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTable/TestCollapsibleSubTableScroller.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTable/TestCollapsibleSubTableScroller.java (rev 0)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTable/TestCollapsibleSubTableScroller.java 2011-01-14 16:02:27 UTC (rev 21033)
@@ -0,0 +1,144 @@
+/*******************************************************************************
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc. and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ *******************************************************************************/
+package org.richfaces.tests.metamer.ftest.richCollapsibleSubTable;
+
+import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guard;
+import static org.jboss.test.selenium.locator.LocatorFactory.jq;
+import static org.jboss.test.selenium.utils.URLUtils.buildUrl;
+import static org.testng.Assert.assertEquals;
+
+import java.net.URL;
+import java.util.List;
+
+import org.jboss.test.selenium.request.RequestType;
+import org.richfaces.ExpandMode;
+import org.richfaces.tests.metamer.ftest.annotations.Inject;
+import org.richfaces.tests.metamer.ftest.annotations.Use;
+import org.richfaces.tests.metamer.ftest.model.DataScroller;
+import org.richfaces.tests.metamer.ftest.richDataScroller.PaginationTester;
+import org.richfaces.tests.metamer.model.Employee;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+/**
+ * @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a>
+ * @version $Revision$
+ */
+public class TestCollapsibleSubTableScroller extends AbstractCollapsibleSubTableTest {
+
+ DataScroller dataScroller;
+ DataScroller secondDataScroller;
+ PaginationTester paginationTester;
+
+ int rows = 5;
+
+ @Inject
+ @Use(booleans = { true, false })
+ boolean paralelScrolling;
+
+ @Override
+ public URL getTestUrl() {
+ return buildUrl(contextPath, "faces/components/richCollapsibleSubTable/scroller.xhtml");
+ }
+
+ @BeforeMethod
+ public void prepareComponent() {
+ if (paralelScrolling) {
+ paginationTester = new ParallelScrollingTester();
+ } else {
+ paginationTester = new BasicPaginationTester();
+ }
+
+ attributes.setExpandMode(expandMode);
+
+ dataScroller = new DataScroller(subtable.getFooter().getChild(jq("span.rf-ds")));
+ secondDataScroller = new DataScroller(secondSubtable.getFooter().getChild(jq("span.rf-ds")));
+
+ paginationTester.setDataScroller(dataScroller);
+
+ attributes.setRows(rows);
+
+ int lastPage = dataScroller.obtainLastPage();
+ dataScroller.setLastPage(lastPage);
+ paginationTester.initializeTestedPages(lastPage);
+
+ secondDataScroller.setLastPage(secondDataScroller.obtainLastPage());
+ }
+
+ @Test
+ @Use(field = "expandMode", enumeration = true)
+ public void testScrollerWithRowsAttribute() {
+ paginationTester.testNumberedPages();
+ }
+
+ public class BasicPaginationTester extends PaginationTester {
+
+ int secondScrollerPage;
+ String secondSubtableText;
+
+ @Override
+ protected void verifyBeforeScrolling() {
+ secondScrollerPage = secondDataScroller.getCurrentPage();
+ secondSubtableText = selenium.getText(secondSubtable);
+ }
+
+ @Override
+ protected void verifyAfterScrolling() {
+ if (expandMode != ExpandMode.none) {
+ final RequestType requestType = getRequestTypeForExpandMode();
+ guard(selenium, requestType).click(toggler);
+ guard(selenium, requestType).click(toggler);
+ }
+
+ assertEquals(secondDataScroller.getCurrentPage(), secondScrollerPage);
+ assertEquals(selenium.getText(secondSubtable), secondSubtableText);
+
+ int start = (dataScroller.getCurrentPage() - 1) * rows;
+ int end = Math.min(start + rows, employees.size());
+ int count = end - start;
+ List<Employee> visibleEmployees = employees.subList(start, end);
+
+ assertEquals(subtable.getRowCount(), count);
+
+ for (int i = 0; i < count; i++) {
+ String name = selenium.getText(subtable.getCell(1, i + 1));
+ String title = selenium.getText(subtable.getCell(2, i + 1));
+
+ assertEquals(name, visibleEmployees.get(i).getName());
+ assertEquals(title, visibleEmployees.get(i).getTitle());
+ }
+ }
+ }
+
+ public class ParallelScrollingTester extends BasicPaginationTester {
+
+ int notrandomizer = (Integer.MAX_VALUE - 17) * 13;
+
+ @Override
+ protected void verifyBeforeScrolling() {
+ notrandomizer *= 177;
+ int page = (Math.abs(notrandomizer) % secondDataScroller.getLastPage()) + 1;
+ secondDataScroller.gotoPage(page);
+ super.verifyBeforeScrolling();
+ }
+ }
+}
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTable/TestCollapsibleSubTableSimple.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTable/TestCollapsibleSubTableSimple.java 2011-01-14 16:01:38 UTC (rev 21032)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTable/TestCollapsibleSubTableSimple.java 2011-01-14 16:02:27 UTC (rev 21033)
@@ -1,3 +1,24 @@
+/*******************************************************************************
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc. and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ *******************************************************************************/
package org.richfaces.tests.metamer.ftest.richCollapsibleSubTable;
import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guard;
@@ -13,12 +34,15 @@
import org.jboss.test.selenium.request.RequestType;
import org.richfaces.ExpandMode;
import org.richfaces.component.UICollapsibleSubTable;
-import org.richfaces.tests.metamer.ftest.annotations.Inject;
import org.richfaces.tests.metamer.ftest.annotations.IssueTracking;
import org.richfaces.tests.metamer.ftest.annotations.Use;
import org.richfaces.tests.metamer.model.Employee;
import org.testng.annotations.Test;
+/**
+ * @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a>
+ * @version $Revision$
+ */
public class TestCollapsibleSubTableSimple extends AbstractCollapsibleSubTableTest {
@Override
@@ -26,10 +50,6 @@
return buildUrl(contextPath, "faces/components/richCollapsibleSubTable/simple.xhtml");
}
- @Inject
- @Use(empty = true)
- ExpandMode expandMode;
-
@Test
@Use(field = "expandMode", enumeration = true)
@IssueTracking("https://issues.jboss.org/browse/RF-10181")
@@ -133,15 +153,4 @@
// TODO classes are currently not working
fail();
}
-
- private RequestType getRequestTypeForExpandMode() {
- switch (expandMode) {
- case ajax:
- return RequestType.XHR;
- case server:
- return RequestType.HTTP;
- default:
- return RequestType.NONE;
- }
- }
}
13 years, 11 months
JBoss Rich Faces SVN: r21032 - modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model.
by richfaces-svn-commits＠lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2011-01-14 11:01:38 -0500 (Fri, 14 Jan 2011)
New Revision: 21032
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/DataScroller.java
Log:
fixed datascroller locators
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/DataScroller.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/DataScroller.java 2011-01-14 16:00:47 UTC (rev 21031)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/DataScroller.java 2011-01-14 16:01:38 UTC (rev 21032)
@@ -46,10 +46,10 @@
ReferencedLocator<JQueryLocator> numberedPages = ref(root, "> .rf-ds-nmb-btn");
ReferencedLocator<JQueryLocator> specificNumberedPage = ref(root, "> .rf-ds-nmb-btn:textEquals('{0}')");
- ReferencedLocator<JQueryLocator> firstPageButton = ref(root, "> .rf-ds-lft[id$=ds_f]");
- ReferencedLocator<JQueryLocator> fastRewindButton = ref(root, "> .rf-ds-lft[id$=ds_fr]");
- ReferencedLocator<JQueryLocator> fastForwardButton = ref(root, "> .rf-ds-rgh[id$=ds_ff]");
- ReferencedLocator<JQueryLocator> lastPageButton = ref(root, "> .rf-ds-rgh[id$=ds_l]");
+ ReferencedLocator<JQueryLocator> firstPageButton = ref(root, "> .rf-ds-btn-first");
+ ReferencedLocator<JQueryLocator> fastRewindButton = ref(root, "> .rf-ds-btn-fastrwd");
+ ReferencedLocator<JQueryLocator> fastForwardButton = ref(root, "> .rf-ds-btn-fastfwd");
+ ReferencedLocator<JQueryLocator> lastPageButton = ref(root, "> .rf-ds-btn-last");
ReferencedLocator<JQueryLocator> firstVisiblePage = ref(root, "> .rf-ds-nmb-btn:first");
ReferencedLocator<JQueryLocator> lastVisiblePage = ref(root, "> .rf-ds-nmb-btn:last");
13 years, 11 months
JBoss Rich Faces SVN: r21031 - in modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest: model and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2011-01-14 11:00:47 -0500 (Fri, 14 Jan 2011)
New Revision: 21031
Added:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTable/TestCollapsibleSubTableFacets.java
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/abstractions/DataTableFacets.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/CollapsibleSubTable.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTable/AbstractCollapsibleSubTableTest.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTable/CollapsibleSubTableAttributes.java
Log:
rich:collapsibleSubTable - automated Facets sample (RFPL-731)
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/abstractions/DataTableFacets.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/abstractions/DataTableFacets.java 2011-01-14 15:56:02 UTC (rev 21030)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/abstractions/DataTableFacets.java 2011-01-14 16:00:47 UTC (rev 21031)
@@ -39,6 +39,10 @@
public void setHeader(String header) {
setProperty("header", header);
}
+
+ public void setFooter(String footer) {
+ setProperty("footer", footer);
+ }
public void setStateHeader(String stateHeader) {
setProperty("stateHeader", stateHeader);
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/CollapsibleSubTable.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/CollapsibleSubTable.java 2011-01-14 15:56:02 UTC (rev 21030)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/CollapsibleSubTable.java 2011-01-14 16:00:47 UTC (rev 21031)
@@ -1,10 +1,13 @@
package org.richfaces.tests.metamer.ftest.model;
import static org.jboss.test.selenium.locator.LocatorFactory.jq;
+import static org.jboss.test.selenium.locator.reference.ReferencedLocator.ref;
import org.jboss.test.selenium.framework.AjaxSelenium;
import org.jboss.test.selenium.framework.AjaxSeleniumProxy;
+import org.jboss.test.selenium.locator.ExtendedLocator;
import org.jboss.test.selenium.locator.JQueryLocator;
+import org.jboss.test.selenium.locator.reference.ReferencedLocator;
public class CollapsibleSubTable extends AbstractModel<JQueryLocator> {
@@ -13,6 +16,10 @@
JQueryLocator subtableRow = jq("tr[class^=rf-cst][class$=-r]");
JQueryLocator subtableCell = jq("td.rf-cst-c");
+ ReferencedLocator<JQueryLocator> noData = ref(root, "> tr.rf-cst-nd > td.rf-cst-nd-c");
+ ReferencedLocator<JQueryLocator> header = ref(root, "> tr.rf-cst-hdr > td.rf-cst-hdr-c");
+ ReferencedLocator<JQueryLocator> footer = ref(root, "> tr.rf-cst-ftr > td.rf-cst-ftr-c");
+
JQueryLocator visible = jq("{0}:visible");
public CollapsibleSubTable(JQueryLocator root) {
@@ -40,4 +47,20 @@
public JQueryLocator getCell(int column, int row) {
return getRow(row).getChild(subtableCell).getNthOccurence(column);
}
+
+ public ExtendedLocator<JQueryLocator> getNoData() {
+ return noData;
+ }
+
+ public boolean isNoData() {
+ return selenium.isElementPresent(noData) && selenium.isVisible(noData);
+ }
+
+ public ExtendedLocator<JQueryLocator> getHeader() {
+ return header;
+ }
+
+ public ExtendedLocator<JQueryLocator> getFooter() {
+ return footer;
+ }
}
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTable/AbstractCollapsibleSubTableTest.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTable/AbstractCollapsibleSubTableTest.java 2011-01-14 15:56:02 UTC (rev 21030)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTable/AbstractCollapsibleSubTableTest.java 2011-01-14 16:00:47 UTC (rev 21031)
@@ -5,6 +5,7 @@
import org.richfaces.tests.metamer.bean.Model;
import org.richfaces.tests.metamer.ftest.AbstractMetamerTest;
+import org.richfaces.tests.metamer.ftest.abstractions.DataTableFacets;
import org.richfaces.tests.metamer.ftest.annotations.Inject;
import org.richfaces.tests.metamer.ftest.annotations.Use;
import org.richfaces.tests.metamer.ftest.model.CollapsibleSubTable;
@@ -21,7 +22,8 @@
private static final List<Employee> EMPLOYEES = Model.unmarshallEmployees();
CollapsibleSubTableAttributes attributes = new CollapsibleSubTableAttributes();
- DataTable model = new DataTable(pjq("table.rf-dt"));;
+ DataTable dataTable = new DataTable(pjq("table.rf-dt"));;
+ DataTableFacets facets = new DataTableFacets();
@Inject
@Use(value = "configuration*")
@@ -58,8 +60,8 @@
public Configuration(int i, String name) {
this.name = name;
- subtable = model.getSubtable(i);
- toggler = model.getToggler(i);
+ subtable = dataTable.getSubtable(i);
+ toggler = dataTable.getToggler(i);
final Employee.Sex sex = (i == 1) ? Employee.Sex.MALE : Employee.Sex.FEMALE;
employees = new LinkedList<Employee>(Collections2.filter(EMPLOYEES, new Predicate<Employee>() {
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTable/CollapsibleSubTableAttributes.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTable/CollapsibleSubTableAttributes.java 2011-01-14 15:56:02 UTC (rev 21030)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTable/CollapsibleSubTableAttributes.java 2011-01-14 16:00:47 UTC (rev 21031)
@@ -1,12 +1,25 @@
package org.richfaces.tests.metamer.ftest.richCollapsibleSubTable;
+import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guardXhr;
+import static org.richfaces.tests.metamer.ftest.AbstractMetamerTest.pjq;
+
import java.util.Collection;
+import org.jboss.test.selenium.dom.Event;
+import org.jboss.test.selenium.locator.JQueryLocator;
import org.richfaces.ExpandMode;
import org.richfaces.model.SortMode;
import org.richfaces.tests.metamer.ftest.AbstractComponentAttributes;
public class CollapsibleSubTableAttributes extends AbstractComponentAttributes {
+
+ JQueryLocator showDataLocator = pjq("input[id$=noDataCheckbox]");
+
+ public void setShowData(boolean showData) {
+ selenium.check(showDataLocator, showData);
+ guardXhr(selenium).fireEvent(showDataLocator, Event.CLICK);
+ }
+
public void setExpandMode(ExpandMode expandMode) {
setProperty("expandMode", expandMode);
}
Added: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTable/TestCollapsibleSubTableFacets.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTable/TestCollapsibleSubTableFacets.java (rev 0)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTable/TestCollapsibleSubTableFacets.java 2011-01-14 16:00:47 UTC (rev 21031)
@@ -0,0 +1,61 @@
+package org.richfaces.tests.metamer.ftest.richCollapsibleSubTable;
+
+import static org.jboss.test.selenium.utils.URLUtils.buildUrl;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
+
+import java.net.URL;
+
+import org.testng.annotations.Test;
+
+public class TestCollapsibleSubTableFacets extends AbstractCollapsibleSubTableTest {
+
+ private static final String SAMPLE_STRING = "Abc123!@#ĚščСам";
+ private static final String EMPTY_STRING = "";
+
+ @Override
+ public URL getTestUrl() {
+
+ return buildUrl(contextPath, "faces/components/richCollapsibleSubTable/facets.xhtml");
+ }
+
+ @Test
+ public void testNoDataFacet() {
+ assertTrue(subtable.hasVisibleRows());
+ attributes.setShowData(false);
+ assertFalse(subtable.hasVisibleRows());
+
+ assertTrue(subtable.isNoData());
+ assertEquals(selenium.getText(subtable.getNoData()), EMPTY_STRING);
+
+ facets.setNoData(SAMPLE_STRING);
+
+ attributes.setShowData(true);
+ assertTrue(subtable.hasVisibleRows());
+
+ attributes.setShowData(false);
+ assertFalse(subtable.hasVisibleRows());
+
+ assertTrue(subtable.isNoData());
+ assertEquals(selenium.getText(subtable.getNoData()), SAMPLE_STRING);
+ }
+
+ @Test
+ public void testHeaderInstantChange() {
+ facets.setHeader(SAMPLE_STRING);
+ assertEquals(selenium.getText(subtable.getHeader()), SAMPLE_STRING);
+
+ facets.setHeader(EMPTY_STRING);
+ assertEquals(selenium.getText(subtable.getHeader()), EMPTY_STRING);
+ }
+
+ @Test
+ public void testFooterInstantChange() {
+ facets.setFooter(SAMPLE_STRING);
+ assertEquals(selenium.getText(subtable.getFooter()), SAMPLE_STRING);
+
+ facets.setFooter(EMPTY_STRING);
+ assertEquals(selenium.getText(subtable.getFooter()), EMPTY_STRING);
+ }
+}
13 years, 11 months
JBoss Rich Faces SVN: r21030 - trunk/examples/richfaces-showcase.
by richfaces-svn-commits＠lists.jboss.org
Author: artdaw
Date: 2011-01-14 10:56:02 -0500 (Fri, 14 Jan 2011)
New Revision: 21030
Modified:
trunk/examples/richfaces-showcase/pom.xml
Log:
RF-9673: the problem is with wrong web.xml that comes from default profile instead of 'gae'. This problem is fixed.
Modified: trunk/examples/richfaces-showcase/pom.xml
===================================================================
--- trunk/examples/richfaces-showcase/pom.xml 2011-01-14 15:35:34 UTC (rev 21029)
+++ trunk/examples/richfaces-showcase/pom.xml 2011-01-14 15:56:02 UTC (rev 21030)
@@ -211,10 +211,10 @@
<configuration>
<webResources>
<resource>
- <directory>src/main/webapp-gae</directory>
+ <directory>src/main/webapp</directory>
</resource>
<resource>
- <directory>src/main/webapp</directory>
+ <directory>src/main/webapp-gae</directory>
</resource>
<resource>
<directory>${project.build.directory}/generated-resources</directory>
@@ -231,8 +231,6 @@
<groupId>org.richfaces.cdk</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>${project.version}</version>
- <configuration>
- </configuration>
<executions>
<execution>
<id>process</id>
13 years, 11 months
JBoss Rich Faces SVN: r21029 - in modules/tests/metamer/trunk/application/src/main: webapp/components/richInputNumberSlider and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2011-01-14 10:35:34 -0500 (Fri, 14 Jan 2011)
New Revision: 21029
Modified:
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInputNumberSliderBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInputNumberSpinnerBean.java
modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSpinner/simple.xhtml
Log:
* samples for spinner and slider fixed
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInputNumberSliderBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInputNumberSliderBean.java 2011-01-14 15:28:34 UTC (rev 21028)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInputNumberSliderBean.java 2011-01-14 15:35:34 UTC (rev 21029)
@@ -1,6 +1,6 @@
/*******************************************************************************
* JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc. and individual contributors
+ * Copyright 2010-2011, Red Hat, Inc. and individual contributors
* by the @authors tag. See the copyright.txt in the distribution for a
* full listing of individual contributors.
*
@@ -54,7 +54,7 @@
logger = LoggerFactory.getLogger(getClass());
logger.debug("initializing bean " + getClass().getName());
- attributes = Attributes.getComponentAttributesFromClass(HtmlInputNumberSlider.class, getClass());
+ attributes = Attributes.getComponentAttributesFromFacesConfig(HtmlInputNumberSlider.class, getClass());
attributes.setAttribute("enableManualInput", true);
attributes.setAttribute("inputSize", 3);
@@ -67,10 +67,8 @@
attributes.setAttribute("step", 1);
attributes.setAttribute("value", 2);
- attributes.remove("converter");
- attributes.remove("validator");
+ // will be tested in another way
attributes.remove("valueChangeListener");
- attributes.remove("valueChangeListeners");
}
public Attributes getAttributes() {
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInputNumberSpinnerBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInputNumberSpinnerBean.java 2011-01-14 15:28:34 UTC (rev 21028)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInputNumberSpinnerBean.java 2011-01-14 15:35:34 UTC (rev 21029)
@@ -1,6 +1,6 @@
/*******************************************************************************
* JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc. and individual contributors
+ * Copyright 2010-2011, Red Hat, Inc. and individual contributors
* by the @authors tag. See the copyright.txt in the distribution for a
* full listing of individual contributors.
*
@@ -64,7 +64,7 @@
attributes.setAttribute("step", 1);
attributes.setAttribute("value", 2);
- // TODO has to be tested in another way
+ // will be tested in another way
attributes.remove("valueChangeListener");
}
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider/simple.xhtml 2011-01-14 15:28:34 UTC (rev 21028)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider/simple.xhtml 2011-01-14 15:35:34 UTC (rev 21029)
@@ -6,7 +6,7 @@
<!--
JBoss, Home of Professional Open Source
-Copyright 2010, Red Hat, Inc. and individual contributors
+Copyright 2010-2011, Red Hat, Inc. and individual contributors
by the @authors tag. See the copyright.txt in the distribution for a
full listing of individual contributors.
@@ -42,7 +42,6 @@
<ui:define name="component">
<rich:inputNumberSlider id="slider"
accesskey="#{richInputNumberSliderBean.attributes['accesskey'].value}"
- converterMessage="#{richInputNumberSliderBean.attributes['converterMessage'].value}"
decreaseClass="#{richInputNumberSliderBean.attributes['decreaseClass'].value}"
decreaseSelectedClass="#{richInputNumberSliderBean.attributes['decreaseSelectedClass'].value}"
delay="#{richInputNumberSliderBean.attributes['delay'].value}"
@@ -61,8 +60,6 @@
minValue="#{richInputNumberSliderBean.attributes['minValue'].value}"
onchange="#{richInputNumberSliderBean.attributes['onchange'].value}"
rendered="#{richInputNumberSliderBean.attributes['rendered'].value}"
- required="#{richInputNumberSliderBean.attributes['required'].value}"
- requiredMessage="#{richInputNumberSliderBean.attributes['requiredMessage'].value}"
showArrows="#{richInputNumberSliderBean.attributes['showArrows'].value}"
showBoundaryValues="#{richInputNumberSliderBean.attributes['showBoundaryValues'].value}"
showInput="#{richInputNumberSliderBean.attributes['showInput'].value}"
@@ -73,7 +70,6 @@
tabindex="#{richInputNumberSliderBean.attributes['tabindex'].value}"
tooltipClass="#{richInputNumberSliderBean.attributes['tooltipClass'].value}"
trackClass="#{richInputNumberSliderBean.attributes['trackClass'].value}"
- validatorMessage="#{richInputNumberSliderBean.attributes['validatorMessage'].value}"
value="#{richInputNumberSliderBean.attributes['value'].value}"
valueChangeListener="#{richBean.valueChangeListener}"
>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSpinner/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSpinner/simple.xhtml 2011-01-14 15:28:34 UTC (rev 21028)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSpinner/simple.xhtml 2011-01-14 15:35:34 UTC (rev 21029)
@@ -6,7 +6,7 @@
<!--
JBoss, Home of Professional Open Source
-Copyright 2010, Red Hat, Inc. and individual contributors
+Copyright 2010-2011, Red Hat, Inc. and individual contributors
by the @authors tag. See the copyright.txt in the distribution for a
full listing of individual contributors.
@@ -48,6 +48,7 @@
cycled="#{richInputNumberSpinnerBean.attributes['cycled'].value}"
disabled="#{richInputNumberSpinnerBean.attributes['disabled'].value}"
enableManualInput="#{richInputNumberSpinnerBean.attributes['enableManualInput'].value}"
+ immediate="#{richInputNumberSpinnerBean.attributes['immediate'].value}"
inputClass="#{richInputNumberSpinnerBean.attributes['inputClass'].value}"
inputSize="#{richInputNumberSpinnerBean.attributes['inputSize'].value}"
maxValue="#{richInputNumberSpinnerBean.attributes['maxValue'].value}"
13 years, 11 months
JBoss Rich Faces SVN: r21028 - trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces.
by richfaces-svn-commits＠lists.jboss.org
Author: artdaw
Date: 2011-01-14 10:28:34 -0500 (Fri, 14 Jan 2011)
New Revision: 21028
Modified:
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceSelect.ecss
Log:
RF-10214: horizontal scroll is fixed
Modified: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceSelect.ecss
===================================================================
--- trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceSelect.ecss 2011-01-14 15:01:12 UTC (rev 21027)
+++ trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceSelect.ecss 2011-01-14 15:28:34 UTC (rev 21028)
@@ -106,7 +106,7 @@
.rf-is-lst-cord {
display : block;
- position : relative;
+ position : absolute;
color: '#{richSkin.generalTextColor}';
font-family: '#{richSkin.generalFamilyFont}';
font-size : '#{richSkin.generalSizeFont}';
13 years, 11 months
JBoss Rich Faces SVN: r21027 - trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dropDownMenu/samples.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2011-01-14 10:01:12 -0500 (Fri, 14 Jan 2011)
New Revision: 21027
Modified:
trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dropDownMenu/samples/sideMenu-sample.xhtml
trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dropDownMenu/samples/topMenu-sample.xhtml
Log:
https://issues.jboss.org/browse/RF-10193
Modified: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dropDownMenu/samples/sideMenu-sample.xhtml
===================================================================
--- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dropDownMenu/samples/sideMenu-sample.xhtml 2011-01-14 14:47:01 UTC (rev 21026)
+++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dropDownMenu/samples/sideMenu-sample.xhtml 2011-01-14 15:01:12 UTC (rev 21027)
@@ -16,39 +16,38 @@
padding: 0px 4px 0px 4px;
}
</style>
- <h:panelGrid styleClass="vertical-menu-cell"
- columnClasses="optionList" columns="1" cellspacing="0"
- cellpadding="0">
- <rich:dropDownMenu
- style="border:1px solid #{a4jSkin.panelBorderColor}" label="Option1"
- mode="none">
- <rich:menuItem label="Suboption 1-1" />
- <rich:menuItem label="Suboption 1-2">
- <f:facet name="icon">
- <h:graphicImage value="/images/icons/print.gif" />
- </f:facet>
- </rich:menuItem>
- <rich:menuItem label="Suboption 1-3" />
- </rich:dropDownMenu>
- <rich:dropDownMenu
- style="border:1px solid #{a4jSkin.panelBorderColor}" label="Option2"
- mode="none">
- <rich:menuItem label="Suboption 2-1" />
- <rich:menuItem label="Suboption 2-2" />
- <rich:menuGroup label="Group2">
- <rich:menuItem label="Suboption 2-2-1" />
- <rich:menuItem label="Suboption 2-2-2" />
- </rich:menuGroup>
- <rich:menuItem label="Suboption 2-3" />
- </rich:dropDownMenu>
- <rich:dropDownMenu
- style="border:1px solid #{a4jSkin.panelBorderColor}" label="Option3"
- mode="none">
- <rich:menuItem label="Suboption 3-1" />
- <rich:menuItem label="Suboption 3-2" />
- <rich:menuItem label="Suboption 3-3" />
- </rich:dropDownMenu>
- </h:panelGrid>
+ <h:panelGrid styleClass="vertical-menu-cell" columnClasses="optionList"
+ columns="1" cellspacing="0" cellpadding="0">
+ <rich:dropDownMenu
+ style="border:1px solid #{a4jSkin.panelBorderColor}" label="Option1"
+ mode="client" jointPoint="topRight" direction="bottomRight">
+ <rich:menuItem label="Suboption 1-1" />
+ <rich:menuItem label="Suboption 1-2">
+ <f:facet name="icon">
+ <h:graphicImage value="/images/icons/print.gif" />
+ </f:facet>
+ </rich:menuItem>
+ <rich:menuItem label="Suboption 1-3" />
+ </rich:dropDownMenu>
+ <rich:dropDownMenu jointPoint="topRight" direction="bottomRight"
+ style="border:1px solid #{a4jSkin.panelBorderColor}" label="Option2"
+ mode="client">
+ <rich:menuItem label="Suboption 2-1" />
+ <rich:menuItem label="Suboption 2-2" />
+ <rich:menuGroup label="Group2">
+ <rich:menuItem label="Suboption 2-2-1" />
+ <rich:menuItem label="Suboption 2-2-2" />
+ </rich:menuGroup>
+ <rich:menuItem label="Suboption 2-3" />
+ </rich:dropDownMenu>
+ <rich:dropDownMenu jointPoint="topRight" direction="bottomRight"
+ style="border:1px solid #{a4jSkin.panelBorderColor}" label="Option3"
+ mode="client">
+ <rich:menuItem label="Suboption 3-1" />
+ <rich:menuItem label="Suboption 3-2" />
+ <rich:menuItem label="Suboption 3-3" />
+ </rich:dropDownMenu>
+ </h:panelGrid>
</ui:composition>
</html>
\ No newline at end of file
Modified: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dropDownMenu/samples/topMenu-sample.xhtml
===================================================================
--- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dropDownMenu/samples/topMenu-sample.xhtml 2011-01-14 14:47:01 UTC (rev 21026)
+++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dropDownMenu/samples/topMenu-sample.xhtml 2011-01-14 15:01:12 UTC (rev 21027)
@@ -76,8 +76,8 @@
</rich:menuItem>
</rich:dropDownMenu>
<rich:toolbarGroup location="right">
- <rich:dropDownMenu label="Search" direction="bottom-left"
- jointPoint="br" styleClass="search" mode="client">
+ <rich:dropDownMenu label="Search" direction="bottomLeft"
+ jointPoint="bottomRight" styleClass="search" mode="client">
<rich:menuItem>
<h:inputText value="" id="searchinput" />
<button type="button">Search</button>
13 years, 11 months
JBoss Rich Faces SVN: r21026 - in modules/tests/metamer/trunk: ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richMenuItem and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2011-01-14 09:47:01 -0500 (Fri, 14 Jan 2011)
New Revision: 21026
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richMenuItem/TestRichMenuItem.java
modules/tests/metamer/trunk/ftest/src/test/resources/testng-misc.xml
Log:
* TestNG descriptor updated
* test names refactored
Modified: modules/tests/metamer/trunk/ftest/src/test/resources/testng-misc.xml
===================================================================
--- modules/tests/metamer/trunk/ftest/src/test/resources/testng-misc.xml 2011-01-14 14:45:07 UTC (rev 21025)
+++ modules/tests/metamer/trunk/ftest/src/test/resources/testng-misc.xml 2011-01-14 14:47:01 UTC (rev 21026)
@@ -8,6 +8,7 @@
<package name="org.richfaces.tests.metamer.ftest.richDataScroller" />
<package name="org.richfaces.tests.metamer.ftest.richFunctions" />
<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" />
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richMenuItem/TestRichMenuItem.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richMenuItem/TestRichMenuItem.java 2011-01-14 14:45:07 UTC (rev 21025)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richMenuItem/TestRichMenuItem.java 2011-01-14 14:47:01 UTC (rev 21026)
@@ -335,17 +335,17 @@
}
@Test
- public void testOnitemkeydown() {
+ public void testOnkeydown() {
testFireEvent(Event.KEYDOWN, menuItem1);
}
@Test
- public void testOnitemkeypress() {
+ public void testOnkeypress() {
testFireEvent(Event.KEYPRESS, menuItem1);
}
@Test
- public void testOnitemkeyup() {
+ public void testOnkeyup() {
testFireEvent(Event.KEYUP, menuItem1);
}
13 years, 11 months