Changeset 4627 for devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/pages

Timestamp:

06/21/11 15:02:08 (13 years ago)

Author:

luiz-fernando

Message:

Ticket #1771 - Modificacoes feitas em nomes de classes e metodos

Location:

devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/pages

Files:

• common/LoginPage.java (modified) (2 diffs)
• email/MailAdminPreferencesPage.java (moved) (moved from devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/pages/email/ExpressoMailAdminPreferencesPage.java) (2 diffs)
• email/MailFolderPage.java (modified) (6 diffs)
• email/MailPage.java (modified) (6 diffs)
• email/MailPreferencesPage.java (moved) (moved from devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/pages/email/ExpressoMailPreferencesPage.java) (2 diffs)

devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/pages/common/LoginPage.java

@@ -1 +1 @@
 package org.expressolivre.cte.pages.common;
 
+import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
@@ -31 +32 @@
          */
         public void login(String username, String password) {
+                super.waitForElement(By.name("user"));
                 this.username.clear();
                 this.username.sendKeys(username);

devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/pages/email/MailAdminPreferencesPage.java

@@ -12 +12 @@
  * 
  */
-public class ExpressoMailAdminPreferencesPage extends Page {
+public class MailAdminPreferencesPage extends Page {
 
         /** Você deseja exibir automaticamente o cabecalho da mensagem? */
@@ -365 +365 @@
         private WebElement savePreferences;
 
-        public ExpressoMailAdminPreferencesPage(WebDriver driver) {
+        public MailAdminPreferencesPage(WebDriver driver) {
                 super(driver);
         }

devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/pages/email/MailFolderPage.java

@@ -1 +1 @@
 package org.expressolivre.cte.pages.email;
 
-import org.expressolivre.cte.pages.common.Page;
 import org.openqa.selenium.Alert;
 import org.openqa.selenium.By;
@@ -16 +15 @@
  * 
  */
-public class MailFolderPage extends Page {
+public class MailFolderPage extends MailPage {
 
         @FindBy(xpath = "//input[@value='Nova Pasta']")
@@ -26 +25 @@
         @FindBy(xpath = "//input[@value='Renomear pasta']")
         private WebElement renameFolder;
+
+        @FindBy(xpath = "//input[@value='Fechar']")
+        private WebElement closeButton;
 
         public MailFolderPage(WebDriver driver) {
@@ -48 +50 @@
                 newFolder.sendKeys(folderName);
                 newFolder.accept();
+
+                super.waitLoading();
         }
 
@@ -61 +65 @@
                 this.driver.findElement(
                                 By.id("lINBOX/" + rootFolderName + "folders_tree")).click();
+                this.createFolder(subFolderName);
+        }
+
+        public void createLocalFolder(String subFolderName) {
+                this.driver.findElement(By.id("llocal_rootfolders_tree")).click();
                 this.createFolder(subFolderName);
         }
@@ -148 +157 @@
         }
 
+        public void closeWindow() {
+                this.closeButton.click();
+        }
+
 }

devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/pages/email/MailPage.java

@@ -11 +11 @@
 import org.openqa.selenium.support.FindBy;
 import org.openqa.selenium.support.PageFactory;
+import org.testng.Assert;
 
 /**
@@ -186 +187 @@
         private WebElement searchMessages;
 
+        @FindBy(id = "em_message_search")
+        private WebElement searchBox;
+
+        @FindBy(xpath = "//table[@id='folders_tbl']/tbody/tr[1]/td/table/tbody/tr[1]/td/a[1]")
+        private WebElement searchStart;
+
         /** Nome da pasta "Caixa de Entrada". */
         public static final String INBOX_FOLDER = "lINBOXtree_folders";
@@ -220 +227 @@
                 return PageFactory.initElements(driver, MailSearchPage.class);
 
+        }
+
+        public void setSearchBox(String text) {
+                this.searchBox.sendKeys(text);
+        }
+
+        public void searchStart() {
+                this.searchStart.click();
         }
 
@@ -342 +357 @@
                                 By.xpath("//div[@id='exmail_main_body']/div[2]/table/tbody/tr[2]/td/div[1]/table[1]/tbody/tr[1]/td[1]/span[@id='tt_d']/img"))
                                 .click();
+                this.waitLoading();
+                Alert alert = driver.switchTo().alert();
+                assert (message.equals(alert.getText()));
+                alert.accept();
+        }
+
+        protected void waitLoading() {
                 // Espera pelo "Carregando..." aparecer.
                 waitForElement(By.id("divProgressBar"));
@@ -348 +370 @@
                 isNotDisplayed(this
                                 .waitFindElement(By.id("divProgressBar"), 5000, 1000));
-                Alert alert = driver.switchTo().alert();
-                assert (message.equals(alert.getText()));
-                alert.accept();
         }
 
@@ -857 +876 @@
          */
         public void assertMessage(String message) {
-                assert message.equals(getDisplayedElementContent("em_div_write_msg"));
+                Assert.assertEquals(getDisplayedElementContent("em_div_write_msg"),
+                                message);
         }
 

devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/pages/email/MailPreferencesPage.java

@@ -13 +13 @@
  * 
  */
-public class ExpressoMailPreferencesPage extends Page {
+public class MailPreferencesPage extends Page {
 
         /** Utilizar nome (CN) ao invés de login (uid) em pastas compartilhadas? */
@@ -163 +163 @@
         private WebElement savePreferences;
 
-        public ExpressoMailPreferencesPage(WebDriver driver) {
+        public MailPreferencesPage(WebDriver driver) {
                 super(driver);
                 // TODO Auto-generated constructor stub