Author: jpapouse Date: 2011-07-20 08:20:22 -0400 (Wed, 20 Jul 2011) New Revision: 22560 Modified: modules/tests/metamer/branches/sandbox-components/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/watermark/AbstractWatermarkTest.java modules/tests/metamer/branches/sandbox-components/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/watermark/TestWatermarkInputSecret.java modules/tests/metamer/branches/sandbox-components/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/watermark/TestWatermarkInputText.java modules/tests/metamer/branches/sandbox-components/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/watermark/TestWatermarkInputTextArea.java modules/tests/metamer/branches/sandbox-components/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/watermark/TestWatermarkRichAutocomplete.java modules/tests/metamer/branches/sandbox-components/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/watermark/TestWatermarkRichCalendar.java modules/tests/metamer/branches/sandbox-components/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/watermark/TestWatermarkRichSelect.java Log: FPL-1521: simplified tests for watermark component Modified: modules/tests/metamer/branches/sandbox-components/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/watermark/AbstractWatermarkTest.java =================================================================== --- modules/tests/metamer/branches/sandbox-components/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/watermark/AbstractWatermarkTest.java 2011-07-20 12:18:32 UTC (rev 22559) +++ modules/tests/metamer/branches/sandbox-components/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/watermark/AbstractWatermarkTest.java 2011-07-20 12:20:22 UTC (rev 22560) @@ -102,7 +102,9 @@ }; } - abstract protected String getContent(JQueryLocator locator); + protected String getContent(JQueryLocator locator) { + return selenium.getValue(locator); + } protected JQueryLocator createOutputLocator() { return pjq("div[id$=output]"); Modified: modules/tests/metamer/branches/sandbox-components/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/watermark/TestWatermarkInputSecret.java =================================================================== --- modules/tests/metamer/branches/sandbox-components/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/watermark/TestWatermarkInputSecret.java 2011-07-20 12:18:32 UTC (rev 22559) +++ modules/tests/metamer/branches/sandbox-components/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/watermark/TestWatermarkInputSecret.java 2011-07-20 12:20:22 UTC (rev 22560) @@ -68,10 +68,5 @@ protected JQueryLocator createWatermarkedLocator() { return pjq("input[id$=watermarkedInput]"); } - - @Override - protected String getContent(JQueryLocator locator) { - return selenium.getValue(locator); - } } Modified: modules/tests/metamer/branches/sandbox-components/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/watermark/TestWatermarkInputText.java =================================================================== --- modules/tests/metamer/branches/sandbox-components/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/watermark/TestWatermarkInputText.java 2011-07-20 12:18:32 UTC (rev 22559) +++ modules/tests/metamer/branches/sandbox-components/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/watermark/TestWatermarkInputText.java 2011-07-20 12:20:22 UTC (rev 22560) @@ -67,11 +67,6 @@ @Override protected JQueryLocator createWatermarkedLocator() { return pjq("input[id$=watermarked]"); - } - - @Override - protected String getContent(JQueryLocator locator) { - return selenium.getValue(locator); } } Modified: modules/tests/metamer/branches/sandbox-components/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/watermark/TestWatermarkInputTextArea.java =================================================================== --- modules/tests/metamer/branches/sandbox-components/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/watermark/TestWatermarkInputTextArea.java 2011-07-20 12:18:32 UTC (rev 22559) +++ modules/tests/metamer/branches/sandbox-components/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/watermark/TestWatermarkInputTextArea.java 2011-07-20 12:20:22 UTC (rev 22560) @@ -68,9 +68,5 @@ protected JQueryLocator createWatermarkedLocator() { return pjq("textarea[id$=watermarked]"); } - - @Override - protected String getContent(JQueryLocator locator) { - return selenium.getValue(locator); - } + } Modified: modules/tests/metamer/branches/sandbox-components/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/watermark/TestWatermarkRichAutocomplete.java =================================================================== --- modules/tests/metamer/branches/sandbox-components/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/watermark/TestWatermarkRichAutocomplete.java 2011-07-20 12:18:32 UTC (rev 22559) +++ modules/tests/metamer/branches/sandbox-components/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/watermark/TestWatermarkRichAutocomplete.java 2011-07-20 12:20:22 UTC (rev 22560) @@ -68,9 +68,5 @@ protected JQueryLocator createWatermarkedLocator() { return pjq("input[id$=watermarkedInput]"); } - - @Override - protected String getContent(JQueryLocator locator) { - return selenium.getValue(locator); - } + } Modified: modules/tests/metamer/branches/sandbox-components/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/watermark/TestWatermarkRichCalendar.java =================================================================== --- modules/tests/metamer/branches/sandbox-components/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/watermark/TestWatermarkRichCalendar.java 2011-07-20 12:18:32 UTC (rev 22559) +++ modules/tests/metamer/branches/sandbox-components/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/watermark/TestWatermarkRichCalendar.java 2011-07-20 12:20:22 UTC (rev 22560) @@ -98,10 +98,5 @@ @Override protected JQueryLocator createWatermarkedLocator() { return pjq("input[id$=watermarkedInputDate]"); - } - - @Override - protected String getContent(JQueryLocator locator) { - return selenium.getValue(locator); - } + } } \ No newline at end of file Modified: modules/tests/metamer/branches/sandbox-components/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/watermark/TestWatermarkRichSelect.java =================================================================== --- modules/tests/metamer/branches/sandbox-components/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/watermark/TestWatermarkRichSelect.java 2011-07-20 12:18:32 UTC (rev 22559) +++ modules/tests/metamer/branches/sandbox-components/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/watermark/TestWatermarkRichSelect.java 2011-07-20 12:20:22 UTC (rev 22560) @@ -92,13 +92,13 @@ selenium.click(selectPopupAlabama); waitModel - .failWith("Selecting item from popup list doesn't work. The value of the watermarked field is <" + getContent(getWatermarkedLocator()) + ">.") + .failWith("Selecting item from popup list doesn't work. The value of the watermarked field is <" + getWatermarkContent(getWatermarkedLocator()) + ">.") .until(createContentCondition(getWatermarkedLocator(), "Alabama")); selenium.type(getWatermarkedLocator(), ""); selenium.fireEvent(getWatermarkedLocator(), Event.BLUR); waitModel - .failWith("After selecting item from popup list and deleting text in the field, the watermark text should appear. The value of the watermarked field is <" + getContent(getWatermarkedLocator()) + ">.") + .failWith("After selecting item from popup list and deleting text in the field, the watermark text should appear. The value of the watermarked field is <" + getWatermarkContent(getWatermarkedLocator()) + ">.") .until(createContentCondition(getWatermarkedLocator(), WatermarkBean.DEFAULT_WATERMARK_TEXT)); assertTrue(selenium.belongsClass(getWatermarkedLocator(), "rf-sel-dflt-lbl"), "After selecting item from popup list and deleting text in the field, the field should belong to the css class <rf-sel-dflt-lbl>."); @@ -108,10 +108,6 @@ protected JQueryLocator createWatermarkedLocator() { return pjq("input[id$=watermarkedInput]"); } - - @Override - protected String getContent(JQueryLocator locator) { - return selenium.getValue(locator); - } + } \ No newline at end of file