Index: src/test/it/com/xpn/xwiki/watch/it/selenium/AllTests.java
===================================================================
--- src/test/it/com/xpn/xwiki/watch/it/selenium/AllTests.java	(revision 11245)
+++ src/test/it/com/xpn/xwiki/watch/it/selenium/AllTests.java	(working copy)
@@ -48,6 +48,7 @@
         // (there are complex solutions like searching for all tests by parsing the source tree).
         // I think there are TestSuite that do this out there but I haven't looked for them yet.
         addTestCase(suite, WatchGWTLoadingTest.class);
+        addTestCase(suite, WatchFilterFeedsTest.class);
 
         return new XWikiTestSetup(suite);
     }
Index: src/test/it/com/xpn/xwiki/watch/it/selenium/WatchFilterFeedsTest.java
===================================================================
--- src/test/it/com/xpn/xwiki/watch/it/selenium/WatchFilterFeedsTest.java	(revision 0)
+++ src/test/it/com/xpn/xwiki/watch/it/selenium/WatchFilterFeedsTest.java	(revision 0)
@@ -0,0 +1,283 @@
+/*
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * 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 com.xpn.xwiki.watch.it.selenium;
+
+import com.xpn.xwiki.it.selenium.framework.AbstractXWikiTestCase;
+import com.xpn.xwiki.it.selenium.framework.AlbatrossSkinExecutor;
+import com.xpn.xwiki.it.selenium.framework.XWikiTestSuite;
+
+import junit.framework.Test;
+
+/**
+ * Verify the Feeds Reader in Watch
+ * 
+ * @version $Id: $
+ */
+public class WatchFilterFeedsTest extends AbstractXWikiTestCase
+{
+    public static Test suite()
+    {
+        XWikiTestSuite suite = new XWikiTestSuite("Verify Feeds Reader in Watch");
+        suite.addTestSuite(WatchFilterFeedsTest.class, AlbatrossSkinExecutor.class);
+        return suite;
+    }
+
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+        loginAsAdmin();
+    }
+
+    /**
+     * This method makes the following tests :
+     *
+     * <ul>
+     * <li>Opens the Feeds Reader for XWiki instance.</li>
+     * <li>Sets the delay time after each operation at 1,5 sec.</li>
+     * <li>Creates a new Feeds group, then creates a new Feed.</li>
+     * <li>Is listing the articles that haven't been read. Checks one - Click Next - Checks one - Click Previuos - Checks an other one.</li>
+     * <li>Is listing the articles that have been read.</li>
+     * <li>Is listing the articles that haven't been read. Then marks 4 articles. Then lists only the one whom have been marked.</li>
+     * <li>Is listing the articles that haven't been read. Then marks 4 articles for trash. Then lists only the one whom have been marked for trash.</li>
+     * </ul>
+     */
+    public void testFilterOptions()
+    {
+    	open("/xwiki/bin/view/Watch/Reader");
+    	getSelenium().setSpeed("1500");
+    	getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Welcome to XWiki Watch') != -1;", "2000");
+    	getSelenium().waitForCondition("var value=selenium.doClick(\"//img[@title='Configure']\"); value!=''", "10000");
+    	getSelenium().waitForCondition("var value=selenium.doClick(\"//button[text()='Create a Group']\"); value!=''", "10000");
+    	getSelenium().type("group", "internfeeds1");
+    	getSelenium().waitForCondition("var value=selenium.doClick(\"//button[text()='Next']\"); value!=''", "10000");
+    	getSelenium().waitForCondition("var value=selenium.doClick(\"//img[@title='Configure']\"); value!=''", "10000");
+    	getSelenium().waitForCondition("var value=selenium.doClick(\"//button[text()='Add a RSS Feed']\"); value!=''", "10000");
+    	getSelenium().waitForCondition("var value=selenium.doClick(\"//button[text()='Add a RSS Feed URL']\"); value!=''", "10000");
+    	getSelenium().type("feedname", "interfeed1");
+    	getSelenium().type("feedurl", "http://localhost:8080/xwiki/bin/view/Main/WebRss?xpage=rdf");
+    	getSelenium().addSelection("//select", "label=internfeeds1");
+    	getSelenium().waitForCondition("var value=selenium.doClick(\"//button[text()='Next']\"); value!=''", "10000");
+    	getSelenium().waitForCondition("var value=selenium.doClick('check3'); value!=''","10000");
+    	//for uncheking
+    	getSelenium().waitForCondition("var value=selenium.doClick('check3'); value!=''","10000");
+    	assertElementPresent("//div[@class='watch-articlelist']/div[4]/div[@class='watch-article-titlebar']/div[@class='watch-article-titleline']/div[@class='gwt-HTML']");
+    	getSelenium().waitForCondition("var value=selenium.doClick(\"//div[@class='watch-articlelist']/div[4]/div[@class='watch-article-titlebar']/div[@class='watch-article-titleline']/div[@class='gwt-HTML']\"); value!=''","10000");
+    	//testing Next
+    	getSelenium().waitForCondition("var value=selenium.doClick(\"//div[text()='Next']\"); value!=''","10000");
+    	assertElementPresent("//div[@class='watch-articlelist']/div[4]/div[@class='watch-article-titlebar']/div[@class='watch-article-titleline']/div[@class='gwt-HTML']");
+    	getSelenium().waitForCondition("var value=selenium.doClick(\"//div[@class='watch-articlelist']/div[4]/div[@class='watch-article-titlebar']/div[@class='watch-article-titleline']/div[@class='gwt-HTML']\"); value!=''","10000");
+    	getSelenium().waitForCondition("var value=selenium.doClick(\"//div[text()='Previous']\"); value!=''","10000");
+    	assertElementPresent("//div[@class='watch-articlelist']/div[5]/div[@class='watch-article-titlebar']/div[@class='watch-article-titleline']/div[@class='gwt-HTML']");
+    	getSelenium().waitForCondition("var value=selenium.doClick(\"//div[@class='watch-articlelist']/div[5]/div[@class='watch-article-titlebar']/div[@class='watch-article-titleline']/div[@class='gwt-HTML']\"); value!=''","10000");
+    	getSelenium().waitForCondition("var value=selenium.doClick('check2'); value!=''","10000");
+    	getSelenium().waitForCondition("var value=selenium.doClick('check3'); value!=''","10000");
+    	getSelenium().click("//img[@title='Flag this article']");
+    	getSelenium().click("//img[@title='Flag this article']");
+    	getSelenium().waitForCondition("var value=selenium.doClick('check1'); value!=''","10000");
+    	getSelenium().waitForCondition("var value=selenium.doClick('check1'); value!=''","10000");
+    	getSelenium().click("//img[@title='Trash this article']");
+    	getSelenium().click("//img[@title='Trash this article']");
+    	getSelenium().waitForCondition("var value=selenium.doClick('check4'); value!=''","10000");
+    }
+    
+    /**
+     * This method makes the following tests :
+     *
+     * <ul>
+     * <li>Opens the Feeds Reader for XWiki instance.</li>
+     * <li>Sets the delay time after each operation at 1,5 sec.</li>
+     * <li>Creates a new Feeds group, then creates a new Feed.</li>
+     * <li>Is listing the articles that haven't been read.</li>
+     * <li>Is listing the articles that haven't been read from the date up until 17 of the current month.</li>
+     * <li>Reads one. Listing all articles that have been read until 17 of the current month</li>
+     * </ul>
+     */
+    public void testFilterCalendar()
+    {
+    	open("/xwiki/bin/view/Watch/Reader");
+    	getSelenium().setSpeed("1500");
+    	getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Welcome to XWiki Watch') != -1;", "2000");
+    	getSelenium().waitForCondition("var value=selenium.doClick(\"//img[@title='Configure']\"); value!=''", "10000");
+    	getSelenium().waitForCondition("var value=selenium.doClick(\"//button[text()='Create a Group']\"); value!=''", "10000");
+    	getSelenium().type("group", "internfeeds2");
+    	getSelenium().waitForCondition("var value=selenium.doClick(\"//button[text()='Next']\"); value!=''", "10000");
+    	getSelenium().waitForCondition("var value=selenium.doClick(\"//img[@title='Configure']\"); value!=''", "10000");
+    	getSelenium().waitForCondition("var value=selenium.doClick(\"//button[text()='Add a RSS Feed']\"); value!=''", "10000");
+    	getSelenium().waitForCondition("var value=selenium.doClick(\"//button[text()='Add a RSS Feed URL']\"); value!=''", "10000");
+    	getSelenium().type("feedname", "internfeed2");
+    	getSelenium().type("feedurl", "http://localhost:8080/xwiki/bin/view/Main/WebRss?xpage=rdf");
+    	getSelenium().addSelection("//select", "label=internfeeds2");
+    	getSelenium().waitForCondition("var value=selenium.doClick(\"//button[text()='Next']\"); value!=''", "10000");
+    	getSelenium().waitForCondition("var value=selenium.doClick('check3'); value!=''","10000");
+    	//for uncheking
+    	getSelenium().waitForCondition("var value=selenium.doClick('check3'); value!=''","10000");
+    	getSelenium().waitForCondition("var value=selenium.doClick(\"//div[text()='17']\"); value!=''","10000");
+    	assertElementPresent("//div[@class='watch-articlelist']/div[4]/div[@class='watch-article-titlebar']/div[@class='watch-article-titleline']/div[@class='gwt-HTML']");
+    	getSelenium().waitForCondition("var value=selenium.doClick(\"//div[@class='watch-articlelist']/div[4]/div[@class='watch-article-titlebar']/div[@class='watch-article-titleline']/div[@class='gwt-HTML']\"); value!=''","10000");
+    	getSelenium().waitForCondition("var value=selenium.doClick('check2'); value!=''","10000");
+    	getSelenium().waitForCondition("var value=selenium.doClick('check2'); value!=''","10000");    	
+    }
+   
+    /**
+     * This method makes the following tests :
+     *
+     * <ul>
+     * <li>Opens the Feeds Reader for XWiki instance.</li>
+     * <li>Sets the delay time after each operation at 1,5 sec.</li>
+     * <li>Creates a new Feeds group, then creates a new Feed. Creates a new keyword.</li>
+     * <li>Is listing the articles that haven't been read.</li>
+     * <li>Is listing the articles that haven't been read that contain the keyword.</li>
+     * </ul>
+     */
+    public void testKeyWordFilter()
+    {
+    	open("/xwiki/bin/view/Watch/Reader");
+    	getSelenium().setSpeed("1500");
+    	getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Welcome to XWiki Watch') != -1;", "2000");
+    	getSelenium().waitForCondition("var value=selenium.doClick(\"//img[@title='Configure']\"); value!=''", "10000");
+    	getSelenium().waitForCondition("var value=selenium.doClick(\"//button[text()='Create a Group']\"); value!=''", "10000");
+    	getSelenium().type("group", "internfeeds3");
+    	getSelenium().waitForCondition("var value=selenium.doClick(\"//button[text()='Next']\"); value!=''", "10000");
+    	getSelenium().waitForCondition("var value=selenium.doClick(\"//img[@title='Configure']\"); value!=''", "10000");
+    	getSelenium().waitForCondition("var value=selenium.doClick(\"//button[text()='Add a RSS Feed']\"); value!=''", "10000");
+    	getSelenium().waitForCondition("var value=selenium.doClick(\"//button[text()='Add a RSS Feed URL']\"); value!=''", "10000");
+    	getSelenium().type("feedname", "internfeed3");
+    	getSelenium().type("feedurl", "http://localhost:8080/xwiki/bin/view/Main/WebRss?xpage=rdf");
+    	getSelenium().addSelection("//select", "label=internfeeds3");
+    	getSelenium().waitForCondition("var value=selenium.doClick(\"//button[text()='Next']\"); value!=''", "10000");
+    	getSelenium().waitForCondition("var value=selenium.doClick(\"//img[@title='Configure']\"); value!=''", "10000");
+    	getSelenium().waitForCondition("var value=selenium.doClick(\"//button[text()='Add a Keyword']\"); value!=''", "10000");
+    	getSelenium().type("keyword", "xwiki");
+    	getSelenium().waitForCondition("var value=selenium.doClick(\"//button[text()='Next']\"); value!=''", "10000");
+    	getSelenium().waitForCondition("var value=selenium.doClick('check3'); value!=''","10000");
+    	getSelenium().waitForCondition("var value=selenium.doClick(\"//div[@title='xwiki']\"); value!=''","10000");
+    	getSelenium().waitForCondition("var value=selenium.doClick(\"//div[@title='xwiki']\"); value!=''","10000");
+    }
+    
+    /**
+     * This method makes the following tests :
+     *
+     * <ul>
+     * <li>Opens the Feeds Reader for XWiki instance.</li>
+     * <li>Sets the delay time after each operation at 1,5 sec.</li>
+     * <li>Creates a new Feeds group, then creates a new Feed. </li>
+     * <li>Is listing the articles that haven't been read.</li>
+     * <li>Reads a few. Then resets the filters</li>
+     * </ul>
+     */
+    public void testResetFilter()
+    {
+    	open("/xwiki/bin/view/Watch/Reader");
+    	getSelenium().setSpeed("1500");
+    	getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Welcome to XWiki Watch') != -1;", "2000");
+    	getSelenium().waitForCondition("var value=selenium.doClick(\"//img[@title='Configure']\"); value!=''", "10000");
+    	getSelenium().waitForCondition("var value=selenium.doClick(\"//button[text()='Create a Group']\"); value!=''", "10000");
+    	getSelenium().type("group", "internfeeds4");
+    	getSelenium().waitForCondition("var value=selenium.doClick(\"//button[text()='Next']\"); value!=''", "10000");
+    	getSelenium().waitForCondition("var value=selenium.doClick(\"//img[@title='Configure']\"); value!=''", "10000");
+    	getSelenium().waitForCondition("var value=selenium.doClick(\"//button[text()='Add a RSS Feed']\"); value!=''", "10000");
+    	getSelenium().waitForCondition("var value=selenium.doClick(\"//button[text()='Add a RSS Feed URL']\"); value!=''", "10000");
+    	getSelenium().type("feedname", "internfeed4");
+    	getSelenium().type("feedurl", "http://localhost:8080/xwiki/bin/view/Main/WebRss?xpage=rdf");
+    	getSelenium().addSelection("//select", "internfeeds4");
+    	getSelenium().waitForCondition("var value=selenium.doClick(\"//button[text()='Next']\"); value!=''", "10000");
+    	getSelenium().waitForCondition("var value=selenium.doClick('check3'); value!=''","10000");
+    	assertElementPresent("//div[@class='watch-articlelist']/div[4]/div[@class='watch-article-titlebar']/div[@class='watch-article-titleline']/div[@class='gwt-HTML']");
+    	getSelenium().waitForCondition("var value=selenium.doClick(\"//div[@class='watch-articlelist']/div[4]/div[@class='watch-article-titlebar']/div[@class='watch-article-titleline']/div[@class='gwt-HTML']\"); value!=''","10000");
+    	getSelenium().waitForCondition("var value=selenium.doClick('check2'); value!=''","10000");
+    	//Reset Current Filters
+    	getSelenium().waitForCondition("var value=selenium.doClick(\"//div[@class='watch-filter-init-text']\"); value!=''","10000");
+    	getSelenium().waitForCondition("var value=selenium.doClick('check3'); value!=''","10000");
+    	getSelenium().waitForCondition("var value=selenium.doClick(\"//div[@class='watch-filter-init-text']\"); value!=''","10000");
+    }
+
+    /**
+     * This method makes the following tests :
+     *
+     * <ul>
+     * <li>Opens the Feeds Reader for XWiki instance.</li>
+     * <li>Sets the delay time after each operation at 1,5 sec.</li>
+     * <li>Creates a new Feeds group, then creates a new Feed. </li>
+     * <li>Is listing the articles that haven't been read.</li>
+     * <li>Reads one. Create a tag the read one.</li>
+     * <li>Lists all with the newly created tag.</li>
+     * </ul>
+     */   
+    public void testTagsFilter()
+    {
+    	open("/xwiki/bin/view/Watch/Reader");
+    	getSelenium().setSpeed("1500");
+    	getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Welcome to XWiki Watch') != -1;", "2000");
+    	getSelenium().waitForCondition("var value=selenium.doClick(\"//img[@title='Configure']\"); value!=''", "10000");
+    	getSelenium().waitForCondition("var value=selenium.doClick(\"//button[text()='Create a Group']\"); value!=''", "10000");
+    	getSelenium().type("group", "internfeeds5");
+    	getSelenium().waitForCondition("var value=selenium.doClick(\"//button[text()='Next']\"); value!=''", "10000");
+    	getSelenium().waitForCondition("var value=selenium.doClick(\"//img[@title='Configure']\"); value!=''", "10000");
+    	getSelenium().waitForCondition("var value=selenium.doClick(\"//button[text()='Add a RSS Feed']\"); value!=''", "10000");
+    	getSelenium().waitForCondition("var value=selenium.doClick(\"//button[text()='Add a RSS Feed URL']\"); value!=''", "10000");
+    	getSelenium().type("feedname", "internfeed5");
+    	getSelenium().type("feedurl", "http://localhost:8080/xwiki/bin/view/Main/WebRss?xpage=rdf");
+    	getSelenium().addSelection("//select", "label=internfeeds5");
+    	getSelenium().waitForCondition("var value=selenium.doClick(\"//button[text()='Next']\"); value!=''", "10000");
+    	getSelenium().waitForCondition("var value=selenium.doClick('check3'); value!=''","10000");
+    	getSelenium().waitForCondition("var value=selenium.doClick('check3'); value!=''","10000");
+    	assertElementPresent("//div[@class='watch-articlelist']/div[4]/div[@class='watch-article-titlebar']/div[@class='watch-article-titleline']/div[@class='gwt-HTML']");
+    	getSelenium().waitForCondition("var value=selenium.doClick(\"//div[@class='watch-articlelist']/div[4]/div[@class='watch-article-titlebar']/div[@class='watch-article-titleline']/div[@class='gwt-HTML']\"); value!=''","10000");
+    	//Create a tag for this
+    	getSelenium().waitForCondition("var value=selenium.doClick(\"//div[@class='watch-articlelist']/div[4]/div[@class='watch-article-contentzone']/div[@class='watch-article-tags']/div[@class='watch-article-tags-title']/img\"); value!=''","10000");
+    	getSelenium().type("tags", "tag21");
+    	getSelenium().waitForCondition("var value=selenium.doClick(\"//button[text()='Next']\"); value!=''", "10000");
+    	getSelenium().waitForCondition("var value=selenium.doClick(\"//div[text()='tag21']\"); value!=''", "10000");
+    	//for unchecking of tag21
+    	getSelenium().waitForCondition("var value=selenium.doClick(\"//div[text()='tag21']\"); value!=''", "10000");
+    }
+    
+    /**
+     * This method makes the following tests :
+     *
+     * <ul>
+     * <li>Opens the Feeds Reader for XWiki instance.</li>
+     * <li>Sets the delay time after each operation at 1,5 sec.</li>
+     * <li>Creates a new Feeds group, then creates a new Feed. </li>
+     * <li>Is listing the articles that haven't been read.</li>
+     * <li>Searchs thourgh the articles for the one with the word xwiki.</li>
+     * <li>Then searchs thourgh the articles for the one with the word google.</li>
+     * </ul>
+     */
+    public void testSearchFilter()
+    {
+    	open("/xwiki/bin/view/Watch/Reader");
+    	getSelenium().setSpeed("1500");
+    	getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Welcome to XWiki Watch') != -1;", "2000");
+    	getSelenium().waitForCondition("var value=selenium.doClick(\"//img[@title='Configure']\"); value!=''", "10000");
+    	getSelenium().waitForCondition("var value=selenium.doClick(\"//button[text()='Add a RSS Feed']\"); value!=''", "10000");
+    	getSelenium().waitForCondition("var value=selenium.doClick(\"//button[text()='Add a RSS Feed URL']\"); value!=''", "10000");
+    	getSelenium().type("feedname", "internfeeds6");
+    	getSelenium().type("feedurl", " http://localhost:8080/xwiki/bin/view/Main/BlogRss?xpage=rdf");
+    	getSelenium().waitForCondition("var value=selenium.doClick(\"//button[text()='Next']\"); value!=''", "10000");
+    	getSelenium().waitForCondition("var value=selenium.doClick('check3'); value!=''","10000");
+    	getSelenium().waitForCondition("var value=selenium.doClick('check3'); value!=''","10000");
+    	getSelenium().type("//input[@class='watch-search-box']", "XWiki");
+    	getSelenium().click("//button[text()='OK']");
+    	getSelenium().type("//input[@class='watch-search-box']", "google");
+    	getSelenium().click("//button[text()='OK']");
+    }
+    
+}
