Author: vrockai
Date: 2008-10-30 09:39:03 -0400 (Thu, 30 Oct 2008)
New Revision: 12217
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileTestCase.java
Log:
cms file testcase fix
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java 2008-10-30
13:12:03 UTC (rev 12216)
+++
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java 2008-10-30
13:39:03 UTC (rev 12217)
@@ -199,14 +199,14 @@
clickIfVisible(ID_LINK_CONSCONF);
clickIfVisible(LINK_CONSUMER_HOME);
Assert.assertTrue(selenium.isTextPresent("BEAdel"));
- selenium.captureScreenshot("tabletable");
+
Assert.assertTrue(selenium.isElementPresent(WSRP_CONSUMER_TABLE),"Consumer table
not available.");
int r = findTableRow(WSRP_CONSUMER_TABLE, "BEAdel", 0)-1;
Assert.assertFalse(r < 0,"Consumer BEAdel not found");
selenium.click(MessageFormat.format(LINK_T_CONS_DEL,r));
selenium.waitForPageToLoad(PAGE_LOAD);
- selenium.captureScreenshot("delete");
+
Assert.assertTrue(selenium.isTextPresent("Delete 'BEAdel'
consumer?"));
clickAndWait(SUBMIT_CONSDEL_CONF);
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileTestCase.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileTestCase.java 2008-10-30
13:12:03 UTC (rev 12216)
+++
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileTestCase.java 2008-10-30
13:39:03 UTC (rev 12217)
@@ -13,6 +13,7 @@
@Test(groups = { "cms_file" }, enabled = true)
public class CMSFileTestCase extends JBossPortalSeleniumTestCase {
+ private static final String TBL_CMS_FILEVER =
"//div[@id='center']/div/div/table";
public static final String TBL_CMS_FILE =
"//div[@id='center']/div/div/div[3]/table";
public static final String TBL_FILE_PENDING =
"//div[@id='center']/div/div/table[2]";
@@ -52,7 +53,7 @@
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=images");
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isElementPresent("link=logo.gif"));
+ Assert.assertTrue(selenium.isElementPresent("link=jbosslogo.png"));
}
@Test(enabled = true, description = "File properties checking.")
@@ -110,19 +111,22 @@
selenium.select("language", "label=Czech");
selenium.click("save");
selenium.waitForPageToLoad(PAGE_LOAD);
-
+ /*
Assert.assertTrue(selenium.isElementPresent(TBL_FILE_PENDING));
Assert.assertTrue(findTableRow(TBL_FILE_PENDING, "text/plain", 0) >= 0);
Assert.assertTrue(findTableRow(TBL_FILE_PENDING, "0kb", 1) >= 0);
//Assert.assertTrue(findTableRow(CMS_FILE_PENDING_TABLE, "admin", 3) >=
0);
-
+
selenium.click("link=Approve");
selenium.waitForPageToLoad(PAGE_LOAD);
+ */
+
Assert.assertEquals("Czech", selenium.getText("link=Czech"));
- Assert.assertEquals("text/plain",
selenium.getText("link=text/plain"));
- Assert.assertEquals("1.1",
selenium.getText("//div[@id='center']/div/div/table/tbody/tr[4]/td[3]"));
- Assert.assertEquals("0kb",
selenium.getText("//div[@id='center']/div/div/table/tbody/tr[4]/td[2]"));
- Assert.assertEquals("newFile title",
selenium.getText("//div[@id='center']/div/div/table/tbody/tr[4]/td[6]"));
+ Assert.assertTrue(findTableRow(TBL_CMS_FILEVER, "text/plain", 0)>=0);
+ Assert.assertTrue(findTableRow(TBL_CMS_FILEVER, "0kb", 1)>=0);
+ Assert.assertTrue(findTableRow(TBL_CMS_FILEVER, "1.0", 2)>=0);
+ Assert.assertTrue(findTableRow(TBL_CMS_FILEVER, "newFile title", 5)>=0);
+
selenium.click("link=Home");
selenium.waitForPageToLoad(PAGE_LOAD);
Assert.assertEquals("newFile", selenium.getText("link=newFile"));
@@ -146,7 +150,7 @@
selenium.click("save");
selenium.waitForPageToLoad(PAGE_LOAD);
- int row = findTableRow("//div[@id='center']/div/div/table",
"1.0", 2)+1;
+ int row = findTableRow(TBL_CMS_FILEVER, "1.0", 2)+1;
Assert.assertEquals("Czech", selenium.getText("link=Czech"));
Assert.assertEquals("text/plain",
selenium.getText("link=text/plain"));
@@ -218,7 +222,7 @@
Assert.assertEquals("text/plain",
selenium.getText("link=text/plain"));
Assert.assertEquals("1.0",
selenium.getText("//div[@id='center']/div/div/table/tbody/tr[4]/td[3]"));
Assert.assertEquals("0kb",
selenium.getText("//div[@id='center']/div/div/table/tbody/tr[4]/td[2]"));
- Assert.assertEquals("fileToMove title",
selenium.getText("//div[@id='center']/div/div/table/tbody/tr[4]/td[5]"));
+ Assert.assertEquals("fileToMove title",
selenium.getText("//div[@id='center']/div/div/table/tbody/tr[4]/td[6]"));
selenium.click("link=Home");
selenium.waitForPageToLoad(PAGE_LOAD);
Assert.assertEquals("fileToMove",
selenium.getText("link=fileToMove"));
@@ -259,7 +263,7 @@
selenium.click("save");
selenium.waitForPageToLoad(PAGE_LOAD);
- int row = findTableRow("//div[@id='center']/div/div/table",
"1.0", 2)+1;
+ int row = findTableRow(TBL_CMS_FILEVER, "1.0", 2)+1;
Assert.assertEquals("Czech", selenium.getText("link=Czech"));
Assert.assertEquals("text/plain",
selenium.getText("link=text/plain"));