Author: lfryc(a)redhat.com
Date: 2011-03-14 05:35:01 -0400 (Mon, 14 Mar 2011)
New Revision: 22196
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceInput/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceSelect/simple.xhtml
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInplaceInput/TestRichInplaceInput.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInplaceSelect/TestRichInplaceSelect.java
Log:
inplace select/input: updating metamer with new attributes names (RFPL-1255)
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceInput/simple.xhtml
===================================================================
---
modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceInput/simple.xhtml 2011-03-14
08:43:50 UTC (rev 22195)
+++
modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceInput/simple.xhtml 2011-03-14
09:35:01 UTC (rev 22196)
@@ -38,18 +38,16 @@
<ui:define name="component">
<rich:inplaceInput id="inplaceInput"
-
changedStateClass="#{richInplaceInputBean.attributes['changedStateClass'].value}"
+
activeClass="#{richInplaceInputBean.attributes['activeClass'].value}"
+
changedClass="#{richInplaceInputBean.attributes['changedClass'].value}"
converter="#{richInplaceInputBean.attributes['converter'].value}"
converterMessage="#{richInplaceInputBean.attributes['converterMessage'].value}"
defaultLabel="#{richInplaceInputBean.attributes['defaultLabel'].value}"
disabled="#{richInplaceInputBean.attributes['disabled'].value}"
-
disabledStateClass="#{richInplaceInputBean.attributes['disabledStateClass'].value}"
-
editClass="#{richInplaceInputBean.attributes['editClass'].value}"
+
disabledClass="#{richInplaceInputBean.attributes['disabledClass'].value}"
editEvent="#{richInplaceInputBean.attributes['editEvent'].value}"
-
editStateClass="#{richInplaceInputBean.attributes['editStateClass'].value}"
immediate="#{richInplaceInputBean.attributes['immediate'].value}"
inputWidth="#{richInplaceInputBean.attributes['inputWidth'].value}"
-
noneClass="#{richInplaceInputBean.attributes['noneClass'].value}"
onblur="#{richInplaceInputBean.attributes['onblur'].value}"
onclick="#{richInplaceInputBean.attributes['onclick'].value}"
onchange="#{richInplaceInputBean.attributes['onchange'].value}"
@@ -74,7 +72,6 @@
onmouseout="#{richInplaceInputBean.attributes['onmouseout'].value}"
onmouseover="#{richInplaceInputBean.attributes['onmouseover'].value}"
onmouseup="#{richInplaceInputBean.attributes['onmouseup'].value}"
-
readyStateClass="#{richInplaceInputBean.attributes['readyStateClass'].value}"
rendered="#{richInplaceInputBean.attributes['rendered'].value}"
required="#{richInplaceInputBean.attributes['required'].value}"
requiredMessage="#{richInplaceInputBean.attributes['requiredMessage'].value}"
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceSelect/simple.xhtml
===================================================================
---
modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceSelect/simple.xhtml 2011-03-14
08:43:50 UTC (rev 22195)
+++
modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceSelect/simple.xhtml 2011-03-14
09:35:01 UTC (rev 22196)
@@ -38,13 +38,13 @@
<ui:define name="component">
<rich:inplaceSelect id="inplaceSelect"
-
changedStateClass="#{richInplaceSelectBean.attributes['changedStateClass'].value}"
+
activeClass="#{richInplaceSelectBean.attributes['activeClass'].value}"
+
changedClass="#{richInplaceSelectBean.attributes['changedClass'].value}"
converterMessage="#{richInplaceSelectBean.attributes['converterMessage'].value}"
defaultLabel="#{richInplaceSelectBean.attributes['defaultLabel'].value}"
disabled="#{richInplaceSelectBean.attributes['disabled'].value}"
-
disabledStateClass="#{richInplaceSelectBean.attributes['disabledStateClass'].value}"
+
disabledClass="#{richInplaceSelectBean.attributes['disabledClass'].value}"
editEvent="#{richInplaceSelectBean.attributes['editEvent'].value}"
-
editStateClass="#{richInplaceSelectBean.attributes['editStateClass'].value}"
immediate="#{richInplaceSelectBean.attributes['immediate'].value}"
inputWidth="#{richInplaceSelectBean.attributes['inputWidth'].value}"
itemClass="#{richInplaceSelectBean.attributes['itemClass'].value}"
@@ -87,7 +87,6 @@
onmouseup="#{richInplaceSelectBean.attributes['onmouseup'].value}"
onselectitem="#{richInplaceSelectBean.attributes['onselectitem'].value}"
openOnEdit="#{richInplaceSelectBean.attributes['openOnEdit'].value}"
-
readyStateClass="#{richInplaceSelectBean.attributes['readyStateClass'].value}"
rendered="#{richInplaceSelectBean.attributes['rendered'].value}"
required="#{richInplaceSelectBean.attributes['required'].value}"
requiredMessage="#{richInplaceSelectBean.attributes['requiredMessage'].value}"
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInplaceInput/TestRichInplaceInput.java
===================================================================
---
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInplaceInput/TestRichInplaceInput.java 2011-03-14
08:43:50 UTC (rev 22195)
+++
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInplaceInput/TestRichInplaceInput.java 2011-03-14
09:35:01 UTC (rev 22196)
@@ -99,8 +99,8 @@
}
@Test
- public void testChangedStateClass() {
- selenium.type(pjq("input[id$=changedStateClassInput]"),
"metamer-ftest-class");
+ public void testChangedClass() {
+ selenium.type(pjq("input[id$=changedClassInput]"),
"metamer-ftest-class");
selenium.waitForPageToLoad();
selenium.click(inplaceInput);
@@ -142,19 +142,14 @@
}
@Test
- public void testDisabledStateClass() {
+ public void testDisabledClass() {
selenium.click(pjq("input[type=radio][name$=disabledInput][value=true]"));
selenium.waitForPageToLoad();
- testStyleClass(inplaceInput, "disabledStateClass");
+ testStyleClass(inplaceInput, "disabledClass");
}
@Test
- public void testEditClass() {
- testStyleClass(edit, "editClass");
- }
-
- @Test
public void testEditEvent() {
selenium.type(pjq("input[type=text][id$=editEventInput]"),
"mouseup");
selenium.waitForPageToLoad();
@@ -166,8 +161,8 @@
}
@Test
- public void testEditStateClass() {
- selenium.type(pjq("input[id$=editStateClassInput]"),
"metamer-ftest-class");
+ public void testActiveClass() {
+ selenium.type(pjq("input[id$=activeClassInput]"),
"metamer-ftest-class");
selenium.waitForPageToLoad();
assertFalse(selenium.belongsClass(inplaceInput, "metamer-ftest-class"),
"Inplace input should not have class metamer-ftest-class.");
@@ -215,14 +210,6 @@
}
@Test
- public void testNoneClass() {
- selenium.type(pjq("input[type=text][id$=valueInput]"), "");
- selenium.waitForPageToLoad();
-
- testStyleClass(edit, "noneClass");
- }
-
- @Test
@IssueTracking("https://issues.jboss.org/browse/RF-9868")
public void testOnblur() {
selenium.type(pjq("input[id$=onblurInput]"), "metamerEvents +=
\"blur \"");
@@ -368,11 +355,6 @@
}
@Test
- public void testReadyStateClass() {
- testStyleClass(inplaceInput, "readyStateClass");
- }
-
- @Test
public void testRendered() {
selenium.click(pjq("input[type=radio][name$=renderedInput][value=false]"));
selenium.waitForPageToLoad();
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInplaceSelect/TestRichInplaceSelect.java
===================================================================
---
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInplaceSelect/TestRichInplaceSelect.java 2011-03-14
08:43:50 UTC (rev 22195)
+++
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInplaceSelect/TestRichInplaceSelect.java 2011-03-14
09:35:01 UTC (rev 22196)
@@ -104,8 +104,8 @@
}
@Test
- public void testChangedStateClass() {
- selenium.type(pjq("input[id$=changedStateClassInput]"),
"metamer-ftest-class");
+ public void testChangedClass() {
+ selenium.type(pjq("input[id$=changedClassInput]"),
"metamer-ftest-class");
selenium.waitForPageToLoad();
selenium.click(select);
@@ -153,11 +153,11 @@
}
@Test
- public void testDisabledStateClass() {
+ public void testDisabledClass() {
selenium.click(pjq("input[type=radio][name$=disabledInput][value=true]"));
selenium.waitForPageToLoad();
- testStyleClass(select, "disabledStateClass");
+ testStyleClass(select, "disabledClass");
}
@Test
@@ -172,8 +172,8 @@
}
@Test
- public void testEditStateClass() {
- selenium.type(pjq("input[id$=editStateClassInput]"),
"metamer-ftest-class");
+ public void testActiveClass() {
+ selenium.type(pjq("input[id$=activeClassInput]"),
"metamer-ftest-class");
selenium.waitForPageToLoad();
assertFalse(selenium.belongsClass(select, "metamer-ftest-class"),
"Inplace input should not have class metamer-ftest-class.");
@@ -490,11 +490,6 @@
}
@Test
- public void testReadyStateClass() {
- testStyleClass(select, "readyStateClass");
- }
-
- @Test
public void testRendered() {
selenium.click(pjq("input[type=radio][name$=renderedInput][value=false]"));
selenium.waitForPageToLoad();