From richfaces-svn-commits at lists.jboss.org Wed Jan 19 12:43:16 2011
Content-Type: multipart/mixed; boundary="===============2746896283321734875=="
MIME-Version: 1.0
From: richfaces-svn-commits at lists.jboss.org
To: richfaces-svn-commits at lists.jboss.org
Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r21093 - in
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest:
richAutocomplete and 1 other directory.
Date: Wed, 19 Jan 2011 12:43:16 -0500
Message-ID: <201101191743.p0JHhGnq014840@svn01.web.mwc.hst.phx2.redhat.com>
--===============2746896283321734875==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: lfryc(a)redhat.com
Date: 2011-01-19 12:43:16 -0500 (Wed, 19 Jan 2011)
New Revision: 21093
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tes=
ts/metamer/ftest/model/Autocomplete.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tes=
ts/metamer/ftest/richAutocomplete/TestAutocompleteByKeys.java
Log:
rich:autocomplete - added issue tracking for RF-10254
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfa=
ces/tests/metamer/ftest/model/Autocomplete.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/te=
sts/metamer/ftest/model/Autocomplete.java 2011-01-19 17:42:35 UTC (rev 2109=
2)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/te=
sts/metamer/ftest/model/Autocomplete.java 2011-01-19 17:43:16 UTC (rev 2109=
3)
@@ -158,10 +158,10 @@
}
=
public boolean isCompletionVisible() {
- if (!selenium.isElementPresent(option)) {
+ if (!selenium.isElementPresent(items)) {
return false;
}
- return selenium.isVisible(option);
+ return selenium.isVisible(items);
}
=
public void waitForCompletionVisible() {
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfa=
ces/tests/metamer/ftest/richAutocomplete/TestAutocompleteByKeys.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/te=
sts/metamer/ftest/richAutocomplete/TestAutocompleteByKeys.java 2011-01-19 1=
7:42:35 UTC (rev 21092)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/te=
sts/metamer/ftest/richAutocomplete/TestAutocompleteByKeys.java 2011-01-19 1=
7:43:16 UTC (rev 21093)
@@ -22,6 +22,7 @@
package org.richfaces.tests.metamer.ftest.richAutocomplete;
=
import static org.jboss.test.selenium.RequestTypeModelGuard.guardXhr;
+import static org.jboss.test.selenium.RequestTypeModelGuard.guardNoRequest;
import static org.jboss.test.selenium.utils.URLUtils.buildUrl;
import static org.testng.Assert.assertEquals;
=
@@ -32,6 +33,7 @@
import org.richfaces.tests.metamer.bean.Model;
import org.richfaces.tests.metamer.ftest.AbstractMetamerTest;
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.ftest.model.Autocomplete;
import org.richfaces.tests.metamer.model.Capital;
@@ -42,118 +44,115 @@
* @author Lukas Fryc
* @version $Revision$
*/
+(a)IssueTracking("https://issues.jboss.org/browse/RF-10254")
public class TestAutocompleteByKeys extends AbstractMetamerTest {
=
- AutocompleteAttributes attributes =3D new AutocompleteAttributes();
- Autocomplete autocomplete =3D new Autocomplete();
+ AutocompleteAttributes attributes =3D new AutocompleteAttributes();
+ Autocomplete autocomplete =3D new Autocomplete();
=
- @Override
- public URL getTestUrl() {
- return buildUrl(contextPath,
- "faces/components/richAutocomplete/autocomplete.xhtml");
- }
+ @Override
+ public URL getTestUrl() {
+ return buildUrl(contextPath, "faces/components/richAutocomplete/au=
tocomplete.xhtml");
+ }
=
- @Inject
- @Use(booleans =3D { true, false })
- Boolean autofill;
+ @Inject
+ @Use(booleans =3D { true, false })
+ Boolean autofill =3D false;
=
- @Inject
- @Use(booleans =3D { true, false })
- Boolean selectFirst;
+ @Inject
+ @Use(booleans =3D { true, false })
+ Boolean selectFirst =3D false;
=
- List capitals =3D Model.unmarshallCapitals();
+ List capitals =3D Model.unmarshallCapitals();
=
- StringBuilder partialInput;
+ StringBuilder partialInput;
=
- @BeforeMethod
- public void prepareProperties() {
- attributes.setAutofill(autofill);
- attributes.setSelectFirst(selectFirst);
- if (autofill =3D=3D null) {
- autofill =3D false;
- }
- if (selectFirst =3D=3D null) {
- selectFirst =3D false;
- }
- }
+ @BeforeMethod
+ public void prepareProperties() {
+ attributes.setAutofill(autofill);
+ attributes.setSelectFirst(selectFirst);
+ if (autofill =3D=3D null) {
+ autofill =3D false;
+ }
+ if (selectFirst =3D=3D null) {
+ selectFirst =3D false;
+ }
+ }
=
- @Test
- public void testTypingPrefixAndThenConfirm() {
- assertCompletionVisible(false);
- typePrefix("ala");
- assertCompletionVisible(true);
- confirm();
- assertCompletionVisible(false);
- }
+ @Test
+ public void testTypingPrefixAndThenConfirm() {
+ assertCompletionVisible(false);
+ typePrefix("ala");
+ assertCompletionVisible(true);
+ confirm();
+ assertCompletionVisible(false);
+ }
=
- @Test
- public void testTypingPrefixAndThenDeleteAll() {
- assertCompletionVisible(false);
- typePrefix("ala");
- assertCompletionVisible(true);
- deleteAll();
- assertCompletionVisible(true);
- }
+ @Test
+ public void testTypingPrefixAndThenDeleteAll() {
+ assertCompletionVisible(false);
+ typePrefix("ala");
+ assertCompletionVisible(true);
+ deleteAll();
+ assertCompletionVisible(true);
+ typePrefix("ala");
+ assertCompletionVisible(true);
+ }
=
- private void assertCompletionVisible(boolean assertCompletionVisible) {
- assertEquals(autocomplete.isCompletionVisible(),
- assertCompletionVisible);
- }
+ private void assertCompletionVisible(boolean assertCompletionVisible) {
+ assertEquals(autocomplete.isCompletionVisible(), assertCompletionV=
isible);
+ }
=
- public void confirm() {
- autocomplete.confirmByKeys();
- autocomplete.waitForCompletionVisible();
- }
+ public void confirm() {
+ autocomplete.confirmByKeys();
+ autocomplete.waitForCompletionVisible();
+ }
=
- public void deleteAll() {
- partialInput =3D new StringBuilder();
+ public void deleteAll() {
+ partialInput =3D new StringBuilder();
=
- autocomplete.textSelectAll();
- guardXhr(autocomplete).pressBackspace();
+ autocomplete.textSelectAll();
+ guardNoRequest(autocomplete).pressBackspace();
=
- assertEquals(autocomplete.getInputText(), getExpectedStateForPrefix());
- assertEquals(autocomplete.getSelectedOptionIndex(),
- getExpectedSelectedOptionIndex());
- }
+ assertEquals(autocomplete.getInputText(), getExpectedStateForPrefi=
x());
+ assertEquals(autocomplete.getSelectedOptionIndex(), getExpectedSel=
ectedOptionIndex());
+ }
=
- public void typePrefix(String wholeInput) {
- partialInput =3D new StringBuilder(autocomplete.getInputText());
+ public void typePrefix(String wholeInput) {
+ partialInput =3D new StringBuilder(autocomplete.getInputText());
=
- for (int i =3D 0; i < wholeInput.length(); i++) {
- String chr =3D String.valueOf(wholeInput.charAt(i));
+ for (int i =3D 0; i < wholeInput.length(); i++) {
+ String chr =3D String.valueOf(wholeInput.charAt(i));
=
- guardXhr(autocomplete).typeKeys(chr);
- partialInput.append(chr);
+ guardXhr(autocomplete).typeKeys(chr);
+ partialInput.append(chr);
=
- assertEquals(autocomplete.getInputText(),
- getExpectedStateForPrefix());
- assertEquals(autocomplete.getSelectedOptionIndex(),
- getExpectedSelectedOptionIndex());
- }
- }
+ assertEquals(autocomplete.getInputText(), getExpectedStateForP=
refix());
+ assertEquals(autocomplete.getSelectedOptionIndex(), getExpecte=
dSelectedOptionIndex());
+ }
+ }
=
- public String getExpectedStateForPrefix() {
- if (selectFirst && autofill && partialInput.length() > 0) {
- return getStatesByPrefix(partialInput.toString()).get(0)
- .toLowerCase();
- }
+ public String getExpectedStateForPrefix() {
+ if (selectFirst && autofill && partialInput.length() > 0) {
+ return getStatesByPrefix(partialInput.toString()).get(0).toLow=
erCase();
+ }
=
- return partialInput.toString();
- }
+ return partialInput.toString();
+ }
=
- public int getExpectedSelectedOptionIndex() {
- return (selectFirst) ? 0 : -1;
- }
+ public int getExpectedSelectedOptionIndex() {
+ return (selectFirst) ? 0 : -1;
+ }
=
- public List getStatesByPrefix(String prefix) {
- List states =3D new LinkedList();
+ public List getStatesByPrefix(String prefix) {
+ List states =3D new LinkedList();
=
- for (Capital cap : capitals) {
- if (cap.getState().toLowerCase().startsWith(prefix)) {
- states.add(cap.getState());
- }
- }
+ for (Capital cap : capitals) {
+ if (cap.getState().toLowerCase().startsWith(prefix)) {
+ states.add(cap.getState());
+ }
+ }
=
- return states;
- }
+ return states;
+ }
}
--===============2746896283321734875==--