Author: lfryc(a)redhat.com Date: 2009-09-02 08:22:33 -0400 (Wed, 02 Sep 2009) New Revision: 15436 Modified: branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/queue/QueueSettingsTestCase.java branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/queue/QueueTestCase.java branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/resources/org/jboss/richfaces/integrationTest/queue/locators.properties branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/resources/org/jboss/richfaces/integrationTest/queue/messages.properties Log: - refactored Queue test cases to follow conventions Modified: branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/queue/QueueSettingsTestCase.java =================================================================== --- branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/queue/QueueSettingsTestCase.java 2009-09-02 10:00:52 UTC (rev 15435) +++ branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/queue/QueueSettingsTestCase.java 2009-09-02 12:22:33 UTC (rev 15436) @@ -1,13 +1,33 @@ +/** + * License Agreement. + * + * JBoss RichFaces + * + * Copyright (C) 2009 Red Hat, Inc. + * + * This code is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This code 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 test suite; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ package org.jboss.richfaces.integrationTest.queue; -import junit.framework.Assert; +import static org.testng.Assert.*; import org.apache.commons.lang.StringUtils; import org.jboss.richfaces.integrationTest.AbstractSeleniumRichfacesTestCase; import org.jboss.test.selenium.dom.Event; import org.jboss.test.selenium.utils.array.ArrayTransform; -import org.jboss.test.selenium.waiting.Condition; -import org.jboss.test.selenium.waiting.Wait; +import org.jboss.test.selenium.waiting.*; +import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; /** @@ -15,125 +35,125 @@ * @version $Revision$ */ public class QueueSettingsTestCase extends AbstractSeleniumRichfacesTestCase { + private final String LOC_FIELDSET_HEADER = getLoc("FIELDSET_HEADER"); + private final String LOC_INPUT_TYPED_TEXT = getLoc("INPUT_TYPED_TEXT"); + private final String LOC_OUTPUT_TYPED_TEXT = getLoc("OUTPUT_TYPED_TEXT"); + private final String LOC_OUTPUT_EVENTS_COUNT = getLoc("OUTPUT_EVENTS_COUNT"); + private final String LOC_OUTPUT_REQUESTS_COUNT = getLoc("OUTPUT_REQUESTS_COUNT"); + private final String LOC_OUTPUT_DOM_UPDATES_COUNT = getLoc("OUTPUT_DOM_UPDATES_COUNT"); + private final String LOC_INPUT_REQUEST_DELAY = getLoc("INPUT_REQUEST_DELAY"); + private final String LOC_CHECKBOX_IGNORE_DUP_RESPONSES = getLoc("CHECKBOX_IGNORE_DUP_RESPONSES"); + private final String LOC_CHECKBOX_DISABLE_QUEUE = getLoc("CHECKBOX_DISABLE_QUEUE"); + private final String LOC_BUTTON_APPLY_SETTINGS = getLoc("BUTTON_APPLY_SETTINGS"); + + private final String[] MSG_DELAY_LIST = StringUtils.split(getMsg("DELAY_LIST"), ','); + private final String MSG_CHAR_FAST_TYPING = getMsg("MSG_CHAR_FAST_TYPING"); + /** - * Opens specified page + * Set queue queue disabled and test it with typing as fast is possible and + * check that after typing is counters set right: DOM updates count == + * Events count, Requests count is zero (queue disabled) */ - public void openPage() { - selenium.allowNativeXpath("true"); + @Test + public void testDisabledQueue() { + setQueue(10, false, true); - selenium.open(format("{0}/{1}", contextPath, PAGE)); - - scrollIntoView(header, true); - } - - private final String PAGE = "richfaces/queue.jsf?c=queue&tab=queueSettings"; - private final String header = getLoc("queue-settings--header"); - private final String inputText = getLoc("queue-settings--input--text"); - private final String outputText = getLoc("queue-settings--output--text"); - private final String outputEventsCount = getLoc("queue-settings--output--events-count"); - private final String outputRequestsCount = getLoc("queue-settings--output--requests-count"); - private final String outputDOMUpdatesCount = getLoc("queue-settings--output--dom-updates-count"); - -// @Test - public void disabledQueueTest() { - openPage(); - - setQueue(10, false, true); fastTyping(); - int eventsCount = Integer.valueOf(selenium.getText(outputEventsCount)); - int requestsCount = Integer.valueOf(selenium - .getText(outputRequestsCount)); - int domUpdatesCount = Integer.valueOf(selenium - .getText(outputDOMUpdatesCount)); + int eventsCount = Integer.valueOf(selenium.getText(LOC_OUTPUT_EVENTS_COUNT)); + int requestsCount = Integer.valueOf(selenium.getText(LOC_OUTPUT_REQUESTS_COUNT)); + int domUpdatesCount = Integer.valueOf(selenium.getText(LOC_OUTPUT_DOM_UPDATES_COUNT)); - Assert.assertEquals(eventsCount, domUpdatesCount); - Assert.assertEquals(0, requestsCount); + assertEquals(0, requestsCount, "Requests count should be 0 (queue disabled)"); + assertTrue(eventsCount == domUpdatesCount, "Count of Events and Dom Updates should equal"); } + /** + * Set queue to NOT Ignore Duplicated Responses and test it with typing as + * fast is possible and check that after typing is counters set right: DOM + * updates count == Requests count, Requests count <= Events count + */ @Test - public void dontIgnoreDuplicatedResponsesTest() { - openPage(); + public void testDontIgnoreDuplicatedResponses() { + setQueue(10, false, false); - setQueue(10, false, false); fastTyping(); - int eventsCount = Integer.valueOf(selenium.getText(outputEventsCount)); - int requestsCount = Integer.valueOf(selenium - .getText(outputRequestsCount)); - int domUpdatesCount = Integer.valueOf(selenium - .getText(outputDOMUpdatesCount)); + int eventsCount = Integer.valueOf(selenium.getText(LOC_OUTPUT_EVENTS_COUNT)); + int requestsCount = Integer.valueOf(selenium.getText(LOC_OUTPUT_REQUESTS_COUNT)); + int domUpdatesCount = Integer.valueOf(selenium.getText(LOC_OUTPUT_DOM_UPDATES_COUNT)); - Assert.assertTrue(requestsCount <= eventsCount); - Assert.assertEquals(requestsCount, domUpdatesCount); + assertTrue(requestsCount == domUpdatesCount, "Count of Requests and Dom Updates should equal"); + assertTrue(requestsCount <= eventsCount, "Count of Requests should be less than or equal Events count"); } -// @Test - public void ignoreDuplicatedResponsesTest() { - openPage(); - + /** + * Set queue to Ignore Duplicated Responses and test it with typing as fast + * is possible and check that after typing is counters set right: DOM + * updates count <= Requests count, Requests count <= Events count + */ + @Test + public void testIgnoreDuplicatedResponses() { setQueue(10, true, false); fastTyping(); - int eventsCount = Integer.valueOf(selenium.getText(outputEventsCount)); - int requestsCount = Integer.valueOf(selenium - .getText(outputRequestsCount)); - int domUpdatesCount = Integer.valueOf(selenium - .getText(outputDOMUpdatesCount)); + int eventsCount = Integer.valueOf(selenium.getText(LOC_OUTPUT_EVENTS_COUNT)); + int requestsCount = Integer.valueOf(selenium.getText(LOC_OUTPUT_REQUESTS_COUNT)); + int domUpdatesCount = Integer.valueOf(selenium.getText(LOC_OUTPUT_DOM_UPDATES_COUNT)); - Assert.assertTrue(domUpdatesCount <= requestsCount); - Assert.assertTrue(requestsCount <= eventsCount); + assertTrue(domUpdatesCount <= requestsCount, "Count of Dom Updates should be less than or equal Requests count"); + assertTrue(requestsCount <= eventsCount, "Count of Requests should be less than or equal Events count"); } -// @Test - public void requestDelayTest() { - openPage(); + /** + * Types characters and check that output will not change for defined time + * (queue delay) and when it actually change, check that it have value of + * input and that counters are printed right. + */ + @Test + public void testRequestDelay() { + Integer[] delays = stringsToInteger.transform(MSG_DELAY_LIST); - Integer[] delays = new ArrayTransform<String, Integer>(Integer.class) { - public Integer transformation(String source) { - return Integer.valueOf(source); - } - }.transform(StringUtils.splitPreserveAllTokens( - getMess("queue-settings--delays"), ',')); - for (final int delay : delays) { setQueue(delay, false, false); - int count = 1; + // initiate time borders for the test final long start = currentTime(); - long end = start + 10000; - final StringBuffer text = new StringBuffer(); + final long end = start + 10000; + // create a buffer for whole text in input + final StringBuffer typedText = new StringBuffer(); - while (count <= 3 || (count <= 100 && currentTime() < end)) { - final String lastText = text.toString(); - text.append(Integer.toString(count % 10)); - selenium.type(inputText, text.toString()); + // type at least 3 and at most 100 characters and don't exhause + // border of 10 sec. for this tests + while (typedText.length() <= 3 || (typedText.length() <= 100 && currentTime() < end)) { + final String lastText = typedText.toString(); + + // type char '1-9' like last decimal char of buffer's length + typedText.append(Integer.toString(typedText.length() % 10)); + selenium.type(LOC_INPUT_TYPED_TEXT, typedText.toString()); + final long eventTime = currentTime(); - selenium.fireEvent(inputText, Event.KEYUP); - Wait.dontFail().interval(delay / 4).timeout(delay).until( - new Condition() { - public boolean isTrue() { - String actualText = selenium - .getText(outputText); - long currentTime = currentTime(); - Assert.assertTrue(currentTime >= eventTime - + delay - || lastText.equals(actualText)); - return currentTime >= eventTime + delay; - } - }); - waitForTextEquals(outputText, text.toString()); + selenium.fireEvent(LOC_INPUT_TYPED_TEXT, Event.KEYUP); - String actualCount = Integer.toString(count); - Assert.assertEquals(actualCount, selenium - .getText(outputEventsCount)); - Assert.assertEquals(actualCount, selenium - .getText(outputRequestsCount)); - Assert.assertEquals(actualCount, selenium - .getText(outputDOMUpdatesCount)); + // check that text will not change for defined time (delay) + Wait.dontFail().interval(delay / 4).timeout(delay).until(new Condition() { + public boolean isTrue() { + final String actualText = selenium.getText(LOC_OUTPUT_TYPED_TEXT); + long currentTime = currentTime(); + assertTrue(currentTime >= eventTime + delay || lastText.equals(actualText)); + return currentTime >= eventTime + delay; + } + }); - count++; + // wait for output actually changes to value of input + waitForTextEquals(LOC_OUTPUT_TYPED_TEXT, typedText.toString()); + + // check that all output counts are right + String actualCount = Integer.toString(typedText.length()); + assertEquals(actualCount, selenium.getText(LOC_OUTPUT_EVENTS_COUNT)); + assertEquals(actualCount, selenium.getText(LOC_OUTPUT_REQUESTS_COUNT)); + assertEquals(actualCount, selenium.getText(LOC_OUTPUT_DOM_UPDATES_COUNT)); } } } @@ -142,19 +162,15 @@ return System.currentTimeMillis(); } - private void setQueue(int delay, boolean ignoreDuplicatedResponses, - boolean disableQueue) { - final String inputRequestDelay = getLoc("queue-settings--input--request-delay"); - final String checkboxIgnoreDupResponces = getLoc("queue-settings--checkbox--ignore-dup-responses"); - final String checkboxDisableQueue = getLoc("queue-settings--checkbox--disable-queue"); - final String buttonApply = getLoc("queue-settings--button--apply"); - - selenium.type(inputRequestDelay, Integer.toString(delay)); - check(checkboxIgnoreDupResponces, ignoreDuplicatedResponses); - check(checkboxDisableQueue, disableQueue); - selenium.click(buttonApply); + private void setQueue(int delay, boolean ignoreDuplicatedResponses, boolean disableQueue) { + selenium.type(LOC_INPUT_REQUEST_DELAY, Integer.toString(delay)); + check(LOC_CHECKBOX_IGNORE_DUP_RESPONSES, ignoreDuplicatedResponses); + check(LOC_CHECKBOX_DISABLE_QUEUE, disableQueue); + + selenium.click(LOC_BUTTON_APPLY_SETTINGS); selenium.waitForPageToLoad(Long.toString(Wait.DEFAULT_TIMEOUT)); - scrollIntoView(header, true); + + scrollIntoView(LOC_FIELDSET_HEADER, true); } private void check(String locator, boolean check) { @@ -167,14 +183,30 @@ private void fastTyping() { StringBuffer text = new StringBuffer(); - final String charToType = getMess("queue-settings--char-to-type"); for (int i = 1; i <= 75; i++) { - text.append(charToType); - selenium.type(inputText, text.toString()); - selenium.fireEvent(inputText, Event.KEYUP); + text.append(MSG_CHAR_FAST_TYPING); + + selenium.type(LOC_INPUT_TYPED_TEXT, text.toString()); + selenium.fireEvent(LOC_INPUT_TYPED_TEXT, Event.KEYUP); } waitModelUpdate.waitForTimeout(); } + + private final ArrayTransform<String, Integer> stringsToInteger = new ArrayTransform<String, Integer>(Integer.class) { + public Integer transformation(String source) { + return Integer.valueOf(source); + } + }; + + @SuppressWarnings("unused") + @BeforeMethod + private void loadPage() { + openComponent("Queue"); + openTab("Queue Settings"); + + scrollIntoView(LOC_FIELDSET_HEADER, true); + } + } Modified: branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/queue/QueueTestCase.java =================================================================== --- branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/queue/QueueTestCase.java 2009-09-02 10:00:52 UTC (rev 15435) +++ branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/queue/QueueTestCase.java 2009-09-02 12:22:33 UTC (rev 15436) @@ -1,8 +1,29 @@ +/** + * License Agreement. + * + * JBoss RichFaces + * + * Copyright (C) 2009 Red Hat, Inc. + * + * This code is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This code 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 test suite; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ package org.jboss.richfaces.integrationTest.queue; -import junit.framework.Assert; +import static org.testng.Assert.*; import org.jboss.richfaces.integrationTest.AbstractSeleniumRichfacesTestCase; +import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; /** @@ -10,30 +31,38 @@ * @version $Revision$ */ public class QueueTestCase extends AbstractSeleniumRichfacesTestCase { + private String LOC_BUTTON_IMAGE_PREFORMATTED = getLoc("BUTTON_IMAGE_PREFORMATTED"); + private String LOC_OUTPUT_QUEUE_ITEM = getLoc("OUTPUT_QUEUE_ITEM"); + /** - * Opens specified page + * Enqueues several numbers (by clicking to numbered images) and waits for + * it it appears in the queue bottom. */ - private void openPage() { - selenium.open(contextPath + "/richfaces/queue.jsf?c=queue&tab=usage"); - } - - private String tableHeader = getLoc("queue--table-header"); - @Test - public void simpleQueueImagesTest() { - openPage(); - - scrollIntoView(tableHeader, true); - + public void testSimpleQueueImages() { int[] order = new int[] { 3, 7, 15, 3, 15 }; for (int i = 0; i < order.length; i++) { - selenium.click(formatLoc("queue--image-button", order[i])); + final String locButtonImage = format(LOC_BUTTON_IMAGE_PREFORMATTED, order[i]); + final String locQueueItem = format(LOC_OUTPUT_QUEUE_ITEM, order[i]); + + selenium.click(locButtonImage); + + scrollIntoView(locButtonImage, true); waitFor(1000); - Assert.assertTrue(selenium.isElementPresent(formatLoc( - "queue--item", order[i]))); + scrollIntoView(locQueueItem, false); + + assertTrue(selenium.isElementPresent(locQueueItem), format("The enqueued item isn't present '{0}'", + locQueueItem)); } } + + @SuppressWarnings("unused") + @BeforeMethod + private void loadPage() { + openComponent("Queue"); + openTab("Usage"); + } } Modified: branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/resources/org/jboss/richfaces/integrationTest/queue/locators.properties =================================================================== --- branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/resources/org/jboss/richfaces/integrationTest/queue/locators.properties 2009-09-02 10:00:52 UTC (rev 15435) +++ branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/resources/org/jboss/richfaces/integrationTest/queue/locators.properties 2009-09-02 12:22:33 UTC (rev 15436) @@ -1,13 +1,12 @@ -queue--table-header=//th[text()\='Ajax Requests'] -queue--image-button=//*[@id\='_{0}'] -queue--item=//*[@id\='tr1']//*[starts-with(text(),'_{0}')] -queue-settings--header=//legend[text()\='Queue demo'] -queue-settings--input--text=//*[text()\='Type here\:']/../*/*[@type\='text'] -queue-settings--output--text=//*[text()\='Repeated text\:']/../*/* -queue-settings--output--events-count=//*[text()\='Events count\:']/../*/* -queue-settings--output--requests-count=//*[text()\='Requests count\:']/../*/* -queue-settings--output--dom-updates-count=//*[text()\='DOM updates count\:']/../*/* -queue-settings--input--request-delay=//*[text()\='Request delay\:']/../*/*[@type\='text'] -queue-settings--checkbox--ignore-dup-responses=//*[text()\='Ignore Duplicated Responces']/../*/*[@type\='checkbox'] -queue-settings--checkbox--disable-queue=//*[text()\='Disable Queue']/../*/*[@type\='checkbox'] -queue-settings--button--apply=//*[@type\='submit' and @value\='Apply'] +BUTTON_IMAGE_PREFORMATTED=//*[@id\='_{0}'] +OUTPUT_QUEUE_ITEM=//*[@id\='tr1']//*[starts-with(text(),'_{0}')] +FIELDSET_HEADER=//legend[text()\='Queue demo'] +INPUT_TYPED_TEXT=//*[text()\='Type here\:']/../*/*[@type\='text'] +OUTPUT_TYPED_TEXT=//*[text()\='Repeated text\:']/../*/* +OUTPUT_EVENTS_COUNT=//*[text()\='Events count\:']/../*/* +OUTPUT_REQUESTS_COUNT=//*[text()\='Requests count\:']/../*/* +OUTPUT_DOM_UPDATES_COUNT=//*[text()\='DOM updates count\:']/../*/* +INPUT_REQUEST_DELAY=//*[text()\='Request delay\:']/../*/*[@type\='text'] +CHECKBOX_IGNORE_DUP_RESPONSES=//*[text()\='Ignore Duplicated Responces']/../*/*[@type\='checkbox'] +CHECKBOX_DISABLE_QUEUE=//*[text()\='Disable Queue']/../*/*[@type\='checkbox'] +BUTTON_APPLY_SETTINGS=//*[@type\='submit' and @value\='Apply'] Modified: branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/resources/org/jboss/richfaces/integrationTest/queue/messages.properties =================================================================== --- branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/resources/org/jboss/richfaces/integrationTest/queue/messages.properties 2009-09-02 10:00:52 UTC (rev 15435) +++ branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/resources/org/jboss/richfaces/integrationTest/queue/messages.properties 2009-09-02 12:22:33 UTC (rev 15436) @@ -1,2 +1,2 @@ -queue-settings--delays=9000,1000,200,50,10 -queue-settings--char-to-type=B +DELAY_LIST=9000,1000,200,50,10 +MSG_CHAR_FAST_TYPING=B