Index: src/test/it/com/xpn/xwiki/watch/it/selenium/AllTests.java
===================================================================
--- src/test/it/com/xpn/xwiki/watch/it/selenium/AllTests.java	(revision 12358)
+++ 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, WatchTextAnalyzerFilterTest.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,452 @@
+/*
+ * 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 java.util.Calendar;
+import java.util.Date;
+
+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>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().waitForCondition("selenium.page().bodyText().indexOf('Welcome to XWiki Watch') != -1;", "2000");
+        clickLinkWithXPath("//img[@title='Configure']", false);
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Add a RSS Feed') != -1;", "30000");
+        clickLinkWithXPath("//button[text()='Add a RSS Feed']", false);
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Add a RSS Feed URL') != -1;", "10000");
+        clickLinkWithXPath("//button[text()='Add a RSS Feed URL']", false);
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Next') != -1;", "10000");
+        getSelenium().type("feedname", "internfeed__1");
+        getSelenium().type("feedurl", " http://localhost:8080/xwiki/bin/view/Main/WebRss?xpage=rdf");
+        clickLinkWithXPath("//button[text()='Next']", false);
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('All') != -1;", "10000");
+
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Cancel') == -1;", "10000");
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Back') == -1;", "10000");
+        getSelenium().waitForCondition(
+            "selenium.isElementPresent(\"//div[text()='Choose the Feed Name:']\") == false;", "10000");
+        getSelenium().waitForCondition("selenium.isElementPresent(\"//div[text()='Enter the Feed URL:']\") == false;",
+            "10000");
+        getSelenium().waitForCondition(
+            "selenium.isElementPresent(\"//div[text()='Please choose the groups for this feed']\") == false;", "10000");
+        getSelenium().waitForCondition(
+            "selenium.isElementPresent(\"//div[text()='Please update your feed below']\") == false;", "10000");
+        getSelenium().waitForCondition(
+            "selenium.isElementPresent(\"//div[@class='gwt-DialogBox watch-standard']\") == false;", "10000");
+        clickLinkWithLocator("check3", false);
+        // for uncheking
+        clickLinkWithLocator("check3", false);
+
+        getSelenium()
+            .waitForCondition(
+                "selenium.isElementPresent(\"//div[@class='watch-articlelist']/div[4]/div[@class='watch-article-headline']/table[@class='watch-article-header']/tbody/tr/td/div[@class='watch-article-title']/div[@class='gwt-HTML']\") != false;",
+                "10000");
+        assertElementPresent("//div[@class='watch-articlelist']/div[4]/div[@class='watch-article-headline']/table[@class='watch-article-header']/tbody/tr/td/div[@class='watch-article-title']/div[@class='gwt-HTML']");
+        clickLinkWithXPath(
+            "//div[@class='watch-articlelist']/div[4]/div[@class='watch-article-headline']/table[@class='watch-article-header']/tbody/tr/td/div[@class='watch-article-title']/div[@class='gwt-HTML']",
+            false);
+        // testing Next
+        getSelenium().waitForCondition("selenium.isElementPresent(\"//div[text()='Next']\") != false;", "10000");
+        clickLinkWithXPath("//div[text()='Next']", false);
+        getSelenium()
+            .waitForCondition(
+                "selenium.isElementPresent(\"//div[@class='watch-articlelist']/div[4]/div[@class='watch-article-headline']/table[@class='watch-article-header']/tbody/tr/td/div[@class='watch-article-title']/div[@class='gwt-HTML']\") != false;",
+                "10000");
+        assertElementPresent("//div[@class='watch-articlelist']/div[4]/div[@class='watch-article-headline']/table[@class='watch-article-header']/tbody/tr/td/div[@class='watch-article-title']/div[@class='gwt-HTML']");
+        clickLinkWithXPath(
+            "//div[@class='watch-articlelist']/div[4]/div[@class='watch-article-headline']/table[@class='watch-article-header']/tbody/tr/td/div[@class='watch-article-title']/div[@class='gwt-HTML']",
+            false);
+
+        getSelenium().waitForCondition("selenium.isElementPresent(\"//div[text()='Previous']\") != false;", "10000");
+        clickLinkWithXPath("//div[text()='Previous']", false);
+        getSelenium()
+            .waitForCondition(
+                "selenium.isElementPresent(\"//div[@class='watch-articlelist']/div[5]/div[@class='watch-article-headline']/table[@class='watch-article-header']/tbody/tr/td/div[@class='watch-article-title']/div[@class='gwt-HTML']\") != false;",
+                "10000");
+        assertElementPresent("//div[@class='watch-articlelist']/div[5]/div[@class='watch-article-headline']/table[@class='watch-article-header']/tbody/tr/td/div[@class='watch-article-title']/div[@class='gwt-HTML']");
+        clickLinkWithXPath(
+            "//div[@class='watch-articlelist']/div[5]/div[@class='watch-article-headline']/table[@class='watch-article-header']/tbody/tr/td/div[@class='watch-article-title']/div[@class='gwt-HTML']",
+            false);
+
+        clickLinkWithLocator("check2", false);
+        clickLinkWithLocator("check3", false);
+
+        clickLinkWithXPath("//img[@title='Flag this article']", false);
+        clickLinkWithXPath("//img[@title='Flag this article']", false);
+        getSelenium()
+            .waitForCondition(
+                "selenium.isElementPresent(\"//div[@class='watch-articlelist']/div[4]/div[@class='watch-article-headline']/table[@class='watch-article-header']/tbody/tr/td/div[@class='watch-article-title']/div[@class='gwt-HTML']\") != false;",
+                "10000");
+        getSelenium()
+            .waitForCondition(
+                "selenium.isElementPresent(\"//div[@class='watch-articlelist']/div[5]/div[@class='watch-article-headline']/table[@class='watch-article-header']/tbody/tr/td/div[@class='watch-article-title']/div[@class='gwt-HTML']\") != false;",
+                "10000");
+        clickLinkWithLocator("check1", false);
+        clickLinkWithLocator("check1", false);
+        getSelenium()
+            .waitForCondition(
+                "selenium.isElementPresent(\"//div[@class='watch-articlelist']/div[4]/div[@class='watch-article-headline']/table[@class='watch-article-header']/tbody/tr/td/div[@class='watch-article-title']/div[@class='gwt-HTML']\") != false;",
+                "10000");
+        getSelenium()
+            .waitForCondition(
+                "selenium.isElementPresent(\"//div[@class='watch-articlelist']/div[5]/div[@class='watch-article-headline']/table[@class='watch-article-header']/tbody/tr/td/div[@class='watch-article-title']/div[@class='gwt-HTML']\") != false;",
+                "10000");
+        clickLinkWithXPath("//img[@title='Trash this article']", false);
+        clickLinkWithXPath("//img[@title='Trash this article']", false);
+        clickLinkWithLocator("check4", false);
+        getSelenium()
+            .waitForCondition(
+                "selenium.isElementPresent(\"//div[@class='watch-articlelist']/div[4]/div[@class='watch-article-headline']/table[@class='watch-article-header']/tbody/tr/td/div[@class='watch-article-title']/div[@class='gwt-HTML']\") != false;",
+                "10000");
+    }
+
+    /**
+     * This method makes the following tests :
+     * 
+     * <ul>
+     * <li>Opens the Feeds Reader for XWiki instance.</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 today.</li>
+     * <li>Reads one. Listing all articles that have been read until today.</li>
+     * </ul>
+     */
+    public void testFilterCalendar()
+    {
+        Calendar c = Calendar.getInstance();
+
+        open("/xwiki/bin/view/Watch/Reader");
+        // create group
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Welcome to XWiki Watch') != -1;", "2000");
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Feeds') != -1;", "2000");
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Filters') != -1;", "2000");
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Search') != -1;", "2000");
+        clickLinkWithXPath("//img[@title='Configure']", false);
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Create a Group') != -1;", "30000");
+        clickLinkWithXPath("//button[text()='Create a Group']", false);
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Next') != -1;", "10000");
+        setFieldValue("group", "internfeeds__3");
+        clickLinkWithXPath("//button[text()='Next']", false);
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Cancel') == -1;", "10000");
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Back') == -1;", "10000");
+        // create feed
+        clickLinkWithXPath("//img[@title='Configure']", false);
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Add a RSS Feed') != -1;", "30000");
+        clickLinkWithXPath("//button[text()='Add a RSS Feed']", false);
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Add a RSS Feed URL') != -1;", "10000");
+        clickLinkWithXPath("//button[text()='Add a RSS Feed URL']", false);
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Next') != -1;", "10000");
+        setFieldValue("feedname", "internfeed__2");
+        setFieldValue("feedurl", " http://localhost:8080/xwiki/bin/view/Main/WebRss?xpage=rdf");
+        getSelenium().addSelection("//select", "label=internfeeds__3");
+        clickLinkWithXPath("//button[text()='Next']", false);
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('All') != -1;", "10000");
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Cancel') == -1;", "10000");
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Back') == -1;", "10000");
+        getSelenium().waitForCondition(
+            "selenium.isElementPresent(\"//div[text()='Choose the Feed Name:']\") == false;", "10000");
+        getSelenium().waitForCondition("selenium.isElementPresent(\"//div[text()='Enter the Feed URL:']\") == false;",
+            "10000");
+        getSelenium().waitForCondition(
+            "selenium.isElementPresent(\"//div[text()='Please choose the groups for this feed']\") == false;", "10000");
+        getSelenium().waitForCondition(
+            "selenium.isElementPresent(\"//div[text()='Please update your feed below']\") == false;", "10000");
+        getSelenium().waitForCondition(
+            "selenium.isElementPresent(\"//div[@class='gwt-DialogBox watch-standard']\") == false;", "10000");
+
+        clickLinkWithLocator("check3", false);
+        clickLinkWithLocator("check3", false);
+        clickLinkWithXPath("//div[text()='" + c.get(Calendar.DAY_OF_MONTH) + "']", false);
+
+        getSelenium()
+            .waitForCondition(
+                "selenium.isElementPresent(\"//div[@class='watch-articlelist']/div[4]/div[@class='watch-article-headline']/table[@class='watch-article-header']/tbody/tr/td/div[@class='watch-article-title']/div[@class='gwt-HTML']\") != false;",
+                "30000");
+        assertElementPresent("//div[@class='watch-articlelist']/div[4]/div[@class='watch-article-headline']/table[@class='watch-article-header']/tbody/tr/td/div[@class='watch-article-title']/div[@class='gwt-HTML']");
+        clickLinkWithXPath(
+            "//div[@class='watch-articlelist']/div[4]/div[@class='watch-article-headline']/table[@class='watch-article-header']/tbody/tr/td/div[@class='watch-article-title']/div[@class='gwt-HTML']",
+            false);
+        clickLinkWithLocator("check2", false);
+        clickLinkWithLocator("check2", false);
+
+        getSelenium()
+            .waitForCondition(
+                "selenium.isElementPresent(\"//div[@class='watch-articlelist']/div[4]/div[@class='watch-article-headline']/table[@class='watch-article-header']/tbody/tr/td/div[@class='watch-article-title']/div[@class='gwt-HTML']\") != false;",
+                "10000");
+    }
+
+    /**
+     * This method makes the following tests :
+     * 
+     * <ul>
+     * <li>Opens the Feeds Reader for XWiki instance.</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");
+        // create group
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Welcome to XWiki Watch') != -1;", "2000");
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Feeds') != -1;", "2000");
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Filters') != -1;", "2000");
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Search') != -1;", "2000");
+        clickLinkWithXPath("//img[@title='Configure']", false);
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Create a Group') != -1;", "30000");
+        clickLinkWithXPath("//button[text()='Create a Group']", false);
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Next') != -1;", "10000");
+        setFieldValue("group", "internfeeds__4");
+        clickLinkWithXPath("//button[text()='Next']", false);
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Cancel') == -1;", "10000");
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Back') == -1;", "10000");
+        // create feed
+        clickLinkWithXPath("//img[@title='Configure']", false);
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Add a RSS Feed') != -1;", "30000");
+        clickLinkWithXPath("//button[text()='Add a RSS Feed']", false);
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Add a RSS Feed URL') != -1;", "10000");
+        clickLinkWithXPath("//button[text()='Add a RSS Feed URL']", false);
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Next') != -1;", "10000");
+        setFieldValue("feedname", "internfeed3");
+        setFieldValue("feedurl", " http://localhost:8080/xwiki/bin/view/Main/WebRss?xpage=rdf");
+        getSelenium().addSelection("//select", "label=internfeeds__4");
+        clickLinkWithXPath("//button[text()='Next']", false);
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('All') != -1;", "10000");
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Cancel') == -1;", "10000");
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Back') == -1;", "10000");
+        getSelenium().waitForCondition(
+            "selenium.isElementPresent(\"//div[text()='Choose the Feed Name:']\") == false;", "10000");
+        getSelenium().waitForCondition("selenium.isElementPresent(\"//div[text()='Enter the Feed URL:']\") == false;",
+            "10000");
+        getSelenium().waitForCondition(
+            "selenium.isElementPresent(\"//div[text()='Please choose the groups for this feed']\") == false;", "10000");
+        getSelenium().waitForCondition(
+            "selenium.isElementPresent(\"//div[text()='Please update your feed below']\") == false;", "10000");
+        getSelenium().waitForCondition(
+            "selenium.isElementPresent(\"//div[@class='gwt-DialogBox watch-standard']\") == false;", "10000");
+
+        clickLinkWithXPath("//img[@title='Configure']", false);
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Add a Keyword') != -1;", "30000");
+        clickLinkWithXPath("//button[text()='Add a Keyword']", false);
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Next') != -1;", "10000");
+        getSelenium().type("keyword", "xwiki");
+        clickLinkWithXPath("//button[text()='Next']", false);
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Cancel') == -1;", "10000");
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Back') == -1;", "10000");
+        getSelenium().waitForCondition("selenium.isElementPresent(\"//div[text()='Group Name']\") == false;", "10000");
+        getSelenium().waitForCondition(
+            "selenium.isElementPresent(\"//div[@class='gwt-DialogBox watch-standard']\") == false;", "10000");
+        getSelenium().waitForCondition("selenium.isElementPresent(\"//div[@title='xwiki']\")!=false;", "10000");
+        clickLinkWithXPath("//div[@title='xwiki']", false);
+        // check id there is any elements on the list
+        getSelenium()
+            .waitForCondition(
+                "selenium.isElementPresent(\"//div[@class='watch-articlelist']/div[4]/div[@class='watch-article-headline']/table[@class='watch-article-header']/tbody/tr/td/div[@class='watch-article-title']/div[@class='gwt-HTML']\") != false;",
+                "10000");
+    }
+
+    /**
+     * This method makes the following tests :
+     * 
+     * <ul>
+     * <li>Opens the Feeds Reader for XWiki instance.</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");
+        // create group
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Welcome to XWiki Watch') != -1;", "2000");
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Feeds') != -1;", "2000");
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Filters') != -1;", "2000");
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Search') != -1;", "2000");
+        clickLinkWithXPath("//img[@title='Configure']", false);
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Create a Group') != -1;", "30000");
+        clickLinkWithXPath("//button[text()='Create a Group']", false);
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Next') != -1;", "10000");
+        setFieldValue("group", "internfeeds__5");
+        clickLinkWithXPath("//button[text()='Next']", false);
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Cancel') == -1;", "10000");
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Back') == -1;", "10000");
+        // create feed
+        clickLinkWithXPath("//img[@title='Configure']", false);
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Add a RSS Feed') != -1;", "30000");
+        clickLinkWithXPath("//button[text()='Add a RSS Feed']", false);
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Add a RSS Feed URL') != -1;", "10000");
+        clickLinkWithXPath("//button[text()='Add a RSS Feed URL']", false);
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Next') != -1;", "10000");
+        setFieldValue("feedname", "internfeed__5");
+        setFieldValue("feedurl", " http://localhost:8080/xwiki/bin/view/Main/WebRss?xpage=rdf");
+        getSelenium().addSelection("//select", "label=internfeeds__5");
+        clickLinkWithXPath("//button[text()='Next']", false);
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('All') != -1;", "10000");
+        // being sure that the dialog box is gone
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Cancel') == -1;", "10000");
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Back') == -1;", "10000");
+        getSelenium().waitForCondition(
+            "selenium.isElementPresent(\"//div[text()='Choose the Feed Name:']\") == false;", "10000");
+        getSelenium().waitForCondition("selenium.isElementPresent(\"//div[text()='Enter the Feed URL:']\") == false;",
+            "10000");
+        getSelenium().waitForCondition(
+            "selenium.isElementPresent(\"//div[text()='Please choose the groups for this feed']\") == false;", "10000");
+        getSelenium().waitForCondition(
+            "selenium.isElementPresent(\"//div[text()='Please update your feed below']\") == false;", "10000");
+        getSelenium().waitForCondition(
+            "selenium.isElementPresent(\"//div[@class='gwt-DialogBox watch-standard']\") == false;", "10000");
+        clickLinkWithLocator("check3", false);
+        clickLinkWithLocator("check3", false);
+        getSelenium()
+            .waitForCondition(
+                "selenium.isElementPresent(\"//div[@class='watch-articlelist']/div[4]/div[@class='watch-article-headline']/table[@class='watch-article-header']/tbody/tr/td/div[@class='watch-article-title']/div[@class='gwt-HTML']\") != false;",
+                "10000");
+        getSelenium()
+            .waitForCondition(
+                "selenium.isElementPresent(\"//div[@class='watch-articlelist']/div[4]/div[@class='watch-article-headline']/table[@class='watch-article-header']/tbody/tr/td/div[@class='watch-article-title']/div[@class='gwt-HTML']\") != false;",
+                "10000");
+        assertElementPresent("//div[@class='watch-articlelist']/div[4]/div[@class='watch-article-headline']/table[@class='watch-article-header']/tbody/tr/td/div[@class='watch-article-title']/div[@class='gwt-HTML']");
+        clickLinkWithXPath(
+            "//div[@class='watch-articlelist']/div[4]/div[@class='watch-article-headline']/table[@class='watch-article-header']/tbody/tr/td/div[@class='watch-article-title']/div[@class='gwt-HTML']",
+            false);
+        // Create a tag for this
+        clickLinkWithXPath("//div[@class='watch-article-tags-status']", false);
+        getSelenium().type("//input[@class='gwt-SuggestBox']", "tag21");
+        clickLinkWithXPath("//button[text()='Add']", false);
+        clickLinkWithXPath("//div[@class='watch-article-tags-status']", false);
+        getSelenium().type("//input[@class='gwt-SuggestBox']", "tag21");
+        clickLinkWithXPath("//button[text()='Add']", false);
+
+        getSelenium().waitForCondition("var value=selenium.doClick(\"//div[text()='tag21']\"); value!=''", "10000");
+        getSelenium()
+            .waitForCondition(
+                "selenium.isElementPresent(\"//div[@class='watch-articlelist']/div[4]/div[@class='watch-article-headline']/table[@class='watch-article-header']/tbody/tr/td/div[@class='watch-article-title']/div[@class='gwt-HTML']\") != false;",
+                "10000");
+        getSelenium()
+            .waitForCondition(
+                "selenium.isElementPresent(\"//div[@class='watch-articlelist']/div[5]/div[@class='watch-article-headline']/table[@class='watch-article-header']/tbody/tr/td/div[@class='watch-article-title']/div[@class='gwt-HTML']\") != false;",
+                "10000");
+    }
+
+    /**
+     * This method makes the following tests :
+     * 
+     * <ul>
+     * <li>Opens the Feeds Reader for XWiki instance.</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");
+        // create group
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Welcome to XWiki Watch') != -1;", "2000");
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Feeds') != -1;", "2000");
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Filters') != -1;", "2000");
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Search') != -1;", "2000");
+        clickLinkWithXPath("//img[@title='Configure']", false);
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Create a Group') != -1;", "30000");
+        clickLinkWithXPath("//button[text()='Create a Group']", false);
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Next') != -1;", "10000");
+        setFieldValue("group", "internfeeds__6");
+        clickLinkWithXPath("//button[text()='Next']", false);
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Cancel') == -1;", "10000");
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Back') == -1;", "10000");
+        // create feed
+        clickLinkWithXPath("//img[@title='Configure']", false);
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Add a RSS Feed') != -1;", "30000");
+        clickLinkWithXPath("//button[text()='Add a RSS Feed']", false);
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Add a RSS Feed URL') != -1;", "10000");
+        clickLinkWithXPath("//button[text()='Add a RSS Feed URL']", false);
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Next') != -1;", "10000");
+        setFieldValue("feedname", "internfeed__6");
+        setFieldValue("feedurl", " http://localhost:8080/xwiki/bin/view/Main/WebRss?xpage=rdf");
+        getSelenium().addSelection("//select", "label=internfeeds__6");
+        clickLinkWithXPath("//button[text()='Next']", false);
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('All') != -1;", "10000");
+        // being sure that the dialog box is gone
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Cancel') == -1;", "10000");
+        getSelenium().waitForCondition("selenium.page().bodyText().indexOf('Back') == -1;", "10000");
+        getSelenium().waitForCondition(
+            "selenium.isElementPresent(\"//div[text()='Choose the Feed Name:']\") == false;", "10000");
+        getSelenium().waitForCondition("selenium.isElementPresent(\"//div[text()='Enter the Feed URL:']\") == false;",
+            "10000");
+        getSelenium().waitForCondition(
+            "selenium.isElementPresent(\"//div[text()='Please choose the groups for this feed']\") == false;", "10000");
+        getSelenium().waitForCondition(
+            "selenium.isElementPresent(\"//div[text()='Please update your feed below']\") == false;", "10000");
+        getSelenium().waitForCondition(
+            "selenium.isElementPresent(\"//div[@class='gwt-DialogBox watch-standard']\") == false;", "10000");
+        clickLinkWithXPath("//div[@title='All']", false);
+        setFieldValue("//input[@class='watch-search-box']", "XWiki");
+        clickLinkWithXPath("//button[text()='OK']", false);
+        getSelenium()
+            .waitForCondition(
+                "selenium.isElementPresent(\"//div[@class='watch-articlelist']/div[4]/div[@class='watch-article-headline']/table[@class='watch-article-header']/tbody/tr/td/div[@class='watch-article-title']/div[@class='gwt-HTML']\") != false;",
+                "10000");
+    }
+
+}
