JBoss Rich Faces SVN: r22966 - sandbox/trunk/ui/schedule/ui/src/main/java/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: blabno
Date: 2011-11-22 01:11:32 -0500 (Tue, 22 Nov 2011)
New Revision: 22966
Modified:
sandbox/trunk/ui/schedule/ui/src/main/java/org/richfaces/renderkit/html/scripts/ScheduleMessages.java
Log:
ScheduleMessages fix.
Modified: sandbox/trunk/ui/schedule/ui/src/main/java/org/richfaces/renderkit/html/scripts/ScheduleMessages.java
===================================================================
--- sandbox/trunk/ui/schedule/ui/src/main/java/org/richfaces/renderkit/html/scripts/ScheduleMessages.java 2011-11-22 06:10:56 UTC (rev 22965)
+++ sandbox/trunk/ui/schedule/ui/src/main/java/org/richfaces/renderkit/html/scripts/ScheduleMessages.java 2011-11-22 06:11:32 UTC (rev 22966)
@@ -38,7 +38,9 @@
StringBuilder out = new StringBuilder();
out.append("RichFaces.ui.Schedule.prototype.messages=jQuery.extend(RichFaces.ui.Schedule.prototype.messages,{");
Iterator<Locale> supportedLocales = application.getSupportedLocales();
+ int localeCount = 0;
while (supportedLocales.hasNext()) {
+ localeCount++;
Locale locale = supportedLocales.next();
ResourceBundle applicationBundle = ResourceBundle.getBundle(application.getMessageBundle(), locale, loader);
ResourceBundle stockBundle = ResourceBundle.getBundle(BUNDLE_NAME, locale, loader);
@@ -60,7 +62,9 @@
"prevYear", "nextYear", "today", "month", "day", "week"});
out.append("},");
}
- out.delete(out.length() - 1, out.length());
+ if (localeCount > 0) {
+ out.delete(out.length() - 1, out.length());
+ }
out.append("})");
try {
// TODO where to get encoding from? It should match properties file's encoding, but probably be converted to response encoding
14 years, 1 month
JBoss Rich Faces SVN: r22964 - modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAutocomplete.
by richfaces-svn-commits＠lists.jboss.org
Author: jjamrich
Date: 2011-11-21 17:51:20 -0500 (Mon, 21 Nov 2011)
New Revision: 22964
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAutocomplete/TestAutocompleteFormatting.java
Log:
RFPL-1231: Add tests for @layout in autocomplete
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAutocomplete/TestAutocompleteFormatting.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAutocomplete/TestAutocompleteFormatting.java 2011-11-21 09:45:00 UTC (rev 22963)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAutocomplete/TestAutocompleteFormatting.java 2011-11-21 22:51:20 UTC (rev 22964)
@@ -31,7 +31,9 @@
import java.util.LinkedList;
import java.util.List;
+import org.jboss.test.selenium.locator.JQueryLocator;
import org.jboss.test.selenium.utils.URLUtils;
+import org.jboss.test.selenium.waiting.selenium.SeleniumCondition;
import org.richfaces.tests.metamer.bean.Model;
import org.richfaces.tests.metamer.ftest.AbstractMetamerTest;
import org.richfaces.tests.metamer.ftest.annotations.Inject;
@@ -94,6 +96,36 @@
assertTrue(autocomplete.getInputText().toLowerCase().startsWith(getExpectedStateForPrefix().toLowerCase()));
}
+ @Test
+ public void testLayout() {
+
+ JQueryLocator suggestionsGridDiv = new JQueryLocator("div.rf-au-lst-scrl > div[id$=autocompleteItems] > div:contains({0})");
+ JQueryLocator suggestionsList = new JQueryLocator("div.rf-au-lst-scrl > ul[id$=autocompleteItems] > li:contains({0})");
+ JQueryLocator suggestionsTable = new JQueryLocator("div.rf-au-lst-scrl > table[id$=autocompleteItems] tr>td:contains({0})");
+
+ verifyLayout("div", suggestionsGridDiv);
+
+ verifyLayout("grid", suggestionsGridDiv);
+
+ verifyLayout("list", suggestionsList);
+
+ verifyLayout("table", suggestionsTable);
+
+ }
+
+ private void verifyLayout(String layout, JQueryLocator suggestionLocatorFormat) {
+
+ autocompleteAttributes.set(AutocompleteAttributes.layout, layout);
+
+ autocomplete.typeKeys("Co");
+
+ assertTrue(selenium.isElementPresent(suggestionLocatorFormat.format("Colorado")));
+ assertTrue(selenium.isElementPresent(suggestionLocatorFormat.format("[Denver]")));
+
+ assertTrue(selenium.isElementPresent(suggestionLocatorFormat.format("Connecticut")));
+ assertTrue(selenium.isElementPresent(suggestionLocatorFormat.format("[Hartford]")));
+ }
+
public void typePrefix(String wholeInput) {
partialInput = new StringBuilder(autocomplete.getInputText());
@@ -173,3 +205,4 @@
this.selectFirst = selectFirst;
}
}
+
14 years, 1 month
JBoss Rich Faces SVN: r22963 - modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTab.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2011-11-21 04:45:00 -0500 (Mon, 21 Nov 2011)
New Revision: 22963
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTab/TestRichTab.java
Log:
2 tests for rich:tab moved to 4.2
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTab/TestRichTab.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTab/TestRichTab.java 2011-11-18 16:14:43 UTC (rev 22962)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTab/TestRichTab.java 2011-11-21 09:45:00 UTC (rev 22963)
@@ -74,7 +74,7 @@
return buildUrl(contextPath, "faces/components/richTab/simple.xhtml");
}
- @Test
+ @Test(groups = { "4.2" })
@IssueTracking("https://issues.jboss.org/browse/RF-11427")
public void testAction() {
retrieveRequestTime.initializeValue();
@@ -85,12 +85,11 @@
selenium.click(pjq("input[id$=prevTabButton]"));
waitAjax.waitForChange(retrieveRequestTime);
- waitGui.failWith(
- "Expected <" + ACTION_LOG + ">, found <" + selenium.getText(PHASE_FORMAT.format(6)) + ">").until(
- textEquals.locator(PHASE_FORMAT.format(6)).text(ACTION_LOG));
+ waitGui.failWith("Expected <" + ACTION_LOG + ">, found <" + selenium.getText(PHASE_FORMAT.format(6)) + ">")
+ .until(textEquals.locator(PHASE_FORMAT.format(6)).text(ACTION_LOG));
}
-
- @Test
+
+ @Test(groups = { "4.2" })
@IssueTracking("https://issues.jboss.org/browse/RF-11427")
public void testActionListener() {
retrieveRequestTime.initializeValue();
14 years, 1 month
JBoss Rich Faces SVN: r22962 - 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: jpapouse
Date: 2011-11-18 11:14:43 -0500 (Fri, 18 Nov 2011)
New Revision: 22962
Added:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataScroller/TestDataScrollerAttributes.java
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/richDataScroller/simple.xhtml
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/richDataScroller/DataScrollerAttributes.java
Log:
RFPL-1738: tests for some attributes (rich:dataScroller)
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataScroller/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataScroller/simple.xhtml 2011-11-18 12:31:06 UTC (rev 22961)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataScroller/simple.xhtml 2011-11-18 16:14:43 UTC (rev 22962)
@@ -51,10 +51,15 @@
for="#{richDataScrollerBean.attributes['for'].value}"
boundaryControls="#{richDataScrollerBean.attributes['boundaryControls'].value}"
+ data="#{richDataScrollerBean.attributes['data'].value}"
+ execute="#{richDataScrollerBean.attributes['execute'].value}"
fastControls="#{richDataScrollerBean.attributes['fastControls'].value}"
fastStep="#{richDataScrollerBean.attributes['fastStep'].value}"
lastPageMode="#{richDataScrollerBean.attributes['lastPageMode'].value}"
maxPages="#{richDataScrollerBean.attributes['maxPages'].value}"
+ onbegin="#{richDataScrollerBean.attributes['onbegin'].value}"
+ onbeforedomupdate="#{richDataScrollerBean.attributes['onbeforedomupdate'].value}"
+ oncomplete="#{richDataScrollerBean.attributes['oncomplete'].value}"
page="#{richDataScrollerBean.attributes['page'].value}"
render="#{richDataScrollerBean.attributes['render'].value} #{nestedComponentId}"
renderIfSinglePage="#{richDataScrollerBean.attributes['renderIfSinglePage'].value}"
@@ -106,6 +111,9 @@
first="#{richDataScrollerBean.attributes['first'].value}"
lastPageMode="#{richDataScrollerBean.attributes['lastPageMode'].value}"
maxPages="#{richDataScrollerBean.attributes['maxPages'].value}"
+ onbegin="#{richDataScrollerBean.attributes['onbegin'].value}"
+ onbeforedomupdate="#{richDataScrollerBean.attributes['onbeforedomupdate'].value}"
+ oncomplete="#{richDataScrollerBean.attributes['oncomplete'].value}"
page="#{richDataScrollerBean.attributes['page'].value}"
render="#{richDataScrollerBean.attributes['render'].value} scroller1"
renderIfSinglePage="#{richDataScrollerBean.attributes['renderIfSinglePage'].value}"
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-11-18 12:31:06 UTC (rev 22961)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/DataScroller.java 2011-11-18 16:14:43 UTC (rev 22962)
@@ -35,6 +35,7 @@
* Provides DataScroller control methods.
*
* @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a>
+ * @author <a href="mailto:jpapouse@redhat.com">Jan Papousek</a>
* @version $Revision$
*/
public class DataScroller extends AbstractModel<JQueryLocator> {
@@ -49,6 +50,9 @@
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> nextButton = ref(root, "> .rf-ds-btn-next");
+ ReferencedLocator<JQueryLocator> previousButton = ref(root, "> .rf-ds-btn-prev");
+ ReferencedLocator<JQueryLocator> rewindButton = 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");
@@ -213,14 +217,42 @@
return integer(selenium.getText(currentPage));
}
+ public boolean isFastForwardButtonPresent() {
+ return selenium.isElementPresent(fastForwardButton);
+ }
+
+ public boolean isFastRewindButtonPresent() {
+ return selenium.isElementPresent(fastRewindButton);
+ }
+
public boolean isFirstPage() {
return getCurrentPage() == 1;
}
+ public boolean isFirstPageButtonPresent() {
+ return selenium.isElementPresent(firstPageButton);
+ }
+
public boolean isLastPage() {
return getCurrentPage() == getLastVisiblePage();
}
+ public boolean isLastPageButtonPresent() {
+ return selenium.isElementPresent(lastPageButton);
+ }
+
+ public boolean isNextButtonPresent() {
+ return selenium.isElementPresent(previousButton);
+ }
+
+ public boolean isPreviousButtonPresent() {
+ return selenium.isElementPresent(previousButton);
+ }
+
+ public boolean isPresent() {
+ return selenium.isElementPresent(root.getLocator());
+ }
+
public static int integer(String string) {
return Integer.valueOf(string);
}
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataScroller/DataScrollerAttributes.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataScroller/DataScrollerAttributes.java 2011-11-18 12:31:06 UTC (rev 22961)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataScroller/DataScrollerAttributes.java 2011-11-18 16:14:43 UTC (rev 22962)
@@ -29,7 +29,25 @@
*/
public enum DataScrollerAttributes implements AttributeEnum {
+ boundaryControls,
+ data,
+ execute,
+ fastControls,
fastStep,
- maxPages
+ lastPageMode,
+ limitRenderer,
+ maxPages,
+ onbeforedomupdate,
+ onbegin,
+ oncomplete,
+ page,
+ render,
+ rendered,
+ renderIfSinglePage,
+ status,
+ stepControls,
+ style,
+ styleClass,
+ title
}
Added: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataScroller/TestDataScrollerAttributes.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataScroller/TestDataScrollerAttributes.java (rev 0)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataScroller/TestDataScrollerAttributes.java 2011-11-18 16:14:43 UTC (rev 22962)
@@ -0,0 +1,146 @@
+/*******************************************************************************
+ * JBoss, Home of Professional Open Source
+ * 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.
+ *
+ * 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.richDataScroller;
+
+import static org.jboss.test.selenium.utils.URLUtils.buildUrl;
+
+import java.net.URL;
+import java.util.Arrays;
+
+import org.jboss.test.selenium.encapsulated.JavaScript;
+import org.richfaces.tests.metamer.ftest.AbstractMetamerTest;
+import org.richfaces.tests.metamer.ftest.attributes.Attributes;
+import org.richfaces.tests.metamer.ftest.model.DataScroller;
+import org.testng.annotations.Test;
+import static org.testng.Assert.*;
+
+/**
+ * Test the functionality of switching pages using DataScroller bound to DataTable.
+ *
+ * @author <a href="mailto:jpapouse@redhat.com">Jan Papousek</a>
+ */
+public class TestDataScrollerAttributes extends AbstractMetamerTest {
+
+ private final Attributes<DataScrollerAttributes> attributes = new Attributes<DataScrollerAttributes>();
+ private final DataScroller scroller = PaginationTester.DATA_SCROLLER_OUTSIDE_TABLE;
+
+ @Override
+ public URL getTestUrl() {
+ return buildUrl(contextPath, "faces/components/richDataScroller/simple.xhtml");
+ }
+
+ @Test
+ public void testBoundaryControls() {
+ // init - show
+ assertTrue(getScroller().isFirstPageButtonPresent(), "The first button should be present.");
+ assertTrue(getScroller().isLastPageButtonPresent(), "The last button should be present.");
+ // hide
+ getAttributes().set(DataScrollerAttributes.boundaryControls, "hide");
+ assertFalse(getScroller().isFirstPageButtonPresent(), "The first button shouldn't be present.");
+ assertFalse(getScroller().isLastPageButtonPresent(), "The last button shouldn't be present.");
+ }
+
+ @Test
+ public void testEvents() throws InterruptedException {
+ // set event attributes
+ getAttributes().set(DataScrollerAttributes.onbeforedomupdate, "metamerEvents += \"beforedomupdate \"");
+ getAttributes().set(DataScrollerAttributes.onbegin, "metamerEvents += \"begin \"");
+ getAttributes().set(DataScrollerAttributes.oncomplete, "metamerEvents += \"complete \"");
+ // reset events
+ selenium.getEval(new JavaScript("window.metamerEvents = \"\";"));
+ // action
+ retrieveRequestTime.initializeValue();
+ getScroller().clickFastForward();
+ waitGui.waitForChange(retrieveRequestTime);
+ // check events
+ String[] events = selenium.getEval(new JavaScript("window.metamerEvents")).split(" ");
+ assertEquals(events.length, 3, "3 events should be fired, found events are " + Arrays.toString(events) + ".");
+ assertEquals(events[0], "begin", "Attribute onbegin doesn't work, found events are " + Arrays.toString(events) + ".");
+ assertEquals(events[1], "beforedomupdate", "Attribute onbeforedomupdate doesn't work, found events are " + Arrays.toString(events) + ".");
+ assertEquals(events[2], "complete", "Attribute oncomplete doesn't work, found events are " + Arrays.toString(events) + ".");
+ }
+
+ @Test
+ public void testFastControls() {
+ // init - show
+ assertTrue(getScroller().isFastForwardButtonPresent(), "The fast forward button should be present.");
+ assertTrue(getScroller().isFastRewindButtonPresent(), "The fast rewind button should be present.");
+ // hide
+ getAttributes().set(DataScrollerAttributes.fastControls, "hide");
+ assertFalse(getScroller().isFastForwardButtonPresent(), "The fast forward button shouldn't be present.");
+ assertFalse(getScroller().isFastRewindButtonPresent(), "The fast rewind button shouldn't be present.");
+ }
+
+ @Test
+ public void testFastStep() {
+ getAttributes().set(DataScrollerAttributes.fastStep, 3);
+ retrieveRequestTime.initializeValue();
+ getScroller().clickFastForward();
+ waitGui.waitForChange(retrieveRequestTime);
+ assertEquals(getScroller().getCurrentPage(), 4, "After clicking on the fast forward button, the current page doesn't match.");
+ retrieveRequestTime.initializeValue();
+ getScroller().clickFastRewind();
+ waitGui.waitForChange(retrieveRequestTime);
+ assertEquals(getScroller().getCurrentPage(), 1, "After clicking on the fast rewind button, the current page doesn't match.");
+ }
+
+ @Test
+ public void testMaxPages() {
+ // init - 10
+ assertEquals(getScroller().getCountOfVisiblePages(), 6 /* it means - all pages */, "The number of visible pages doesn't match.");
+ // smaller number
+ getAttributes().set(DataScrollerAttributes.maxPages, 3);
+ assertEquals(getScroller().getCountOfVisiblePages(), 3, "The number of visible pages doesn't match.");
+ }
+
+ @Test
+ public void testPage() {
+ getAttributes().set(DataScrollerAttributes.page, 4);
+ assertEquals(getScroller().getCurrentPage(), 4, "The number of current page doesn't match.");
+ }
+
+ @Test
+ public void testRendered() {
+ getAttributes().set(DataScrollerAttributes.rendered, false);
+ assertFalse(getScroller().isPresent(), "The data scroller shouldn't be present.");
+ }
+
+ @Test
+ public void testStepControls() {
+ // init - show
+ assertTrue(getScroller().isNextButtonPresent(), "The next button should be present.");
+ assertTrue(getScroller().isPreviousButtonPresent(), "The previous button should be present.");
+ // hide
+ getAttributes().set(DataScrollerAttributes.stepControls, "hide");
+ assertFalse(getScroller().isNextButtonPresent(), "The next button shouldn't be present.");
+ assertFalse(getScroller().isPreviousButtonPresent(), "The previous button shouldn't be present.");
+ }
+
+ private Attributes<DataScrollerAttributes> getAttributes() {
+ return attributes;
+ }
+
+ private DataScroller getScroller() {
+ return scroller;
+ }
+
+}
14 years, 1 month
JBoss Rich Faces SVN: r22961 - modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPickList.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2011-11-18 07:31:06 -0500 (Fri, 18 Nov 2011)
New Revision: 22961
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPickList/TestPickList.java
Log:
16 tests for picklist fixed
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPickList/TestPickList.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPickList/TestPickList.java 2011-11-18 12:05:03 UTC (rev 22960)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPickList/TestPickList.java 2011-11-18 12:31:06 UTC (rev 22961)
@@ -59,13 +59,13 @@
private JQueryLocator a4jSubmit = pjq("input[id$=a4jButton]");
private JQueryLocator pickListTop = pjq("div.rf-pick[id$=pickList]");
- private JQueryLocator pickListSource = pjq("div.rf-pick-source div.rf-pick-lst-dcrtn"); // this locator works for
+ private JQueryLocator pickListSource = pjq("div.rf-pick-src div.rf-pick-lst-dcrtn"); // this locator works for
// sourcemouseover event
- private JQueryLocator pickListTarget = pjq("div.rf-pick-target div.rf-pick-lst-dcrtn");
+ private JQueryLocator pickListTarget = pjq("div.rf-pick-tgt div.rf-pick-lst-dcrtn");
private JQueryLocator output = pjq("span[id$=output]");
private JQueryLocator pickListMsgBox = pjq("span.rf-msg-err[id$=pickList] > span.rf-msg-det");
- private JQueryLocator targetCaptionLocator = pjq("div[id$=pickListTargetList] > div.rf-pick-target-caption");
- private JQueryLocator sourceCaptionLocator = pjq("div[id$=pickListSourceList] > div.rf-pick-source-caption");
+ private JQueryLocator targetCaptionLocator = pjq("div[id$=pickListTargetList] > div.rf-pick-tgt-cptn");
+ private JQueryLocator sourceCaptionLocator = pjq("div[id$=pickListSourceList] > div.rf-pick-src-cptn");
private JQueryLocator pickListCtrl = pjq("div.rf-pick-lst-scrl");
private JQueryLocator pickListOrderingControlsContainer = pjq("table[id$=pickListTarget] td:eq(1)");
14 years, 1 month
JBoss Rich Faces SVN: r22960 - modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2011-11-18 07:05:03 -0500 (Fri, 18 Nov 2011)
New Revision: 22960
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/OrderingList.java
Log:
8 tests for ordering list fixed
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/OrderingList.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/OrderingList.java 2011-11-18 11:33:41 UTC (rev 22959)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/OrderingList.java 2011-11-18 12:05:03 UTC (rev 22960)
@@ -84,7 +84,7 @@
throw new IndexOutOfBoundsException("The index of column <" + indexColumn + "> is out of the range [0, "
+ getNumberOfColumns() + "]");
}
- return jq(getItem(indexItem).getRawLocator() + " > .rf-ord-cell:eq(" + indexColumn + ")");
+ return jq(getItem(indexItem).getRawLocator() + " > .rf-ord-c:eq(" + indexColumn + ")");
}
public String getItemColumnValue(int indexItem, int indexColumn) {
@@ -105,7 +105,7 @@
public int getNumberOfColumns() {
if (numberOfColumns == -1) {
- numberOfColumns = selenium.getCount(jq(getItem(0).getRawLocator() + " > .rf-ord-cell"));
+ numberOfColumns = selenium.getCount(jq(getItem(0).getRawLocator() + " > .rf-ord-c"));
}
return numberOfColumns;
}
14 years, 1 month
JBoss Rich Faces SVN: r22959 - modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2011-11-18 06:33:41 -0500 (Fri, 18 Nov 2011)
New Revision: 22959
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/OrderingList.java
Log:
test for ordering list fixed
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/OrderingList.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/OrderingList.java 2011-11-18 10:46:50 UTC (rev 22958)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/OrderingList.java 2011-11-18 11:33:41 UTC (rev 22959)
@@ -40,7 +40,7 @@
private final JQueryLocator buttonDown = jq("button.rf-ord-dn");
private final JQueryLocator buttonTop = jq("button.rf-ord-up-tp");
private final JQueryLocator buttonUp = jq("button.rf-ord-up");
- private final JQueryLocator header = pjq("thead.rf-ord-lst-header > tr");
+ private final JQueryLocator header = pjq("thead.rf-ord-lst-hdr > tr");
private final JQueryLocator item = pjq("tbody[id$=orderingListItems] > tr.rf-ord-opt");
private final JQueryLocator itemSelected = pjq("tbody[id$=orderingListItems] > tr.rf-ord-opt.rf-ord-sel");
private final JQueryLocator list = pjq("div[id$=orderingList] div.rf-ord-lst-dcrtn");
14 years, 1 month
JBoss Rich Faces SVN: r22958 - modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTable.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2011-11-18 05:46:50 -0500 (Fri, 18 Nov 2011)
New Revision: 22958
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTable/TestCollapsibleSubTableSorting.java
Log:
test moved to 4.Future
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTable/TestCollapsibleSubTableSorting.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTable/TestCollapsibleSubTableSorting.java 2011-11-18 10:45:29 UTC (rev 22957)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTable/TestCollapsibleSubTableSorting.java 2011-11-18 10:46:50 UTC (rev 22958)
@@ -49,7 +49,7 @@
* @version $Revision$
*/
public class TestCollapsibleSubTableSorting extends AbstractCollapsibleSubTableTest {
-
+
@Inject
@Use(enumeration = true)
SortMode sortMode;
@@ -57,6 +57,7 @@
int rows = 0;
List<Column> sortPriority = new LinkedList<Column>();
+
@Override
public URL getTestUrl() {
return buildUrl(contextPath, "faces/components/richCollapsibleSubTable/sorting-using-column.xhtml");
@@ -68,7 +69,7 @@
Column.resetAll();
}
- @Test
+ @Test(groups = { "4.Future" })
@IssueTracking("https://issues.jboss.org/browse/RF-11302")
public void testSorting() {
collapsibleSubTabAttributes.set(CollapsibleSubTableAttributes.rows, rows);
14 years, 1 month
JBoss Rich Faces SVN: r22957 - modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richNotify.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2011-11-18 05:45:29 -0500 (Fri, 18 Nov 2011)
New Revision: 22957
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richNotify/AbstractRichNotifyTest.java
Log:
tests for notify fixed
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richNotify/AbstractRichNotifyTest.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richNotify/AbstractRichNotifyTest.java 2011-11-18 10:44:35 UTC (rev 22956)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richNotify/AbstractRichNotifyTest.java 2011-11-18 10:45:29 UTC (rev 22957)
@@ -65,12 +65,12 @@
/**
* error message locator
*/
- protected final JQueryLocator notifyError = jq("div.rf-ntf-error");
+ protected final JQueryLocator notifyError = jq("div.rf-ntf-err");
/**
* fatal message locator
*/
- protected final JQueryLocator notifyFatal = jq("div.rf-ntf-fatal");
+ protected final JQueryLocator notifyFatal = jq("div.rf-ntf-ftl");
/**
* history of notifies and notify messages
@@ -90,12 +90,12 @@
/**
* info message locator
*/
- protected final JQueryLocator notifyInfo = jq("div.rf-ntf-info");
+ protected final JQueryLocator notifyInfo = jq("div.rf-ntf-inf");
/**
* warn message locator
*/
- protected final JQueryLocator notifyWarn = jq("div.rf-ntf-warn");
+ protected final JQueryLocator notifyWarn = jq("div.rf-ntf-wrn");
/**
* It closes a message defined by the given locator
@@ -151,7 +151,7 @@
* @return the detail locator
*/
protected JQueryLocator getDetail(JQueryLocator message) {
- return jq(notify.getRawLocator() + " > div.rf-ntf-cnt > div.rf-ntf-txt");
+ return jq(notify.getRawLocator() + " > div.rf-ntf-cnt > div.rf-ntf-det");
}
/**
@@ -180,7 +180,7 @@
* @return the summary locator
*/
protected JQueryLocator getSummary(JQueryLocator message) {
- return jq(notify.getRawLocator() + " > div.rf-ntf-cnt > div.rf-ntf-tl");
+ return jq(notify.getRawLocator() + " > div.rf-ntf-cnt > div.rf-ntf-sum");
}
/**
14 years, 1 month