Index: devel/testlink/automation2.0/[FUN02.7] - GerenciarFiltros.xml
===================================================================
--- devel/testlink/automation2.0/[FUN02.7] - GerenciarFiltros.xml	(revision 4620)
+++ devel/testlink/automation2.0/[FUN02.7] - GerenciarFiltros.xml	(revision 4620)
@@ -0,0 +1,68 @@
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
+  
+<suite name="[FUN02.7] Gerenciar Filtros" >
+
+	<test name="Criar pasta" preserve-order="true">
+		<classes>
+			<class name="org.expressolivre.cte.email.pastas.CriarPastaTestCase" />
+		</classes>
+	</test>	
+
+	<test name="Criar filtro por assunto" preserve-order="true">
+		<classes>
+			<class name="org.expressolivre.cte.email.filtro.CriarFiltroPorAssuntoTestCase"/>
+		</classes>
+	</test>	
+
+	<test name="Desabilitar filtro por assunto" preserve-order="true">
+		<classes>
+			<class name="org.expressolivre.cte.email.filtro.DesabilitarFiltroTestCase"/>
+		</classes>
+	</test>	
+
+	<test name="Habilitar filtro por assunto" preserve-order="true">
+		<classes>
+			<class name="org.expressolivre.cte.email.filtro.HabilitarFiltroTestCase"/>
+		</classes>
+	</test>	
+
+	<test name="Criar filtro por remetente" preserve-order="true">
+		<classes>
+			<class name="org.expressolivre.cte.email.filtro.CriarFiltroPorRemetenteTestCase"/>
+		</classes>
+	</test>	
+	
+	<test name="Excluir multiplos filtros" preserve-order="true">
+		<classes>
+			<class name="org.expressolivre.cte.email.filtro.ExcluirFiltroTestCase">
+				<methods>
+			    	<include name="excluirMultiplosFiltros"/>
+				</methods>
+			</class>
+		</classes>
+	</test>	
+
+	<test name="Criar filtro por destinatario" preserve-order="true">
+		<classes>
+			<class name="org.expressolivre.cte.email.filtro.CriarFiltroPorDestinatarioTestCase"/>
+		</classes>
+	</test>	
+	
+	<test name="Excluir filtro destinatario" preserve-order="true">
+	  	<parameter name="ruleId"  value="0"/>
+		<classes>
+			<class name="org.expressolivre.cte.email.filtro.ExcluirFiltroTestCase">
+				<methods>
+			    	<include name="excluirFiltro"/>
+				</methods>
+			</class>				
+		</classes>
+	</test>	
+
+	<test name="Apagar pasta" preserve-order="true">
+		<classes>
+			<class name="org.expressolivre.cte.email.pastas.ApagarPastaTestCase" />
+		</classes>
+	</test>	
+
+</suite>
Index: devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/pages/email/MailPage.java
===================================================================
--- devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/pages/email/MailPage.java	(revision 4606)
+++ devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/pages/email/MailPage.java	(revision 4620)
@@ -10,4 +10,5 @@
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
+import org.openqa.selenium.support.PageFactory;
 
 /**
@@ -120,14 +121,8 @@
 	private WebElement emptyTrashLink;
 
-	@FindBy(id = "divScrollMain_0")
-	private WebElement emailsListDiv;
-
 	/** Campo contendo total de emails de uma pasta. */
 	@FindBy(id = "tot_m")
 	private WebElement totalEmails;
 
-	@FindBy(xpath = "//div[@id='exmail_main_body']/table[1]/tbody[@id='border_tbody']/tr[1]/td[2]/table/tbody/tr/td[1]")
-	private WebElement emailTab;
-
 	/** Checkbox para selecao de todos emails de uma pasta. */
 	@FindBy(id = "chk_box_select_all_messages")
@@ -144,46 +139,4 @@
 	private WebElement editFilter;
 
-	@FindBy(xpath = "//div[@id='window_ffilter_ccform']/div[@id='form_body']/a[1]")
-	private WebElement filterNewRule;
-
-	@FindBy(xpath = "//div[@id='window_ffilter_ccform']/div[@id='form_body']/span[2]/input")
-	private WebElement filterSaveRules;
-
-	@FindBy(id = "field1")
-	private WebElement filterRecepient;
-
-	@FindBy(id = "field2")
-	private WebElement filterTo;
-
-	@FindBy(id = "field3")
-	private WebElement filterSubject;
-
-	@FindBy(id = "radio1")
-	private WebElement filterArchieveIn;
-
-	@FindBy(id = "select_mailboxes")
-	private WebElement filterMailBoxes;
-
-	@FindBy(id = "radio2")
-	private WebElement filterForwardMessage;
-
-	@FindBy(id = "radio3")
-	private WebElement filterRejectMessage;
-
-	@FindBy(id = "radio4")
-	private WebElement filterDeleteMessage;
-
-	@FindBy(id = "radio5")
-	private WebElement filterApplyImportantFilter;
-
-	@FindBy(xpath = "//input[@value='Nova Pasta']")
-	private WebElement createNewFolder;
-
-	@FindBy(xpath = "//input[@value='Excluir pasta']")
-	private WebElement deleteFolder;
-
-	@FindBy(xpath = "//input[@value='Renomear pasta']")
-	private WebElement renameFolder;
-
 	@FindBy(xpath = "//span[@onclick='wfolders.makeWindow(\"\",\"move_to\")']")
 	/** Opcao de mover do rodape. */
@@ -233,39 +186,4 @@
 	private WebElement searchMessages;
 
-	@FindBy(id = "txt_de")
-	private WebElement searchRemetente;
-
-	@FindBy(id = "txt_para")
-	private WebElement searchTo;
-	@FindBy(id = "txt_cc")
-	private WebElement searchCopy;
-	@FindBy(id = "txt_ass")
-	private WebElement searchSubject;
-	@FindBy(id = "txt_body")
-	private WebElement searchBody;
-	@FindBy(id = "since_date")
-	private WebElement searchSinceDate;
-	@FindBy(id = "before_date")
-	private WebElement searchBeforeDate;
-	@FindBy(id = "on_date")
-	private WebElement searchOnDate;
-	@FindBy(id = "flagged")
-	private WebElement searchImportantFilter;
-	@FindBy(id = "seen")
-	private WebElement searchSeenFilter;
-	@FindBy(id = "answered")
-	private WebElement searchAnsweredFilter;
-	@FindBy(id = "recent")
-	private WebElement searchRecentFilter;
-
-	@FindBy(id = "incluir")
-	private WebElement includeFolderForSearch;
-
-	@FindBy(xpath = "//div[@id='window_search']/div[@id='div_button_search']/table/tbody/tr/td[1]/input")
-	private WebElement searchButton;
-
-	@FindBy(xpath = "//div[@id='window_search']/div[@id='div_button_search']/table/tbody/tr/td[3]/input")
-	private WebElement closeSearchButton;
-
 	/** Nome da pasta "Caixa de Entrada". */
 	public static final String INBOX_FOLDER = "lINBOXtree_folders";
@@ -296,87 +214,10 @@
 	}
 
-	public void setSearchRemetente(String searchRemetente) {
-		this.searchRemetente.sendKeys(searchRemetente);
-	}
-
-	public void setSearchTo(String searchTo) {
-		this.searchTo.sendKeys(searchTo);
-	}
-
-	public void setSearchCopy(String searchCopy) {
-		this.searchCopy.sendKeys(searchCopy);
-	}
-
-	public void setSearchSubject(String searchSubject) {
-		this.searchSubject.sendKeys(searchSubject);
-	}
-
-	public void setSearchBody(String searchBody) {
-		this.searchBody.sendKeys(searchBody);
-	}
-
-	public void setSearchSinceDate(String searchSinceDate) {
-		this.searchSinceDate.sendKeys(searchSinceDate);
-	}
-
-	public void setSearchBeforeDate(String searchBeforeDate) {
-		this.searchBeforeDate.sendKeys(searchBeforeDate);
-	}
-
-	public void setSearchOnDate(String searchOnDate) {
-		this.searchOnDate.sendKeys(searchOnDate);
-	}
-
-	public void setSearchSeenFilter(String searchSeenFilter) {
-		super.setComboValue(this.searchSeenFilter, searchSeenFilter);
-	}
-
-	public void setSearchAnsweredFilter(String searchAnsweredFilter) {
-		super.setComboValue(this.searchAnsweredFilter, searchAnsweredFilter);
-	}
-
-	public void setSearchRecentFilter(String searchRecentFilter) {
-		super.setComboValue(this.searchRecentFilter, searchRecentFilter);
-	}
-
-	public void openSearchMessageWindow() {
+	public MailSearchPage openSearchMessageWindow() {
 		this.searchMessages.click();
 		super.waitForElement(By.id("flagged"));
-	}
-
-	/**
-	 * Pesquisa apenas mensagens importantes.
-	 * 
-	 * @param flag
-	 */
-	public void searchImportantMessage(String flag) {
-		super.setComboValue(searchImportantFilter, flag);
-	}
-
-	/**
-	 * Pesquisa apenas mensagens lidas.
-	 * 
-	 * @param flag
-	 */
-	public void searchSeenMessage(String flag) {
-		super.setComboValue(searchSeenFilter, flag);
-	}
-
-	/**
-	 * Escolhe pastas a serem pesquisadas.
-	 * 
-	 * @param folder
-	 */
-	public void setSearchFolders(String folder) {
-		super.clickElement(By.id(folder));
-		includeFolderForSearch.click();
-	}
-
-	public void doSearch() {
-		searchButton.click();
-	}
-
-	public void closeSearchWindow() {
-		closeSearchButton.click();
+
+		return PageFactory.initElements(driver, MailSearchPage.class);
+
 	}
 
@@ -666,37 +507,11 @@
 	 * Edita nome de pasta.
 	 */
-	public void editFolder() {
+	public MailFolderPage editFolder() {
 		this.toolsMenu.click();
 		this.waitForElement(By
 				.xpath("//div[@id='menu_tools']/table/tbody/tr[4]/td"));
 		this.editFolder.click();
-	}
-
-	public void newFilterRule() {
-		this.filterNewRule.click();
-	}
-
-	public void setFilterRecepient(String value) {
-		this.filterRecepient.sendKeys(value);
-	}
-
-	public void setFilterTo(String value) {
-		this.filterTo.sendKeys(value);
-	}
-
-	public void setFilterSubject(String value) {
-		this.filterSubject.sendKeys(value);
-	}
-
-	public void setFilterArchieveIn() {
-		this.filterArchieveIn.click();
-	}
-
-	public void setFilterMailBox(String mailBox) {
-		super.setComboValue(this.filterMailBoxes, mailBox);
-	}
-
-	public void saveFilterRules() {
-		this.filterSaveRules.click();
+
+		return PageFactory.initElements(driver, MailFolderPage.class);
 	}
 
@@ -704,5 +519,5 @@
 	 * Edita filtros.
 	 */
-	public void editFilter() {
+	public MailFilterPage editFilter() {
 		this.toolsMenu.click();
 		this.waitForElement(By
@@ -710,140 +525,6 @@
 		this.editFilter.click();
 		this.waitForElement(By.id("set_rules_img"));
-	}
-
-	/**
-	 * Apaga uma regra do filtro.
-	 * 
-	 * @param id
-	 */
-	public void deleteRule(int id) {
-		this.waitForElement(By.id("rule_" + id));
-		driver.findElement(By.id("rule_" + id)).click();
-		driver.findElement(By.xpath("//div[@id='form_buttons']/input[3]"))
-				.click();
-		driver.findElement(By.xpath("//div[@id='form_buttons']/input[4]"))
-				.click();
-	}
-
-	/**
-	 * Cria nova pasta.
-	 * 
-	 * @param folderName
-	 *            Nome da pasta a ser criada.
-	 */
-	public void createNewFolder(String folderName) {
-		this.editFolder();
-		this.createFolder(folderName);
-	}
-
-	private void createFolder(String folderName) {
-		this.createNewFolder.click();
-		Alert newFolder = driver.switchTo().alert();
-		assert "Insira o nome da nova pasta: ".equals(newFolder.getText());
-		newFolder.sendKeys(folderName);
-		newFolder.accept();
-	}
-
-	/**
-	 * Cria sub pasta.
-	 * 
-	 * @param rootFolderName
-	 *            Pasta pai.
-	 * @param subFolderName
-	 *            Nome da sub pasta a ser criada.
-	 */
-	public void createSubFolder(String rootFolderName, String subFolderName) {
-		this.editFolder();
-		this.driver.findElement(
-				By.id("lINBOX/" + rootFolderName + "folders_tree")).click();
-		this.createFolder(subFolderName);
-	}
-
-	/**
-	 * Renomeia pasta.
-	 * 
-	 * @param folderName
-	 *            Nome da pasta a ser renomeada.
-	 * @param newName
-	 *            Novo nome da pasta.
-	 */
-	public void renameFolder(String folderName, String newName) {
-		this.editFolder();
-		this.driver.findElement(By.id("lINBOX/" + folderName + "folders_tree"))
-				.click();
-		this.renameFolder.click();
-		Alert newFolder = driver.switchTo().alert();
-		assert "Entre com um nome para a pasta:".equals(newFolder.getText());
-		newFolder.sendKeys(newName);
-		newFolder.accept();
-	}
-
-	/**
-	 * @param folderName
-	 */
-	public void renameFolderInUse(String folderName) {
-		this.editFolder();
-		this.driver.findElement(By.id("lINBOX/" + folderName + "folders_tree"))
-				.click();
-		this.renameFolder.click();
-		Alert newFolder = driver.switchTo().alert();
-		assert "NÃ£o Ã© possÃ­vel renomear esta pasta, pois estÃ¡ em uso no momento!"
-				.equals(newFolder.getText());
-		newFolder.accept();
-	}
-
-	/**
-	 * Exclui pasta.
-	 * 
-	 * @param folderName
-	 *            Nome da pasta a ser excluida.
-	 */
-	public void deleteFolder(String folderName) {
-		this.editFolder();
-		this.driver.findElement(By.id("lINBOX/" + folderName + "folders_tree"))
-				.click();
-		this.deleteFolder.click();
-	}
-
-	/**
-	 * Exclui pasta.
-	 * 
-	 * @param folderName
-	 *            Nome da pasta a ser excluida.
-	 */
-	public void deleteFolder(String folderName, boolean inUse) {
-		this.editFolder();
-		this.driver.findElement(By.id("lINBOX/" + folderName + "folders_tree"))
-				.click();
-		this.deleteFolder.click();
-		Alert confirm = driver.switchTo().alert();
-		if (!inUse) {
-			assert ("VocÃª gostaria de excluir a pasta: " + folderName + "?")
-					.equals(confirm.getText());
-		} else {
-			assert ("NÃ£o Ã© possÃ­vel remover esta pasta, pois estÃ¡ em uso no momento!")
-					.equals(confirm.getText());
-		}
-		confirm.accept();
-	}
-
-	/**
-	 * Exclui pasta.
-	 * 
-	 * @param folderName
-	 *            Nome da pasta a ser excluida.
-	 */
-	public void deleteSubFolder(String rootFolderName, String subFolderName) {
-		this.editFolder();
-		this.driver.findElement(
-				By.id("pINBOX/" + rootFolderName + "folders_tree")).click();
-		this.driver.findElement(
-				By.id("lINBOX/" + rootFolderName + "/" + subFolderName
-						+ "folders_tree")).click();
-		this.deleteFolder.click();
-		Alert confirm = driver.switchTo().alert();
-		assert ("VocÃª gostaria de excluir a pasta: " + subFolderName + "?")
-				.equals(confirm.getText());
-		confirm.accept();
+
+		return PageFactory.initElements(driver, MailFilterPage.class);
 	}
 
Index: devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/pages/email/MailFilterPage.java
===================================================================
--- devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/pages/email/MailFilterPage.java	(revision 4620)
+++ devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/pages/email/MailFilterPage.java	(revision 4620)
@@ -0,0 +1,204 @@
+package org.expressolivre.cte.pages.email;
+
+import org.expressolivre.cte.pages.common.Page;
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.support.FindBy;
+
+/**
+ * Pagina de administracao de filtros.
+ * 
+ * @author L.F.Estivalet (Serpro)
+ * 
+ *         Created on Jun 16, 2011 at 3:47:18 PM
+ * 
+ */
+public class MailFilterPage extends Page {
+
+	@FindBy(xpath = "//div[@id='window_ffilter_ccform']/div[@id='form_body']/a[1]")
+	private WebElement filterNewRule;
+
+	@FindBy(xpath = "//div[@id='window_ffilter_ccform']/div[@id='form_body']/span[2]/input")
+	private WebElement filterSaveRules;
+
+	@FindBy(id = "field1")
+	private WebElement filterRecepient;
+
+	@FindBy(id = "field2")
+	private WebElement filterTo;
+
+	@FindBy(id = "field3")
+	private WebElement filterSubject;
+
+	@FindBy(id = "field4")
+	private WebElement filterSize;
+
+	@FindBy(id = "select_size")
+	private WebElement filterSelectSize;
+
+	@FindBy(id = "radio1")
+	private WebElement filterArchieveIn;
+
+	@FindBy(id = "select_mailboxes")
+	private WebElement filterMailBoxes;
+
+	@FindBy(id = "radio2")
+	private WebElement filterForwardMessage;
+
+	@FindBy(id = "radio3")
+	private WebElement filterRejectMessage;
+
+	@FindBy(id = "field6")
+	private WebElement filterRejectMessageText;
+
+	@FindBy(id = "radio4")
+	private WebElement filterDeleteMessage;
+
+	@FindBy(id = "radio5")
+	private WebElement filterApplyImportantFilter;
+
+	public MailFilterPage(WebDriver driver) {
+		super(driver);
+	}
+
+	public void newFilterRule() {
+		this.filterNewRule.click();
+	}
+
+	public void editFilterRule(String id) {
+		driver.findElement(
+				By.xpath("//div[@id='window_ffilter_ccform']/div[@id='form_body']/div[@id='set_rules']/a["
+						+ id + "]")).click();
+	}
+
+	public String getFilterRuleText(String id) {
+		return driver
+				.findElement(
+						By.xpath("//div[@id='window_ffilter_ccform']/div[@id='form_body']/div[@id='set_rules']/a["
+								+ id + "]")).getText();
+	}
+
+	public void setFilterRecepient(String value) {
+		this.filterRecepient.sendKeys(value);
+	}
+
+	public String getFilterRecepient() {
+		return this.filterRecepient.getValue();
+	}
+
+	public void setFilterTo(String value) {
+		this.filterTo.sendKeys(value);
+	}
+
+	public String getFilterTo() {
+		return this.filterTo.getValue();
+	}
+
+	public void setFilterSubject(String value) {
+		this.filterSubject.clear();
+		this.filterSubject.sendKeys(value);
+	}
+
+	public String getFilterSubject() {
+		return this.filterSubject.getValue();
+	}
+
+	public void setFilterSize(String value) {
+		this.filterSize.clear();
+		this.filterSize.sendKeys(value);
+	}
+
+	public String getFilterSize() {
+		return this.filterSize.getValue();
+	}
+
+	public void setFilterArchieveIn() {
+		this.filterArchieveIn.click();
+	}
+
+	public WebElement getFilterArchieveIn() {
+		return this.filterArchieveIn;
+	}
+
+	public void setFilterRejectMessage() {
+		this.filterRejectMessage.click();
+	}
+
+	public void setFilterRejectMessageText(String message) {
+		this.filterRejectMessageText.sendKeys(message);
+	}
+
+	public void setFilterMailBox(String mailBox) {
+		super.setComboValue(this.filterMailBoxes, mailBox);
+	}
+
+	public String getFilterMailBox() {
+		return super.getComboValue(this.filterMailBoxes);
+	}
+
+	public void saveFilterRules() {
+		this.filterSaveRules.click();
+	}
+
+	/**
+	 * Apaga uma regra do filtro.
+	 * 
+	 * @param id
+	 */
+	public void deleteFilterRule(int id) {
+		selectFilterRule(id);
+		driver.findElement(By.xpath("//div[@id='form_buttons']/input[3]"))
+				.click();
+		driver.findElement(By.xpath("//div[@id='form_buttons']/input[4]"))
+				.click();
+	}
+
+	/**
+	 * Apaga filtros previamente selecionados.
+	 */
+	public void deleteFilters() {
+		driver.findElement(By.xpath("//div[@id='form_buttons']/input[3]"))
+				.click();
+		driver.findElement(By.xpath("//div[@id='form_buttons']/input[4]"))
+				.click();
+	}
+
+	/**
+	 * Desabilita uma regra do filtro.
+	 * 
+	 * @param id
+	 */
+	public void disableFilterRule(int id) {
+		selectFilterRule(id);
+		driver.findElement(By.xpath("//div[@id='form_buttons']/input[2]"))
+				.click();
+		driver.findElement(By.xpath("//div[@id='form_buttons']/input[4]"))
+				.click();
+	}
+
+	/**
+	 * Habilita uma regra do filtro.
+	 * 
+	 * @param id
+	 */
+	public void enableFilterRule(int id) {
+		selectFilterRule(id);
+		driver.findElement(By.xpath("//div[@id='form_buttons']/input[1]"))
+				.click();
+		driver.findElement(By.xpath("//div[@id='form_buttons']/input[4]"))
+				.click();
+	}
+
+	/**
+	 * Marca o checkbox do filtro selecionado.
+	 * 
+	 * @param id
+	 *            Id do filtro selecionado.
+	 */
+	public void selectFilterRule(int id) {
+		this.waitForElement(By.id("rule_" + id));
+		driver.findElement(By.id("rule_" + id)).click();
+	}
+
+}
Index: devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/pages/email/MailSearchPage.java
===================================================================
--- devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/pages/email/MailSearchPage.java	(revision 4620)
+++ devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/pages/email/MailSearchPage.java	(revision 4620)
@@ -0,0 +1,149 @@
+package org.expressolivre.cte.pages.email;
+
+import org.expressolivre.cte.pages.common.Page;
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.support.FindBy;
+
+/**
+ * Pagina de pesquisa de mensagens.
+ * 
+ * @author L.F.Estivalet (Serpro)
+ * 
+ *         Created on Jun 16, 2011 at 3:47:12 PM
+ * 
+ */
+public class MailSearchPage extends Page {
+
+	@FindBy(id = "txt_de")
+	private WebElement searchRemetente;
+
+	@FindBy(id = "txt_para")
+	private WebElement searchTo;
+
+	@FindBy(id = "txt_cc")
+	private WebElement searchCopy;
+
+	@FindBy(id = "txt_ass")
+	private WebElement searchSubject;
+
+	@FindBy(id = "txt_body")
+	private WebElement searchBody;
+
+	@FindBy(id = "since_date")
+	private WebElement searchSinceDate;
+
+	@FindBy(id = "before_date")
+	private WebElement searchBeforeDate;
+
+	@FindBy(id = "on_date")
+	private WebElement searchOnDate;
+
+	@FindBy(id = "flagged")
+	private WebElement searchImportantFilter;
+
+	@FindBy(id = "seen")
+	private WebElement searchSeenFilter;
+
+	@FindBy(id = "answered")
+	private WebElement searchAnsweredFilter;
+
+	@FindBy(id = "recent")
+	private WebElement searchRecentFilter;
+
+	@FindBy(id = "incluir")
+	private WebElement includeFolderForSearch;
+
+	@FindBy(xpath = "//div[@id='window_search']/div[@id='div_button_search']/table/tbody/tr/td[1]/input")
+	private WebElement searchButton;
+
+	@FindBy(xpath = "//div[@id='window_search']/div[@id='div_button_search']/table/tbody/tr/td[3]/input")
+	private WebElement closeSearchButton;
+
+	public MailSearchPage(WebDriver driver) {
+		super(driver);
+		// TODO Auto-generated constructor stub
+	}
+
+	public void setSearchRemetente(String searchRemetente) {
+		this.searchRemetente.sendKeys(searchRemetente);
+	}
+
+	public void setSearchTo(String searchTo) {
+		this.searchTo.sendKeys(searchTo);
+	}
+
+	public void setSearchCopy(String searchCopy) {
+		this.searchCopy.sendKeys(searchCopy);
+	}
+
+	public void setSearchSubject(String searchSubject) {
+		this.searchSubject.sendKeys(searchSubject);
+	}
+
+	public void setSearchBody(String searchBody) {
+		this.searchBody.sendKeys(searchBody);
+	}
+
+	public void setSearchSinceDate(String searchSinceDate) {
+		this.searchSinceDate.sendKeys(searchSinceDate);
+	}
+
+	public void setSearchBeforeDate(String searchBeforeDate) {
+		this.searchBeforeDate.sendKeys(searchBeforeDate);
+	}
+
+	public void setSearchOnDate(String searchOnDate) {
+		this.searchOnDate.sendKeys(searchOnDate);
+	}
+
+	public void setSearchSeenFilter(String searchSeenFilter) {
+		super.setComboValue(this.searchSeenFilter, searchSeenFilter);
+	}
+
+	public void setSearchAnsweredFilter(String searchAnsweredFilter) {
+		super.setComboValue(this.searchAnsweredFilter, searchAnsweredFilter);
+	}
+
+	public void setSearchRecentFilter(String searchRecentFilter) {
+		super.setComboValue(this.searchRecentFilter, searchRecentFilter);
+	}
+
+	/**
+	 * Pesquisa apenas mensagens importantes.
+	 * 
+	 * @param flag
+	 */
+	public void searchImportantMessage(String flag) {
+		super.setComboValue(searchImportantFilter, flag);
+	}
+
+	/**
+	 * Pesquisa apenas mensagens lidas.
+	 * 
+	 * @param flag
+	 */
+	public void searchSeenMessage(String flag) {
+		super.setComboValue(searchSeenFilter, flag);
+	}
+
+	/**
+	 * Escolhe pastas a serem pesquisadas.
+	 * 
+	 * @param folder
+	 */
+	public void setSearchFolders(String folder) {
+		super.clickElement(By.id(folder));
+		includeFolderForSearch.click();
+	}
+
+	public void doSearch() {
+		searchButton.click();
+	}
+
+	public void closeSearchWindow() {
+		closeSearchButton.click();
+	}
+
+}
Index: devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/pages/email/MailFolderPage.java
===================================================================
--- devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/pages/email/MailFolderPage.java	(revision 4620)
+++ devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/pages/email/MailFolderPage.java	(revision 4620)
@@ -0,0 +1,150 @@
+package org.expressolivre.cte.pages.email;
+
+import org.expressolivre.cte.pages.common.Page;
+import org.openqa.selenium.Alert;
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.support.FindBy;
+
+/**
+ * Pagina de administracao das pastas do Expresso.
+ * 
+ * @author L.F.Estivalet (Serpro)
+ * 
+ *         Created on Jun 16, 2011 at 4:01:32 PM
+ * 
+ */
+public class MailFolderPage extends Page {
+
+	@FindBy(xpath = "//input[@value='Nova Pasta']")
+	private WebElement createNewFolder;
+
+	@FindBy(xpath = "//input[@value='Excluir pasta']")
+	private WebElement deleteFolder;
+
+	@FindBy(xpath = "//input[@value='Renomear pasta']")
+	private WebElement renameFolder;
+
+	public MailFolderPage(WebDriver driver) {
+		super(driver);
+		// TODO Auto-generated constructor stub
+	}
+
+	/**
+	 * Cria nova pasta.
+	 * 
+	 * @param folderName
+	 *            Nome da pasta a ser criada.
+	 */
+	public void createNewFolder(String folderName) {
+		this.createFolder(folderName);
+	}
+
+	private void createFolder(String folderName) {
+		this.createNewFolder.click();
+		Alert newFolder = driver.switchTo().alert();
+		assert "Insira o nome da nova pasta: ".equals(newFolder.getText());
+		newFolder.sendKeys(folderName);
+		newFolder.accept();
+	}
+
+	/**
+	 * Cria sub pasta.
+	 * 
+	 * @param rootFolderName
+	 *            Pasta pai.
+	 * @param subFolderName
+	 *            Nome da sub pasta a ser criada.
+	 */
+	public void createSubFolder(String rootFolderName, String subFolderName) {
+		this.driver.findElement(
+				By.id("lINBOX/" + rootFolderName + "folders_tree")).click();
+		this.createFolder(subFolderName);
+	}
+
+	/**
+	 * Renomeia pasta.
+	 * 
+	 * @param folderName
+	 *            Nome da pasta a ser renomeada.
+	 * @param newName
+	 *            Novo nome da pasta.
+	 */
+	public void renameFolder(String folderName, String newName) {
+		super.waitForElement(By.id("lINBOX/" + folderName + "folders_tree"));
+		this.driver.findElement(By.id("lINBOX/" + folderName + "folders_tree"))
+				.click();
+		this.renameFolder.click();
+		Alert newFolder = driver.switchTo().alert();
+		assert "Entre com um nome para a pasta:".equals(newFolder.getText());
+		newFolder.sendKeys(newName);
+		newFolder.accept();
+	}
+
+	/**
+	 * @param folderName
+	 */
+	public void renameFolderInUse(String folderName) {
+		this.driver.findElement(By.id("lINBOX/" + folderName + "folders_tree"))
+				.click();
+		this.renameFolder.click();
+		Alert newFolder = driver.switchTo().alert();
+		assert "NÃ£o Ã© possÃ­vel renomear esta pasta, pois estÃ¡ em uso no momento!"
+				.equals(newFolder.getText());
+		newFolder.accept();
+	}
+
+	/**
+	 * Exclui pasta.
+	 * 
+	 * @param folderName
+	 *            Nome da pasta a ser excluida.
+	 */
+	public void deleteFolder(String folderName) {
+		this.driver.findElement(By.id("lINBOX/" + folderName + "folders_tree"))
+				.click();
+		this.deleteFolder.click();
+	}
+
+	/**
+	 * Exclui pasta.
+	 * 
+	 * @param folderName
+	 *            Nome da pasta a ser excluida.
+	 */
+	public void deleteFolder(String folderName, boolean inUse) {
+		this.driver.findElement(By.id("lINBOX/" + folderName + "folders_tree"))
+				.click();
+		this.deleteFolder.click();
+		Alert confirm = driver.switchTo().alert();
+		if (!inUse) {
+			assert ("VocÃª gostaria de excluir a pasta: " + folderName + "?")
+					.equals(confirm.getText());
+		} else {
+			assert ("NÃ£o Ã© possÃ­vel remover esta pasta, pois estÃ¡ em uso no momento!")
+					.equals(confirm.getText());
+		}
+		confirm.accept();
+	}
+
+	/**
+	 * Exclui pasta.
+	 * 
+	 * @param folderName
+	 *            Nome da pasta a ser excluida.
+	 */
+	public void deleteSubFolder(String rootFolderName, String subFolderName) {
+		this.driver.findElement(
+				By.id("pINBOX/" + rootFolderName + "folders_tree")).click();
+		this.driver.findElement(
+				By.id("lINBOX/" + rootFolderName + "/" + subFolderName
+						+ "folders_tree")).click();
+		this.deleteFolder.click();
+		Alert confirm = driver.switchTo().alert();
+		assert ("VocÃª gostaria de excluir a pasta: " + subFolderName + "?")
+				.equals(confirm.getText());
+		confirm.accept();
+	}
+
+}
Index: devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/pages/common/Page.java
===================================================================
--- devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/pages/common/Page.java	(revision 4344)
+++ devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/pages/common/Page.java	(revision 4620)
@@ -151,7 +151,29 @@
 			if (option.getText().equals(value)) {
 				option.setSelected();
-				break;
+				return;
 			}
 		}
+
+		// TODO Rever o tratamento da excecao quando um valor nao for encontrado
+		// na combobox.
+
+		try {
+			throw new Exception("Valor " + value + " nÃ£o encontrado em "
+					+ element);
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
 	}
+
+	public String getComboValue(WebElement element) {
+		List<WebElement> options = element.findElements(By.tagName("option"));
+		for (WebElement option : options) {
+			if (option.isSelected()) {
+				return option.getText();
+			}
+		}
+		return null;
+	}
+
 }
Index: devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/email/filtro/DesabilitarFiltroTestCase.java
===================================================================
--- devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/email/filtro/DesabilitarFiltroTestCase.java	(revision 4620)
+++ devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/email/filtro/DesabilitarFiltroTestCase.java	(revision 4620)
@@ -0,0 +1,27 @@
+package org.expressolivre.cte.email.filtro;
+
+import org.expressolivre.cte.common.BaseEmailTestCase;
+import org.expressolivre.cte.pages.email.MailFilterPage;
+import org.testng.annotations.Test;
+
+/**
+ * Suite:[FUN02.7] Gerenciar Filtros
+ * 
+ * Caso de Teste: EL-629:Desabilitar filtro
+ * 
+ * Link: http://testlink.expressolivre.org/linkto.php?tprojectPrefix=EL&item=
+ * testcase&id=EL-629
+ * 
+ * @author L.F.Estivalet (Serpro)
+ * 
+ *         Created on Jun 15, 2011 at 2:35:53 PM
+ * 
+ */
+public class DesabilitarFiltroTestCase extends BaseEmailTestCase {
+
+	@Test
+	public void desabilitarFiltro() {
+		MailFilterPage mfp = mp.editFilter();
+		mfp.disableFilterRule(0);
+	}
+}
Index: devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/email/filtro/EditarFiltroPorAssuntoTestCase.java
===================================================================
--- devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/email/filtro/EditarFiltroPorAssuntoTestCase.java	(revision 4620)
+++ devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/email/filtro/EditarFiltroPorAssuntoTestCase.java	(revision 4620)
@@ -0,0 +1,35 @@
+package org.expressolivre.cte.email.filtro;
+
+import org.expressolivre.cte.common.BaseEmailTestCase;
+import org.expressolivre.cte.pages.email.MailFilterPage;
+import org.testng.annotations.Test;
+
+/**
+ * Suite:[FUN02.7] Gerenciar Filtros
+ * 
+ * Caso de Teste: EL-1105:Editar Filtro por assunto
+ * 
+ * Link: http://testlink.expressolivre.org/linkto.php?tprojectPrefix=EL&item=
+ * testcase&id=EL-1105
+ * 
+ * @author L.F.Estivalet (Serpro)
+ * 
+ *         Created on Jun 16, 2011 at 11:04:53 AM
+ * 
+ */
+public class EditarFiltroPorAssuntoTestCase extends BaseEmailTestCase {
+
+	@Test
+	public void editarFiltroPorAssunto() {
+		MailFilterPage mfp = mp.editFilter();
+		mfp.editFilterRule("1");
+
+		assert mfp.getFilterSubject().equals(EMAIL_ASSUNTO);
+		assert mfp.getFilterArchieveIn().isSelected();
+		assert mfp.getFilterMailBox().equals(EMAIL_PASTA_TESTE);
+
+		mfp.setFilterSubject("NOVO ASSUNTO");
+		mfp.saveFilterRules();
+
+	}
+}
Index: devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/email/filtro/CriarFiltroPorDestinatarioTestCase.java
===================================================================
--- devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/email/filtro/CriarFiltroPorDestinatarioTestCase.java	(revision 4620)
+++ devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/email/filtro/CriarFiltroPorDestinatarioTestCase.java	(revision 4620)
@@ -0,0 +1,31 @@
+package org.expressolivre.cte.email.filtro;
+
+import org.expressolivre.cte.common.BaseEmailTestCase;
+import org.expressolivre.cte.pages.email.MailFilterPage;
+import org.testng.annotations.Test;
+
+/**
+ * Suite:[FUN02.7] Gerenciar Filtros
+ * 
+ * Caso de Teste: EL-633:Criar Filtro por destinatario
+ * 
+ * Link: http://testlink.expressolivre.org/linkto.php?tprojectPrefix=EL&item=
+ * testcase&id=EL-633
+ * 
+ * @author L.F.Estivalet (Serpro)
+ * 
+ *         Created on Jun 15, 2011 at 2:30:53 PM
+ * 
+ */
+public class CriarFiltroPorDestinatarioTestCase extends BaseEmailTestCase {
+
+	@Test
+	public void criarFiltroPorDestinatario() {
+		MailFilterPage mfp = mp.editFilter();
+		mfp.newFilterRule();
+		mfp.setFilterTo(EMAIL_REMETENTE);
+		mfp.setFilterArchieveIn();
+		mfp.setFilterMailBox(EMAIL_PASTA_TESTE);
+		mfp.saveFilterRules();
+	}
+}
Index: devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/email/filtro/CriarFiltroPorTamanhoTestCase.java
===================================================================
--- devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/email/filtro/CriarFiltroPorTamanhoTestCase.java	(revision 4620)
+++ devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/email/filtro/CriarFiltroPorTamanhoTestCase.java	(revision 4620)
@@ -0,0 +1,48 @@
+package org.expressolivre.cte.email.filtro;
+
+import org.expressolivre.cte.common.BaseEmailTestCase;
+import org.expressolivre.cte.pages.email.MailFilterPage;
+import org.openqa.selenium.Alert;
+import org.testng.annotations.Test;
+
+/**
+ * Suite:[FUN02.7] Gerenciar Filtros
+ * 
+ * Caso de Teste: EL-634:Criar Filtro por tamanho
+ * 
+ * Link: http://testlink.expressolivre.org/linkto.php?tprojectPrefix=EL&item=
+ * testcase&id=EL-634
+ * 
+ * @author L.F.Estivalet (Serpro)
+ * 
+ *         Created on May 31, 2011 at 10:52:53 AM
+ * 
+ */
+public class CriarFiltroPorTamanhoTestCase extends BaseEmailTestCase {
+
+	@Test
+	public void criarFiltroPorTamanho() {
+		MailFilterPage mfp = mp.editFilter();
+		mfp.newFilterRule();
+
+		String[] invalidInput = { "a4390", "$fjf", "%20", "&3737", "#8950",
+				"@7698", "(51)" };
+
+		for (int i = 0; i < invalidInput.length; i++) {
+			mfp.setFilterSize(invalidInput[i]);
+			mfp.saveFilterRules();
+
+			Alert error = driver.switchTo().alert();
+			assert "Informe um valor numÃ©rico para o tamanho da mensagem!"
+					.equals(error.getText());
+			error.dismiss();
+
+		}
+
+		mfp.setFilterSize("100");
+
+		mfp.setFilterArchieveIn();
+		mfp.setFilterMailBox(EMAIL_PASTA_TESTE);
+		mfp.saveFilterRules();
+	}
+}
Index: devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/email/filtro/CriarFiltroPorRemetenteTestCase.java
===================================================================
--- devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/email/filtro/CriarFiltroPorRemetenteTestCase.java	(revision 4606)
+++ devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/email/filtro/CriarFiltroPorRemetenteTestCase.java	(revision 4620)
@@ -2,7 +2,15 @@
 
 import org.expressolivre.cte.common.BaseEmailTestCase;
+import org.expressolivre.cte.pages.email.MailFilterPage;
 import org.testng.annotations.Test;
 
 /**
+ * Suite:[FUN02.7] Gerenciar Filtros
+ * 
+ * Caso de Teste: EL-632:Criar Filtro por remetente
+ * 
+ * Link: http://testlink.expressolivre.org/linkto.php?tprojectPrefix=EL&item=
+ * testcase&id=EL-632
+ * 
  * @author L.F.Estivalet (Serpro)
  * 
@@ -14,10 +22,10 @@
 	@Test
 	public void criarFiltroPorRemetente() {
-		mp.editFilter();
-		mp.newFilterRule();
-		mp.setFilterRecepient(EMAIL_REMETENTE);
-		mp.setFilterArchieveIn();
-		mp.setFilterMailBox(EMAIL_PASTA_TESTE);
-		mp.saveFilterRules();
+		MailFilterPage mfp = mp.editFilter();
+		mfp.newFilterRule();
+		mfp.setFilterRecepient(EMAIL_REMETENTE);
+		mfp.setFilterArchieveIn();
+		mfp.setFilterMailBox(EMAIL_PASTA_TESTE);
+		mfp.saveFilterRules();
 	}
 }
Index: devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/email/filtro/ExcluirFiltroTestCase.java
===================================================================
--- devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/email/filtro/ExcluirFiltroTestCase.java	(revision 4620)
+++ devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/email/filtro/ExcluirFiltroTestCase.java	(revision 4620)
@@ -0,0 +1,45 @@
+package org.expressolivre.cte.email.filtro;
+
+import org.expressolivre.cte.common.BaseEmailTestCase;
+import org.expressolivre.cte.pages.email.MailFilterPage;
+import org.testng.annotations.Parameters;
+import org.testng.annotations.Test;
+
+/**
+ * Suite:[FUN02.7] Gerenciar Filtros
+ * 
+ * Caso de Teste: EL-630:Excluir filtro
+ * 
+ * Caso de Teste: EL-1103:Excluir mais de 1 filtro
+ * 
+ * Link: http://testlink.expressolivre.org/linkto.php?tprojectPrefix=EL&item=
+ * testcase&id=EL-630
+ * 
+ * Link: http://testlink.expressolivre.org/linkto.php?tprojectPrefix=EL&item=
+ * testcase&id=EL-1103
+ * 
+ * @author L.F.Estivalet (Serpro)
+ * 
+ *         Created on Jun 15, 2011 at 10:29:34 AM
+ * 
+ */
+public class ExcluirFiltroTestCase extends BaseEmailTestCase {
+
+	@Parameters({ "ruleId" })
+	@Test
+	public void excluirFiltro(Integer ruleId) {
+		MailFilterPage mfp = mp.editFilter();
+		mfp.deleteFilterRule(ruleId);
+	}
+
+	@Test
+	public void excluirMultiplosFiltros() {
+		MailFilterPage mfp = mp.editFilter();
+		for (int i = 0; i < 3; i++) {
+			mfp.selectFilterRule(i);
+		}
+
+		mfp.deleteFilters();
+	}
+
+}
Index: devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/email/filtro/CriarFiltroPorAssuntoTestCase.java
===================================================================
--- devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/email/filtro/CriarFiltroPorAssuntoTestCase.java	(revision 4620)
+++ devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/email/filtro/CriarFiltroPorAssuntoTestCase.java	(revision 4620)
@@ -0,0 +1,70 @@
+package org.expressolivre.cte.email.filtro;
+
+import org.expressolivre.cte.common.BaseEmailTestCase;
+import org.expressolivre.cte.pages.email.MailFilterPage;
+import org.openqa.selenium.Alert;
+import org.testng.annotations.Test;
+
+/**
+ * Suite:[FUN02.7] Gerenciar Filtros
+ * 
+ * Caso de Teste: EL-631:Criar Filtro por assunto
+ * 
+ * Link: http://testlink.expressolivre.org/linkto.php?tprojectPrefix=EL&item=
+ * testcase&id=EL-631
+ * 
+ * @author L.F.Estivalet (Serpro)
+ * 
+ *         Created on Jun 15, 2011 at 10:22:53 AM
+ * 
+ */
+public class CriarFiltroPorAssuntoTestCase extends BaseEmailTestCase {
+
+	@Test
+	public void criarFiltroPorAssunto() {
+		MailFilterPage mfp = mp.editFilter();
+		mfp.newFilterRule();
+		mfp.saveFilterRules();
+
+		Alert error = driver.switchTo().alert();
+		assert "Defina algum critÃ©rio para os campos Remetente, Para, Assunto e Tamanho da mensagem com mais de 3 caracteres!"
+				.equals(error.getText());
+		error.dismiss();
+
+		mfp.setFilterSubject(EMAIL_ASSUNTO);
+		mfp.saveFilterRules();
+
+		error = driver.switchTo().alert();
+		assert "NÃ£o foi marcada nenhuma opÃ§Ã£o!".equals(error.getText());
+		error.dismiss();
+
+		mfp.setFilterArchieveIn();
+		mfp.setFilterMailBox(EMAIL_PASTA_TESTE);
+		mfp.saveFilterRules();
+
+		assert mfp.getFilterRuleText("1").equals(
+				"Status : Habilitada - Se o email tem assunto:" + EMAIL_ASSUNTO
+						+ " - AÃ§Ã£o: Arquivar em " + EMAIL_PASTA_TESTE);
+	}
+
+	@Test
+	public void criarFiltroPorAssuntoComMensagemRejeicao() {
+		MailFilterPage mfp = mp.editFilter();
+		mfp.newFilterRule();
+		mfp.setFilterSubject(EMAIL_ASSUNTO);
+		mfp.setFilterRejectMessage();
+		mfp.saveFilterRules();
+
+		Alert error = driver.switchTo().alert();
+		assert "Informe um texto para rejeiÃ§Ã£o!".equals(error.getText());
+		error.dismiss();
+
+		mfp.setFilterRejectMessageText("NÃ£o enviar email para esta conta!!!");
+		mfp.saveFilterRules();
+
+		assert mfp.getFilterRuleText("2").equals(
+				"Status : Habilitada - Se o email tem assunto:" + EMAIL_ASSUNTO
+						+ " - AÃ§Ã£o: Rejeitar");
+
+	}
+}
Index: devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/email/filtro/HabilitarFiltroTestCase.java
===================================================================
--- devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/email/filtro/HabilitarFiltroTestCase.java	(revision 4620)
+++ devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/email/filtro/HabilitarFiltroTestCase.java	(revision 4620)
@@ -0,0 +1,27 @@
+package org.expressolivre.cte.email.filtro;
+
+import org.expressolivre.cte.common.BaseEmailTestCase;
+import org.expressolivre.cte.pages.email.MailFilterPage;
+import org.testng.annotations.Test;
+
+/**
+ * Suite:[FUN02.7] Gerenciar Filtros
+ * 
+ * Caso de Teste: EL-628:Habilitar filtro
+ * 
+ * Link: http://testlink.expressolivre.org/linkto.php?tprojectPrefix=EL&item=
+ * testcase&id=EL-628
+ * 
+ * @author L.F.Estivalet (Serpro)
+ * 
+ *         Created on Jun 15, 2011 at 2:42:53 PM
+ * 
+ */
+public class HabilitarFiltroTestCase extends BaseEmailTestCase {
+
+	@Test
+	public void habilitarFiltro() {
+		MailFilterPage mfp = mp.editFilter();
+		mfp.enableFilterRule(0);
+	}
+}
Index: devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/email/ler/BloquearUsuarioTestCase.java
===================================================================
--- devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/email/ler/BloquearUsuarioTestCase.java	(revision 4606)
+++ devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/email/ler/BloquearUsuarioTestCase.java	(revision 4620)
@@ -2,4 +2,5 @@
 
 import org.expressolivre.cte.common.BaseEmailTestCase;
+import org.expressolivre.cte.pages.email.MailFilterPage;
 import org.testng.annotations.Test;
 
@@ -49,6 +50,6 @@
 	@Test
 	public void desbloquearRemetente() {
-		mp.editFilter();
-		mp.deleteRule(0);
+		MailFilterPage mfp = mp.editFilter();
+		mfp.deleteFilterRule(0);
 	}
 
Index: devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/email/pastas/ApagarPastaTestCase.java
===================================================================
--- devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/email/pastas/ApagarPastaTestCase.java	(revision 4527)
+++ devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/email/pastas/ApagarPastaTestCase.java	(revision 4620)
@@ -2,4 +2,5 @@
 
 import org.expressolivre.cte.common.BaseEmailTestCase;
+import org.expressolivre.cte.pages.email.MailFolderPage;
 import org.openqa.selenium.Alert;
 import org.testng.annotations.Test;
@@ -35,5 +36,6 @@
 	@Test
 	public void deleteFolderWithSubFolder() {
-		mp.deleteFolder(EMAIL_PASTA_TESTE);
+		MailFolderPage mfp = mp.editFolder();
+		mfp.deleteFolder(EMAIL_PASTA_TESTE);
 		Alert confirm = driver.switchTo().alert();
 		assert ("Remova suas sub-pastas primeiro.").equals(confirm.getText());
@@ -43,5 +45,6 @@
 	@Test(dependsOnMethods = { "deleteFolderWithSubFolder" })
 	public void deleteSubFolder() {
-		mp.deleteSubFolder(EMAIL_PASTA_TESTE, "subfolder");
+		MailFolderPage mfp = mp.editFolder();
+		mfp.deleteSubFolder(EMAIL_PASTA_TESTE, "subfolder");
 	}
 
@@ -49,5 +52,6 @@
 	public void deleteFolderInUse() {
 		mp.openFolder("lINBOX/Seleniumtree_folders", false);
-		mp.deleteFolder(EMAIL_PASTA_TESTE, true);
+		MailFolderPage mfp = mp.editFolder();
+		mfp.deleteFolder(EMAIL_PASTA_TESTE, true);
 	}
 
@@ -58,5 +62,6 @@
 			"deleteFolderInUse" })
 	public void deleteFolder() {
-		mp.deleteFolder(EMAIL_PASTA_TESTE, false);
+		MailFolderPage mfp = mp.editFolder();
+		mfp.deleteFolder(EMAIL_PASTA_TESTE, false);
 		mp.assertMessage(MSG_EMAIL_PASTA_REMOVIDA);
 	}
Index: devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/email/pastas/CriarPastaTestCase.java
===================================================================
--- devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/email/pastas/CriarPastaTestCase.java	(revision 4606)
+++ devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/email/pastas/CriarPastaTestCase.java	(revision 4620)
@@ -2,4 +2,5 @@
 
 import org.expressolivre.cte.common.BaseEmailTestCase;
+import org.expressolivre.cte.pages.email.MailFolderPage;
 import org.openqa.selenium.Alert;
 import org.testng.annotations.Test;
@@ -36,10 +37,12 @@
 	@Test
 	public void criarPasta() {
-		mp.createNewFolder(EMAIL_PASTA_TESTE);
+		MailFolderPage mfp = mp.editFolder();
+		mfp.createNewFolder(EMAIL_PASTA_TESTE);
 	}
 
 	@Test
 	public void criarSubPasta() {
-		mp.createSubFolder(EMAIL_PASTA_TESTE, "subfolder");
+		MailFolderPage mfp = mp.editFolder();
+		mfp.createSubFolder(EMAIL_PASTA_TESTE, "subfolder");
 	}
 
@@ -49,5 +52,6 @@
 	@Test
 	public void criarPastaComCaracterEspecial() {
-		mp.createNewFolder("pasta1/pasta2");
+		MailFolderPage mfp = mp.editFolder();
+		mfp.createNewFolder("pasta1/pasta2");
 		Alert newFolder = driver.switchTo().alert();
 		assert "Erro ao criar a pasta. Certifique-se de que nÃ£o tentou criÃ¡-la com um nome que contÃ©m a palavra \"local_\" ou que possui algum caractere especial."
Index: devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/email/pastas/RenomearPastaTestCase.java
===================================================================
--- devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/email/pastas/RenomearPastaTestCase.java	(revision 4606)
+++ devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/email/pastas/RenomearPastaTestCase.java	(revision 4620)
@@ -2,4 +2,5 @@
 
 import org.expressolivre.cte.common.BaseEmailTestCase;
+import org.expressolivre.cte.pages.email.MailFolderPage;
 import org.openqa.selenium.Alert;
 import org.testng.annotations.Test;
@@ -32,6 +33,7 @@
 	@Test
 	public void renomearPasta() {
-		mp.renameFolder(EMAIL_PASTA_TESTE, EMAIL_PASTA_TESTE2);
-		mp.renameFolder(EMAIL_PASTA_TESTE2, EMAIL_PASTA_TESTE);
+		MailFolderPage mfp = mp.editFolder();
+		mfp.renameFolder(EMAIL_PASTA_TESTE, EMAIL_PASTA_TESTE2);
+		mfp.renameFolder(EMAIL_PASTA_TESTE2, EMAIL_PASTA_TESTE);
 	}
 
@@ -39,5 +41,6 @@
 	public void renomearPastaEmUso() throws Exception {
 		mp.openFolder("lINBOX/Seleniumtree_folders", false);
-		mp.renameFolderInUse(EMAIL_PASTA_TESTE);
+		MailFolderPage mfp = mp.editFolder();
+		mfp.renameFolderInUse(EMAIL_PASTA_TESTE);
 	}
 
@@ -47,5 +50,6 @@
 	@Test
 	public void renomearPastaComCaracterEspecial() {
-		mp.createNewFolder("pasta1/pasta2");
+		MailFolderPage mfp = mp.editFolder();
+		mfp.createNewFolder("pasta1/pasta2");
 		Alert newFolder = driver.switchTo().alert();
 		assert "Erro ao criar a pasta. Certifique-se de que nÃ£o tentou criÃ¡-la com um nome que contÃ©m a palavra \"local_\" ou que possui algum caractere especial."
Index: devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/email/pesquisar/PesquisarEmailPorIntervaloDataTestCase.java
===================================================================
--- devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/email/pesquisar/PesquisarEmailPorIntervaloDataTestCase.java	(revision 4527)
+++ devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/email/pesquisar/PesquisarEmailPorIntervaloDataTestCase.java	(revision 4620)
@@ -6,4 +6,5 @@
 import org.expressolivre.cte.common.BaseEmailTestCase;
 import org.expressolivre.cte.common.Config;
+import org.expressolivre.cte.pages.email.MailSearchPage;
 import org.testng.annotations.Test;
 
@@ -35,9 +36,9 @@
 	@Test
 	public void pesquisaEmailPorIntervaloDataSemResultado() {
-		mp.openSearchMessageWindow();
-		mp.setSearchFolders("lINBOX_folders_tree_search");
-		mp.setSearchSinceDate("01011984");
-		mp.setSearchBeforeDate("01011999");
-		mp.doSearch();
+		MailSearchPage msp = mp.openSearchMessageWindow();
+		msp.setSearchFolders("lINBOX_folders_tree_search");
+		msp.setSearchSinceDate("01011984");
+		msp.setSearchBeforeDate("01011999");
+		msp.doSearch();
 		mp.assertMessage(Config.getInstance().getMensagem("resultado.pesquisa",
 				"0"));
@@ -52,9 +53,9 @@
 		String lastWeek = sdf.format(cal.getTime());
 
-		mp.openSearchMessageWindow();
-		mp.setSearchFolders("lINBOX_folders_tree_search");
-		mp.setSearchSinceDate(lastWeek);
-		mp.setSearchBeforeDate(today);
-		mp.doSearch();
+		MailSearchPage msp = mp.openSearchMessageWindow();
+		msp.setSearchFolders("lINBOX_folders_tree_search");
+		msp.setSearchSinceDate(lastWeek);
+		msp.setSearchBeforeDate(today);
+		msp.doSearch();
 		mp.assertMessage(Config.getInstance().getMensagem("resultado.pesquisa",
 				"2"));
Index: devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/email/pesquisar/PesquisarEmailParametroInvalidoTestCase.java
===================================================================
--- devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/email/pesquisar/PesquisarEmailParametroInvalidoTestCase.java	(revision 4527)
+++ devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/email/pesquisar/PesquisarEmailParametroInvalidoTestCase.java	(revision 4620)
@@ -2,4 +2,5 @@
 
 import org.expressolivre.cte.common.BaseEmailTestCase;
+import org.expressolivre.cte.pages.email.MailSearchPage;
 import org.openqa.selenium.Alert;
 import org.testng.annotations.Test;
@@ -33,6 +34,6 @@
 	@Test
 	public void pesquisaEmailSemParametro() {
-		mp.openSearchMessageWindow();
-		mp.doSearch();
+		MailSearchPage msp = mp.openSearchMessageWindow();
+		msp.doSearch();
 		Alert alert = driver.switchTo().alert();
 		assert (MSG_EMAIL_SEM_FILTRO_PESQUISA.equals(alert.getText()));
@@ -42,7 +43,7 @@
 	@Test
 	public void pesquisaEmailDestaDataInvalida() {
-		mp.openSearchMessageWindow();
-		mp.setSearchSinceDate("223344");
-		mp.doSearch();
+		MailSearchPage msp = mp.openSearchMessageWindow();
+		msp.setSearchSinceDate("223344");
+		msp.doSearch();
 		Alert alert = driver.switchTo().alert();
 		assert ("Data invÃ¡lida no campo 'Desta  Data'".equals(alert.getText()));
@@ -52,8 +53,8 @@
 	@Test
 	public void pesquisaEmailAteDataInvalida() {
-		mp.openSearchMessageWindow();
-		mp.setSearchSinceDate("");
-		mp.setSearchOnDate("918272");
-		mp.doSearch();
+		MailSearchPage msp = mp.openSearchMessageWindow();
+		msp.setSearchSinceDate("");
+		msp.setSearchOnDate("918272");
+		msp.doSearch();
 		Alert alert = driver.switchTo().alert();
 		assert ("Data invÃ¡lida no campo 'Na Data'".equals(alert.getText()));
@@ -63,9 +64,9 @@
 	@Test
 	public void pesquisaEmailNestaDataInvalida() {
-		mp.openSearchMessageWindow();
-		mp.setSearchSinceDate("");
-		mp.setSearchOnDate("");
-		mp.setSearchBeforeDate("837378");
-		mp.doSearch();
+		MailSearchPage msp = mp.openSearchMessageWindow();
+		msp.setSearchSinceDate("");
+		msp.setSearchOnDate("");
+		msp.setSearchBeforeDate("837378");
+		msp.doSearch();
 		Alert alert = driver.switchTo().alert();
 		assert ("Data invÃ¡lida no campo 'AtÃ© a Data'".equals(alert.getText()));
Index: devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/email/pesquisar/PesquisarEmailImportanteTestCase.java
===================================================================
--- devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/email/pesquisar/PesquisarEmailImportanteTestCase.java	(revision 4527)
+++ devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/email/pesquisar/PesquisarEmailImportanteTestCase.java	(revision 4620)
@@ -3,4 +3,5 @@
 import org.expressolivre.cte.common.BaseEmailTestCase;
 import org.expressolivre.cte.common.Config;
+import org.expressolivre.cte.pages.email.MailSearchPage;
 import org.testng.annotations.Test;
 
@@ -37,8 +38,8 @@
 	@Test
 	public void pesquisaMensagemImportanteSemResultado() {
-		mp.openSearchMessageWindow();
-		mp.setSearchFolders("lINBOX_folders_tree_search");
-		mp.searchImportantMessage("Importante");
-		mp.doSearch();
+		MailSearchPage msp = mp.openSearchMessageWindow();
+		msp.setSearchFolders("lINBOX_folders_tree_search");
+		msp.searchImportantMessage("Importante");
+		msp.doSearch();
 		mp.assertMessage(Config.getInstance().getMensagem("resultado.pesquisa",
 				"0"));
@@ -47,8 +48,8 @@
 	@Test
 	public void pesquisaMensagemNaoImportanteSemResultado() {
-		mp.openSearchMessageWindow();
-		mp.setSearchFolders("lINBOX_folders_tree_search");
-		mp.searchImportantMessage("NÃ£o Importante");
-		mp.doSearch();
+		MailSearchPage msp = mp.openSearchMessageWindow();
+		msp.setSearchFolders("lINBOX_folders_tree_search");
+		msp.searchImportantMessage("NÃ£o Importante");
+		msp.doSearch();
 		mp.assertMessage(Config.getInstance().getMensagem("resultado.pesquisa",
 				"0"));
@@ -60,8 +61,8 @@
 	@Test
 	public void pesquisaMensagemImportanteComResultado() {
-		mp.openSearchMessageWindow();
-		mp.setSearchFolders("lINBOX_folders_tree_search");
-		mp.searchImportantMessage("Importante");
-		mp.doSearch();
+		MailSearchPage msp = mp.openSearchMessageWindow();
+		msp.setSearchFolders("lINBOX_folders_tree_search");
+		msp.searchImportantMessage("Importante");
+		msp.doSearch();
 		mp.assertMessage(Config.getInstance().getMensagem("resultado.pesquisa",
 				"1"));
@@ -73,8 +74,8 @@
 	@Test
 	public void pesquisaMensagemNaoImportanteComResultado() {
-		mp.openSearchMessageWindow();
-		mp.setSearchFolders("lINBOX_folders_tree_search");
-		mp.searchImportantMessage("NÃ£o Importante");
-		mp.doSearch();
+		MailSearchPage msp = mp.openSearchMessageWindow();
+		msp.setSearchFolders("lINBOX_folders_tree_search");
+		msp.searchImportantMessage("NÃ£o Importante");
+		msp.doSearch();
 		mp.assertMessage(Config.getInstance().getMensagem("resultado.pesquisa",
 				"1"));
Index: devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/email/pesquisar/PesquisarEmailPorTextoTestCase.java
===================================================================
--- devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/email/pesquisar/PesquisarEmailPorTextoTestCase.java	(revision 4527)
+++ devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/email/pesquisar/PesquisarEmailPorTextoTestCase.java	(revision 4620)
@@ -3,4 +3,5 @@
 import org.expressolivre.cte.common.BaseEmailTestCase;
 import org.expressolivre.cte.common.Config;
+import org.expressolivre.cte.pages.email.MailSearchPage;
 import org.testng.annotations.Test;
 
@@ -27,8 +28,8 @@
 	@Test
 	public void pesquisaEmailPorTextoComResultado() {
-		mp.openSearchMessageWindow();
-		mp.setSearchFolders("lINBOX_folders_tree_search");
-		mp.setSearchBody(EMAIL_TEXTO);
-		mp.doSearch();
+		MailSearchPage msp = mp.openSearchMessageWindow();
+		msp.setSearchFolders("lINBOX_folders_tree_search");
+		msp.setSearchBody(EMAIL_TEXTO);
+		msp.doSearch();
 		mp.assertMessage(Config.getInstance().getMensagem("resultado.pesquisa",
 				"2"));
@@ -37,8 +38,8 @@
 	@Test
 	public void pesquisaEmailPorTextoSemResultado() {
-		mp.openSearchMessageWindow();
-		mp.setSearchFolders("lINBOX_folders_tree_search");
-		mp.setSearchBody("texto nÃ£o encontrado");
-		mp.doSearch();
+		MailSearchPage msp = mp.openSearchMessageWindow();
+		msp.setSearchFolders("lINBOX_folders_tree_search");
+		msp.setSearchBody("texto nÃ£o encontrado");
+		msp.doSearch();
 		mp.assertMessage(Config.getInstance().getMensagem("resultado.pesquisa",
 				"0"));
Index: devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/email/pesquisar/PesquisarEmailLidaTestCase.java
===================================================================
--- devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/email/pesquisar/PesquisarEmailLidaTestCase.java	(revision 4527)
+++ devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/email/pesquisar/PesquisarEmailLidaTestCase.java	(revision 4620)
@@ -3,4 +3,5 @@
 import org.expressolivre.cte.common.BaseEmailTestCase;
 import org.expressolivre.cte.common.Config;
+import org.expressolivre.cte.pages.email.MailSearchPage;
 import org.testng.annotations.Test;
 
@@ -37,8 +38,8 @@
 	@Test
 	public void pesquisaMensagemLidaSemResultado() {
-		mp.openSearchMessageWindow();
-		mp.setSearchFolders("lINBOX_folders_tree_search");
-		mp.searchSeenMessage("Lida");
-		mp.doSearch();
+		MailSearchPage msp = mp.openSearchMessageWindow();
+		msp.setSearchFolders("lINBOX_folders_tree_search");
+		msp.searchSeenMessage("Lida");
+		msp.doSearch();
 		mp.assertMessage(Config.getInstance().getMensagem("resultado.pesquisa",
 				"0"));
@@ -47,8 +48,8 @@
 	@Test
 	public void pesquisaMensagemLidaComResultado() {
-		mp.openSearchMessageWindow();
-		mp.setSearchFolders("lINBOX_folders_tree_search");
-		mp.searchSeenMessage("Lida");
-		mp.doSearch();
+		MailSearchPage msp = mp.openSearchMessageWindow();
+		msp.setSearchFolders("lINBOX_folders_tree_search");
+		msp.searchSeenMessage("Lida");
+		msp.doSearch();
 		mp.assertMessage(Config.getInstance().getMensagem("resultado.pesquisa",
 				"1"));
@@ -57,8 +58,8 @@
 	@Test
 	public void pesquisaMensagemNaoLidaSemResultado() {
-		mp.openSearchMessageWindow();
-		mp.setSearchFolders("lINBOX_folders_tree_search");
-		mp.searchSeenMessage("NÃ£o lida");
-		mp.doSearch();
+		MailSearchPage msp = mp.openSearchMessageWindow();
+		msp.setSearchFolders("lINBOX_folders_tree_search");
+		msp.searchSeenMessage("NÃ£o lida");
+		msp.doSearch();
 		mp.assertMessage(Config.getInstance().getMensagem("resultado.pesquisa",
 				"0"));
@@ -67,8 +68,8 @@
 	@Test
 	public void pesquisaMensagemNaoLidaComResultado() {
-		mp.openSearchMessageWindow();
-		mp.setSearchFolders("lINBOX_folders_tree_search");
-		mp.searchSeenMessage("NÃ£o lida");
-		mp.doSearch();
+		MailSearchPage msp = mp.openSearchMessageWindow();
+		msp.setSearchFolders("lINBOX_folders_tree_search");
+		msp.searchSeenMessage("NÃ£o lida");
+		msp.doSearch();
 		mp.assertMessage(Config.getInstance().getMensagem("resultado.pesquisa",
 				"1"));
Index: devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/email/pesquisar/PesquisarEmailPorRemetenteTestCase.java
===================================================================
--- devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/email/pesquisar/PesquisarEmailPorRemetenteTestCase.java	(revision 4527)
+++ devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/email/pesquisar/PesquisarEmailPorRemetenteTestCase.java	(revision 4620)
@@ -3,4 +3,5 @@
 import org.expressolivre.cte.common.BaseEmailTestCase;
 import org.expressolivre.cte.common.Config;
+import org.expressolivre.cte.pages.email.MailSearchPage;
 import org.testng.annotations.Test;
 
@@ -32,8 +33,8 @@
 	@Test
 	public void pesquisaEmailPorRemetenteSemResultado() {
-		mp.openSearchMessageWindow();
-		mp.setSearchFolders("lINBOX_folders_tree_search");
-		mp.setSearchRemetente("JoÃ£o da Silva");
-		mp.doSearch();
+		MailSearchPage msp = mp.openSearchMessageWindow();
+		msp.setSearchFolders("lINBOX_folders_tree_search");
+		msp.setSearchRemetente("JoÃ£o da Silva");
+		msp.doSearch();
 		mp.assertMessage(Config.getInstance().getMensagem("resultado.pesquisa",
 				"0"));
@@ -42,8 +43,8 @@
 	@Test
 	public void pesquisaEmailPorRemetenteComResultado() {
-		mp.openSearchMessageWindow();
-		mp.setSearchFolders("lINBOX_folders_tree_search");
-		mp.setSearchRemetente("Luiz Fernando Estivalet");
-		mp.doSearch();
+		MailSearchPage msp = mp.openSearchMessageWindow();
+		msp.setSearchFolders("lINBOX_folders_tree_search");
+		msp.setSearchRemetente("Luiz Fernando Estivalet");
+		msp.doSearch();
 		mp.assertMessage(Config.getInstance().getMensagem("resultado.pesquisa",
 				"2"));
Index: devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/email/pesquisar/PesquisarEmailPorDataTestCase.java
===================================================================
--- devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/email/pesquisar/PesquisarEmailPorDataTestCase.java	(revision 4527)
+++ devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/email/pesquisar/PesquisarEmailPorDataTestCase.java	(revision 4620)
@@ -6,4 +6,5 @@
 import org.expressolivre.cte.common.BaseEmailTestCase;
 import org.expressolivre.cte.common.Config;
+import org.expressolivre.cte.pages.email.MailSearchPage;
 import org.testng.annotations.Test;
 
@@ -35,8 +36,8 @@
 	@Test
 	public void pesquisaEmailPorDataSemResultado() {
-		mp.openSearchMessageWindow();
-		mp.setSearchFolders("lINBOX_folders_tree_search");
-		mp.setSearchOnDate("01011984");
-		mp.doSearch();
+		MailSearchPage msp = mp.openSearchMessageWindow();
+		msp.setSearchFolders("lINBOX_folders_tree_search");
+		msp.setSearchOnDate("01011984");
+		msp.doSearch();
 		mp.assertMessage(Config.getInstance().getMensagem("resultado.pesquisa",
 				"0"));
@@ -49,8 +50,8 @@
 		String today = sdf.format(cal.getTime());
 
-		mp.openSearchMessageWindow();
-		mp.setSearchFolders("lINBOX_folders_tree_search");
-		mp.setSearchOnDate(today);
-		mp.doSearch();
+		MailSearchPage msp = mp.openSearchMessageWindow();
+		msp.setSearchFolders("lINBOX_folders_tree_search");
+		msp.setSearchOnDate(today);
+		msp.doSearch();
 		mp.assertMessage(Config.getInstance().getMensagem("resultado.pesquisa",
 				"2"));
Index: devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/email/pesquisar/PesquisarEmailPorAssuntoTestCase.java
===================================================================
--- devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/email/pesquisar/PesquisarEmailPorAssuntoTestCase.java	(revision 4606)
+++ devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/email/pesquisar/PesquisarEmailPorAssuntoTestCase.java	(revision 4620)
@@ -3,4 +3,5 @@
 import org.expressolivre.cte.common.BaseEmailTestCase;
 import org.expressolivre.cte.common.Config;
+import org.expressolivre.cte.pages.email.MailSearchPage;
 import org.testng.annotations.Test;
 
@@ -35,8 +36,8 @@
 	@Test
 	public void pesquisaEmailPorAssuntoComResultado() {
-		mp.openSearchMessageWindow();
-		mp.setSearchFolders("lINBOX_folders_tree_search");
-		mp.setSearchSubject(EMAIL_ASSUNTO);
-		mp.doSearch();
+		MailSearchPage msp = mp.openSearchMessageWindow();
+		msp.setSearchFolders("lINBOX_folders_tree_search");
+		msp.setSearchSubject(EMAIL_ASSUNTO);
+		msp.doSearch();
 		mp.assertMessage(Config.getInstance().getMensagem("resultado.pesquisa",
 				"1"));
@@ -48,8 +49,8 @@
 	@Test
 	public void pesquisaEmailPorAssuntoComAcentoResultado() {
-		mp.openSearchMessageWindow();
-		mp.setSearchFolders("lINBOX_folders_tree_search");
-		mp.setSearchSubject(EMAIL_ASSUNTO_ACENTO);
-		mp.doSearch();
+		MailSearchPage msp = mp.openSearchMessageWindow();
+		msp.setSearchFolders("lINBOX_folders_tree_search");
+		msp.setSearchSubject(EMAIL_ASSUNTO_ACENTO);
+		msp.doSearch();
 		mp.assertMessage(Config.getInstance().getMensagem("resultado.pesquisa",
 				"1"));
@@ -58,8 +59,8 @@
 	@Test
 	public void pesquisaEmailPorAssuntoSemResultado() {
-		mp.openSearchMessageWindow();
-		mp.setSearchFolders("lINBOX_folders_tree_search");
-		mp.setSearchSubject("assunto nÃ£o encontrado");
-		mp.doSearch();
+		MailSearchPage msp = mp.openSearchMessageWindow();
+		msp.setSearchFolders("lINBOX_folders_tree_search");
+		msp.setSearchSubject("assunto nÃ£o encontrado");
+		msp.doSearch();
 		mp.assertMessage(Config.getInstance().getMensagem("resultado.pesquisa",
 				"0"));
Index: devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/email/listar/MoverEmailSelecionadoTestCase.java
===================================================================
--- devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/email/listar/MoverEmailSelecionadoTestCase.java	(revision 4606)
+++ devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/email/listar/MoverEmailSelecionadoTestCase.java	(revision 4620)
@@ -2,4 +2,5 @@
 
 import org.expressolivre.cte.common.BaseEmailTestCase;
+import org.expressolivre.cte.pages.email.MailFolderPage;
 import org.testng.annotations.Test;
 
@@ -27,5 +28,6 @@
 	public void moverEmailSelecionado() {
 		// Cria pasta de teste para mover o email.
-		mp.createNewFolder(EMAIL_PASTA_TESTE);
+		MailFolderPage mfp = mp.editFolder();
+		mfp.createNewFolder(EMAIL_PASTA_TESTE);
 
 		// Procura o email e move a mensagem para pasta de teste criada.
@@ -35,5 +37,5 @@
 
 		// Apaga pasta de teste.
-		mp.deleteFolder(EMAIL_PASTA_TESTE, false);
+		mfp.deleteFolder(EMAIL_PASTA_TESTE, false);
 		mp.assertMessage(MSG_EMAIL_PASTA_REMOVIDA);
 	}
Index: devel/testlink/automation2.0/src/test/resources/config.properties
===================================================================
--- devel/testlink/automation2.0/src/test/resources/config.properties	(revision 4606)
+++ devel/testlink/automation2.0/src/test/resources/config.properties	(revision 4620)
@@ -9,11 +9,11 @@
 
 # Usuario normal
-url=https://cte2.serpro.gov.br
+#url=https://cte2.serpro.gov.br
+#user=88758559000
+#passwd=serpro
+
+url=https://10.200.113.112/
 user=88758559000
 passwd=serpro
-
-#url=https://10.200.113.112/
-#user=88758559000
-#passwd=serpro
 
 
