Author: lfryc(a)redhat.com Date: 2011-02-16 04:05:49 -0500 (Wed, 16 Feb 2011) New Revision: 21682 Added: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/annotations/RegressionTest.java Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/annotations/IssueTracking.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAccordion/TestRichAccordion.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCalendar/TestRichCalendarAttributes.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsiblePanel/TestRichCollapsiblePanel.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richSelect/TestRichSelect.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanel.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTogglePanel/TestRichTogglePanel.java Log: added @RegressionTest annotation + transition of closed issues to this annotation + removing issue tracking (RF-10061, RF-10040, RF-10255, RF-9737) Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/annotations/IssueTracking.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/annotations/IssueTracking.java 2011-02-16 08:51:09 UTC (rev 21681) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/annotations/IssueTracking.java 2011-02-16 09:05:49 UTC (rev 21682) @@ -27,7 +27,7 @@ import static java.lang.annotation.ElementType.*; /** - * @author <a href="mailto:ppitonak@redhat.com">Lukas Fryc</a> + * @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a> * @version $Revision$ */ @Target({ METHOD, TYPE }) Copied: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/annotations/RegressionTest.java (from rev 21672, modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/annotations/IssueTracking.java) =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/annotations/RegressionTest.java (rev 0) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/annotations/RegressionTest.java 2011-02-16 09:05:49 UTC (rev 21682) @@ -0,0 +1,37 @@ +/******************************************************************************* + * 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.annotations; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +import static java.lang.annotation.ElementType.*; + +/** + * @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a> + * @version $Revision$ + */ +@Target({ METHOD, TYPE }) +(a)Retention(RetentionPolicy.RUNTIME) +public @interface RegressionTest { + String[] value(); +} Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAccordion/TestRichAccordion.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAccordion/TestRichAccordion.java 2011-02-16 08:51:09 UTC (rev 21681) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAccordion/TestRichAccordion.java 2011-02-16 09:05:49 UTC (rev 21682) @@ -46,6 +46,7 @@ import org.jboss.test.selenium.waiting.EventFiredCondition; import org.richfaces.tests.metamer.ftest.AbstractMetamerTest; import org.richfaces.tests.metamer.ftest.annotations.IssueTracking; +import org.richfaces.tests.metamer.ftest.annotations.RegressionTest; import org.testng.annotations.Test; /** @@ -172,7 +173,7 @@ } @Test - @IssueTracking("https://issues.jboss.org/browse/RF-10061") + @RegressionTest("https://issues.jboss.org/browse/RF-10061") public void testData() { selenium.type(pjq("input[type=text][id$=dataInput]"), "RichFaces 4"); selenium.waitForPageToLoad(); @@ -524,7 +525,7 @@ } @Test - @IssueTracking("https://issues.jboss.org/browse/RF-10040") + @RegressionTest("https://issues.jboss.org/browse/RF-10040") public void testSwitchTypeServer() { selenium.click(pjq("input[type=radio][name$=switchTypeInput][value=server]")); selenium.waitForPageToLoad(); Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCalendar/TestRichCalendarAttributes.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCalendar/TestRichCalendarAttributes.java 2011-02-16 08:51:09 UTC (rev 21681) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCalendar/TestRichCalendarAttributes.java 2011-02-16 09:05:49 UTC (rev 21682) @@ -41,6 +41,7 @@ import org.jboss.test.selenium.locator.AttributeLocator; import org.jboss.test.selenium.waiting.EventFiredCondition; import org.richfaces.tests.metamer.ftest.annotations.IssueTracking; +import org.richfaces.tests.metamer.ftest.annotations.RegressionTest; import org.testng.annotations.Test; /** @@ -190,7 +191,7 @@ } @Test - @IssueTracking("https://issues.jboss.org/browse/RF-10255") + @RegressionTest("https://issues.jboss.org/browse/RF-10255") public void testButtonDisabledIcon() { selenium.click(pjq("input[name$=disabledInput][value=true]")); selenium.waitForPageToLoad(); @@ -263,7 +264,8 @@ for (int i = 2; i < 42; i += 7) { if (!selenium.belongsClass(cellDay.format(i), "rf-cal-boundary-day")) { - assertTrue(selenium.belongsClass(cellDay.format(i), "yellowDay"), "Cell nr. " + i + " should be yellow."); + assertTrue(selenium.belongsClass(cellDay.format(i), "yellowDay"), "Cell nr. " + i + + " should be yellow."); } } @@ -273,12 +275,13 @@ selenium.click(input); for (int i = 0; i < 42; i++) { - assertFalse(selenium.belongsClass(cellDay.format(i), "yellowDay"), "Cell nr. " + i + " should not be yellow."); + assertFalse(selenium.belongsClass(cellDay.format(i), "yellowDay"), "Cell nr. " + i + + " should not be yellow."); } } @Test - @IssueTracking("https://issues.jboss.org/browse/RF-9837 https://issues.jboss.org/browse/RF-10085") + @RegressionTest({ "https://issues.jboss.org/browse/RF-9837", "https://issues.jboss.org/browse/RF-10085" }) public void testDefaultTime() { selenium.type(pjq("input[type=text][id$=defaultTimeInput]"), "21:24"); selenium.waitForPageToLoad(); @@ -328,7 +331,7 @@ selenium.click(input); - String[] labels = {"", "Sat", "Sun", "Mon", "Tue", "Wed", "Thu", "Fri"}; + String[] labels = { "", "Sat", "Sun", "Mon", "Tue", "Wed", "Thu", "Fri" }; for (int i = 0; i < 8; i++) { String label = selenium.getText(weekDayLabel.format(i)); @@ -344,8 +347,8 @@ // labels = new String[]{"", "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; // // for (int i = 0; i < 8; i++) { - // String label = selenium.getText(weekDayLabel.format(i)); - // assertEquals(label, labels[i], "Week day label " + i); + // String label = selenium.getText(weekDayLabel.format(i)); + // assertEquals(label, labels[i], "Week day label " + i); // } } @@ -376,7 +379,7 @@ selenium.click(input); - String[] labels = {"", "Вс", "Пн", "Вт", "Ср", "Чт", "Пт", "Сб"}; + String[] labels = { "", "Вс", "Пн", "Вт", "Ср", "Чт", "Пт", "Сб" }; for (int i = 0; i < 8; i++) { String label = selenium.getText(weekDayLabel.format(i)); @@ -389,7 +392,8 @@ String selectedDate = null; try { - Date date = new SimpleDateFormat("d MMMM, yyyy hh:mm", new Locale("ru")).parse(day + " " + month + " 12:00"); + Date date = new SimpleDateFormat("d MMMM, yyyy hh:mm", new Locale("ru")) + .parse(day + " " + month + " 12:00"); selectedDate = new SimpleDateFormat("MMM d, yyyy hh:mm", new Locale("ru")).format(date); } catch (ParseException ex) { fail(ex.getMessage()); @@ -417,7 +421,7 @@ selenium.type(input, "Dec 23, 2010 19:27"); waitGui.failWith("Attribute oninputchange does not work correctly").until( - new EventFiredCondition(new Event("inputchange"))); + new EventFiredCondition(new Event("inputchange"))); } @Test @@ -675,13 +679,16 @@ */ private void assertNoDateSelected() { for (int i = 0; i < 42; i++) { - assertFalse(selenium.belongsClass(cellDay.format(i), "rf-cal-sel"), "Cell nr. " + i + " should not be selected."); + assertFalse(selenium.belongsClass(cellDay.format(i), "rf-cal-sel"), "Cell nr. " + i + + " should not be selected."); } } /** * Checks that no date in the open month is selected except of one passed as argument. - * @param exceptOfDate date that should be selected (e.g. "13") + * + * @param exceptOfDate + * date that should be selected (e.g. "13") */ private void assertSelected(String exceptOfDate) { int lowerBoundary = 0; @@ -696,9 +703,11 @@ // check 3 lines of cells that contain selected date for (int i = lowerBoundary; i < upperBoundary; i++) { if (exceptOfDate.equals(selenium.getText(cellDay.format(i)))) { - assertTrue(selenium.belongsClass(cellDay.format(i), "rf-cal-sel"), "Cell nr. " + i + " should not be selected."); + assertTrue(selenium.belongsClass(cellDay.format(i), "rf-cal-sel"), "Cell nr. " + i + + " should not be selected."); } else { - assertFalse(selenium.belongsClass(cellDay.format(i), "rf-cal-sel"), "Cell nr. " + i + " should not be selected."); + assertFalse(selenium.belongsClass(cellDay.format(i), "rf-cal-sel"), "Cell nr. " + i + + " should not be selected."); } } @@ -707,7 +716,8 @@ // check other 3 lines of cells for (int i = lowerBoundary; i < upperBoundary; i++) { - assertFalse(selenium.belongsClass(cellDay.format(i), "rf-cal-sel"), "Cell nr. " + i + " should not be selected."); + assertFalse(selenium.belongsClass(cellDay.format(i), "rf-cal-sel"), "Cell nr. " + i + + " should not be selected."); } } } Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsiblePanel/TestRichCollapsiblePanel.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsiblePanel/TestRichCollapsiblePanel.java 2011-02-16 08:51:09 UTC (rev 21681) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsiblePanel/TestRichCollapsiblePanel.java 2011-02-16 09:05:49 UTC (rev 21682) @@ -43,6 +43,7 @@ import org.jboss.test.selenium.locator.JQueryLocator; import org.richfaces.tests.metamer.ftest.AbstractMetamerTest; import org.richfaces.tests.metamer.ftest.annotations.IssueTracking; +import org.richfaces.tests.metamer.ftest.annotations.RegressionTest; import org.testng.annotations.Test; /** @@ -95,7 +96,7 @@ } @Test - @IssueTracking("https://issues.jboss.org/browse/RF-10061") + @RegressionTest("https://issues.jboss.org/browse/RF-10061") public void testData() { selenium.type(pjq("input[type=text][id$=dataInput]"), "RichFaces 4"); selenium.waitForPageToLoad(); Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richSelect/TestRichSelect.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richSelect/TestRichSelect.java 2011-02-16 08:51:09 UTC (rev 21681) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richSelect/TestRichSelect.java 2011-02-16 09:05:49 UTC (rev 21682) @@ -21,15 +21,16 @@ *******************************************************************************/ package org.richfaces.tests.metamer.ftest.richSelect; -import static org.jboss.test.selenium.locator.LocatorFactory.jq; 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.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 javax.faces.event.PhaseId; import org.jboss.test.selenium.css.CssProperty; @@ -40,6 +41,7 @@ import org.jboss.test.selenium.waiting.EventFiredCondition; import org.richfaces.tests.metamer.ftest.AbstractMetamerTest; import org.richfaces.tests.metamer.ftest.annotations.IssueTracking; +import org.richfaces.tests.metamer.ftest.annotations.RegressionTest; import org.testng.annotations.Test; /** @@ -232,7 +234,7 @@ } @Test - @IssueTracking("https://issues.jboss.org/browse/RF-9737") + @RegressionTest("https://issues.jboss.org/browse/RF-9737") public void testListHeight() { selenium.type(pjq("input[type=text][id$=listHeightInput]"), "300px"); selenium.waitForPageToLoad(); @@ -251,7 +253,7 @@ } @Test - @IssueTracking("https://issues.jboss.org/browse/RF-9737") + @RegressionTest("https://issues.jboss.org/browse/RF-9737") public void testListWidth() { selenium.type(pjq("input[type=text][id$=listWidthInput]"), "300px"); selenium.waitForPageToLoad(); Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanel.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanel.java 2011-02-16 08:51:09 UTC (rev 21681) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanel.java 2011-02-16 09:05:49 UTC (rev 21682) @@ -42,6 +42,7 @@ import org.jboss.test.selenium.waiting.EventFiredCondition; import org.richfaces.tests.metamer.ftest.AbstractMetamerTest; import org.richfaces.tests.metamer.ftest.annotations.IssueTracking; +import org.richfaces.tests.metamer.ftest.annotations.RegressionTest; import org.testng.annotations.Test; /** @@ -178,7 +179,8 @@ } @Test - @IssueTracking("https://issues.jboss.org/browse/RF-10061 https://issues.jboss.org/browse/RF-10521") + @IssueTracking("https://issues.jboss.org/browse/RF-10521") + @RegressionTest("https://issues.jboss.org/browse/RF-10061") public void testData() { selenium.type(pjq("input[type=text][id$=dataInput]"), "RichFaces 4"); selenium.waitForPageToLoad(); @@ -433,7 +435,7 @@ } @Test - @IssueTracking("https://issues.jboss.org/browse/RF-10040") + @RegressionTest("https://issues.jboss.org/browse/RF-10040") public void testSwitchTypeServer() { selenium.click(pjq("input[name$=switchTypeInput][value=server]")); selenium.waitForPageToLoad(); Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTogglePanel/TestRichTogglePanel.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTogglePanel/TestRichTogglePanel.java 2011-02-16 08:51:09 UTC (rev 21681) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTogglePanel/TestRichTogglePanel.java 2011-02-16 09:05:49 UTC (rev 21682) @@ -41,6 +41,7 @@ import org.jboss.test.selenium.waiting.EventFiredCondition; import org.richfaces.tests.metamer.ftest.AbstractMetamerTest; import org.richfaces.tests.metamer.ftest.annotations.IssueTracking; +import org.richfaces.tests.metamer.ftest.annotations.RegressionTest; import org.testng.annotations.Test; /** @@ -139,7 +140,7 @@ } @Test - @IssueTracking("https://issues.jboss.org/browse/RF-10040") + @RegressionTest("https://issues.jboss.org/browse/RF-10040") public void testFirstLastPrevNextSwitchServer() { selenium.click(pjq("input[name$=switchTypeInput][value=server]")); selenium.waitForPageToLoad(); @@ -209,7 +210,7 @@ } @Test - @IssueTracking("https://issues.jboss.org/browse/RF-10061") + @RegressionTest("https://issues.jboss.org/browse/RF-10061") public void testData() { selenium.type(pjq("input[type=text][id$=dataInput]"), "RichFaces 4"); selenium.waitForPageToLoad(); @@ -473,7 +474,7 @@ } @Test - @IssueTracking("https://issues.jboss.org/browse/RF-10040") + @RegressionTest("https://issues.jboss.org/browse/RF-10040") public void testSwitchTypeServer() { selenium.click(pjq("input[name$=switchTypeInput][value=server]")); selenium.waitForPageToLoad();