Author: vrockai
Date: 2009-06-22 09:07:03 -0400 (Mon, 22 Jun 2009)
New Revision: 13475
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSDirectoryTestCase.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileUploadTestCase.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java
Log:
[selenium] - some assert messages added
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSDirectoryTestCase.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSDirectoryTestCase.java 2009-06-22
09:57:57 UTC (rev 13474)
+++
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSDirectoryTestCase.java 2009-06-22
13:07:03 UTC (rev 13475)
@@ -98,7 +98,7 @@
Assert.assertEquals(tempDirName,
selenium.getText("//div[@id='center']/div/div/ul/li[3]"));
selenium.click("link=Home");
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isElementPresent("link=" + tempDirName));
+ Assert.assertTrue(selenium.isElementPresent("link=" +
tempDirName),"Created directory link not found.");
}
@@ -174,16 +174,16 @@
goToCms();
- Assert.assertTrue(selenium.isElementPresent("link=" + tempDirName));
+ Assert.assertTrue(selenium.isElementPresent("link=" + tempDirName),"temp
directory link not found.");
selenium.select(takeAction(tempDirName) + "/select",
"label=Delete");
selenium.click(takeAction(tempDirName) + "/select/option[4]");
selenium.click(takeAction(tempDirName) + "/input");
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isTextPresent("Confirm Deletion of /" +
tempDirName));
- Assert.assertTrue(selenium.isTextPresent("WARNING! You will not be able to undo
these change!"));
- Assert.assertTrue(selenium.isTextPresent("Are you sure you want to delete this
resource?"));
+ Assert.assertTrue(selenium.isTextPresent("Confirm Deletion of /" +
tempDirName),"confirmation message not present");
+ Assert.assertTrue(selenium.isTextPresent("WARNING! You will not be able to undo
these change!"),"confirmation message not present");
+ Assert.assertTrue(selenium.isTextPresent("Are you sure you want to delete this
resource?"),"confirmation message not present");
selenium.click(INP_DIR_CANCEL);
selenium.waitForPageToLoad(PAGE_LOAD);
@@ -192,16 +192,16 @@
selenium.waitForPageToLoad(PAGE_LOAD);
goToCms();
- Assert.assertTrue(selenium.isElementPresent("link=" + tempDirName));
+ Assert.assertTrue(selenium.isElementPresent("link=" + tempDirName),"temp
directory link not found.");
selenium.select(takeAction(tempDirName) + "/select",
"label=Delete");
selenium.click(takeAction(tempDirName) + "/select/option[4]");
selenium.click(takeAction(tempDirName) + "/input");
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isTextPresent("Confirm Deletion of /" +
tempDirName));
- Assert.assertTrue(selenium.isTextPresent("WARNING! You will not be able to undo
these change!"));
- Assert.assertTrue(selenium.isTextPresent("Are you sure you want to delete this
resource?"));
+ Assert.assertTrue(selenium.isTextPresent("Confirm Deletion of /" +
tempDirName),"confirmation message not present");
+ Assert.assertTrue(selenium.isTextPresent("WARNING! You will not be able to undo
these change!"),"confirmation message not present");
+ Assert.assertTrue(selenium.isTextPresent("Are you sure you want to delete this
resource?"),"confirmation message not present");
selenium.click(INP_DIR_SUB);
selenium.waitForPageToLoad(PAGE_LOAD);
@@ -227,9 +227,9 @@
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.waitForPopUp("_top", PAGE_LOAD);
- Assert.assertTrue(selenium.isElementPresent(INP_DIR_NAME));
- Assert.assertTrue(selenium.isElementPresent(INP_DIR_DESC));
- Assert.assertEquals("Confirm Directory Creation",
selenium.getText("//div[@id='center']/div/h3"));
+ Assert.assertTrue(selenium.isElementPresent(INP_DIR_NAME),"directory name input
not found");
+ Assert.assertTrue(selenium.isElementPresent(INP_DIR_DESC),"directory description
input not found");
+ Assert.assertEquals("Confirm Directory Creation",
selenium.getText("//div[@id='center']/div/h3"),"confirmation
message not found");
selenium.type(INP_DIR_NAME, copyDirName);
selenium.type(INP_DIR_DESC, "source folder for copy");
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileUploadTestCase.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileUploadTestCase.java 2009-06-22
09:57:57 UTC (rev 13474)
+++
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileUploadTestCase.java 2009-06-22
13:07:03 UTC (rev 13475)
@@ -123,7 +123,7 @@
* selenium.waitForPageToLoad(PAGE_LOAD);
*/
Assert.assertEquals(selenium.getText("//div[@id='center']/div/div/ul/li[3]"),
"testFile.txt");
- Assert.assertTrue(selenium.isElementPresent("link=text/plain"));
+ Assert.assertTrue(selenium.isElementPresent("link=text/plain"),"file
type string not found.");
Assert.assertTrue(selenium.isElementPresent("//div[@id='center']/div/div/table/tbody/tr[4]/td[3]"));
Assert.assertEquals(selenium.getText("//div[@id='center']/div/div/table/tbody/tr[4]/td[6]"),
"file to upload");
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java 2009-06-22
09:57:57 UTC (rev 13474)
+++
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java 2009-06-22
13:07:03 UTC (rev 13475)
@@ -192,17 +192,17 @@
selenium.waitForPageToLoad(PAGE_LOAD);
debugScreenshot("pa" + ".jpg");
- Assert.assertTrue(selenium.isTextPresent(portalName));
+ Assert.assertTrue(selenium.isTextPresent(portalName),"portal name not
found");
int r = findTableRow(TABLE_PORTAL_ADMIN, portalName, 0) - 1;
debugPrint(portalName + " : " + r);
- Assert.assertTrue(selenium.isElementPresent(MessageFormat.format(POR_TL_MAIN, r)));
- Assert.assertTrue(selenium.isElementPresent(MessageFormat.format(POR_TL_SECURITY,
r)));
- Assert.assertTrue(selenium.isElementPresent(MessageFormat.format(POR_TL_PROPERTIES,
r)));
- Assert.assertTrue(selenium.isElementPresent(MessageFormat.format(POR_TL_MAKEDEF, r)));
- Assert.assertTrue(selenium.isElementPresent(MessageFormat.format(POR_TL_RENAME, r)));
- Assert.assertTrue(selenium.isElementPresent(MessageFormat.format(POR_TL_THEME, r)));
+ Assert.assertTrue(selenium.isElementPresent(MessageFormat.format(POR_TL_MAIN,
r)),"portal button main not found");
+ Assert.assertTrue(selenium.isElementPresent(MessageFormat.format(POR_TL_SECURITY,
r)),"portal button security not found");
+ Assert.assertTrue(selenium.isElementPresent(MessageFormat.format(POR_TL_PROPERTIES,
r)),"portal button properties not found");
+ Assert.assertTrue(selenium.isElementPresent(MessageFormat.format(POR_TL_MAKEDEF,
r)),"portal button not make default found");
+ Assert.assertTrue(selenium.isElementPresent(MessageFormat.format(POR_TL_RENAME,
r)),"portal button rename not found");
+ Assert.assertTrue(selenium.isElementPresent(MessageFormat.format(POR_TL_THEME,
r)),"portal button theme not found");
}
/**
@@ -239,7 +239,7 @@
clickIfVisible(LINK_PORTALS_ID);
final String portalToRename = "TestRenPortal";
- Assert.assertTrue(selenium.isTextPresent(portalToRename));
+ Assert.assertTrue(selenium.isTextPresent(portalToRename), "portal name not
found");
final String portalRenamed = "AestPortal";
Assert.assertFalse(selenium.isTextPresent(portalRenamed), "Not renamed page
already exist.");
@@ -252,8 +252,8 @@
selenium.click(SUBMIT_RENAME_PORTAL);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertFalse(selenium.isTextPresent(portalToRename));
- Assert.assertTrue(selenium.isTextPresent(portalRenamed));
+ Assert.assertFalse(selenium.isTextPresent(portalToRename), "portal name was
found");
+ Assert.assertTrue(selenium.isTextPresent(portalRenamed), "portal name not
found");
}
/**
@@ -293,15 +293,15 @@
selenium.click(INPUT_SUBMIT_CREATEPORTAL);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isTextPresent(portalToDelete));
+ Assert.assertTrue(selenium.isTextPresent(portalToDelete), "portal name not
found");
int r = findTableRow(TABLE_PORTAL_ADMIN, portalToDelete, 0) - 1;
selenium.click(MessageFormat.format(POR_TL_DELETE, r));
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isTextPresent("WARNING! You are about to delete the
" + portalToDelete + " portal from the context!"));
- Assert.assertTrue(selenium.isTextPresent("Delete portal"));
- Assert.assertTrue(selenium.isTextPresent("Are you sure you want to delete this
portal?"));
+ Assert.assertTrue(selenium.isTextPresent("WARNING! You are about to delete the
" + portalToDelete + " portal from the context!"), "confirmation
message is missing.");
+ Assert.assertTrue(selenium.isTextPresent("Delete portal"), "confirmation
message is missing.");
+ Assert.assertTrue(selenium.isTextPresent("Are you sure you want to delete this
portal?"), "confirmation message is missing.");
selenium.click(SUBMIT_DELETE_PORTAL_CONF);
selenium.waitForPageToLoad(PAGE_LOAD);
// Assert.assertTrue(selenium.isTextPresent(
@@ -309,7 +309,7 @@
clickIfVisible("link=Admin");
clickIfVisible(TAB_PORTALOBJ_ID);
- Assert.assertFalse(selenium.isTextPresent(portalToDelete));
+ Assert.assertFalse(selenium.isTextPresent(portalToDelete), "deleted portal name
was found");
}
@@ -356,7 +356,7 @@
selenium.click(INPUT_SUBMIT_CREATEPORTAL);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isTextPresent(portalName));
+ Assert.assertTrue(selenium.isTextPresent(portalName), "portal name not
found");
int r = findTableRow(TABLE_PORTAL_ADMIN, portalName, 0) - 1;
@@ -473,7 +473,7 @@
selenium.click(INPUT_SUBMIT_CREATEPORTAL);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isTextPresent(portalName));
+ Assert.assertTrue(selenium.isTextPresent(portalName), "portal name not
found");
r = findTableRow(TABLE_PORTAL_ADMIN, portalName, 0) - 1;
@@ -489,12 +489,12 @@
r = findTableRow(TBL_PP_PROPS, propName2, 0) - 1;
Assert.assertEquals(selenium.getValue(MessageFormat.format(INP_PP_PROP_VAL, r)),
propVal2, "previously changed value other than expected");
- Assert.assertFalse(selenium.isChecked(CHK_PP_UNAVAIL_CHECK));
- Assert.assertFalse(selenium.isChecked(CHK_PP_ACCESS_CHECK));
- Assert.assertFalse(selenium.isChecked(CHK_PP_ERROR_CHECK));
- Assert.assertFalse(selenium.isChecked(CHK_PP_INTERNAL_CHECK));
- Assert.assertFalse(selenium.isChecked(CHK_PP_NF_CHECK));
- Assert.assertFalse(selenium.isChecked(CHK_PP_RES_CHECK));
+ Assert.assertFalse(selenium.isChecked(CHK_PP_UNAVAIL_CHECK),"CHK_PP_UNAVAIL_CHECK
was not checked");
+ Assert.assertFalse(selenium.isChecked(CHK_PP_ACCESS_CHECK),"CHK_PP_ACCESS_CHECK
was not checked");
+ Assert.assertFalse(selenium.isChecked(CHK_PP_ERROR_CHECK),"CHK_PP_ERROR_CHECK was
not checked");
+ Assert.assertFalse(selenium.isChecked(CHK_PP_INTERNAL_CHECK),"CHK_PP_INTERNAL_CHECK
was not checked");
+ Assert.assertFalse(selenium.isChecked(CHK_PP_NF_CHECK),"CHK_PP_NF_CHECK was not
checked");
+ Assert.assertFalse(selenium.isChecked(CHK_PP_RES_CHECK),"CHK_PP_RES_CHECK was not
checked");
Assert.assertEquals(selenium.getSelectedLabel(SEL_PP_ACCESS_SELECT), "Redirect to
the specified resource");
Assert.assertEquals(selenium.getSelectedLabel(SEL_PP_UNAVAIL_SELECT), "Redirect to
the specified resource");
Assert.assertEquals(selenium.getSelectedLabel(SEL_PP_ERROR_SELECT), "Display the
default error message");
@@ -502,12 +502,12 @@
Assert.assertEquals(selenium.getSelectedLabel(SEL_PP_NF_SELECT), "Redirect to the
specified resource");
Assert.assertEquals(selenium.getValue(INP_PP_RES_INPUT),
"/WEB-INF/jsp/error/portalx.jsp");
- Assert.assertFalse(selenium.isChecked(CHK_PPA_ACCESS_CHECK));
- Assert.assertFalse(selenium.isChecked(CHK_PPA_CONTROL_CHECK));
- Assert.assertFalse(selenium.isChecked(CHK_PPA_ERROR_CHECK));
- Assert.assertFalse(selenium.isChecked(CHK_PPA_INTERNAL_CHECK));
- Assert.assertFalse(selenium.isChecked(CHK_PPA_NF_CHECK));
- Assert.assertFalse(selenium.isChecked(CHK_PPA_RES_CHECK));
+ Assert.assertFalse(selenium.isChecked(CHK_PPA_ACCESS_CHECK),"CHK_PPA_ACCESS_CHECK
was not checked");
+ Assert.assertFalse(selenium.isChecked(CHK_PPA_CONTROL_CHECK),"CHK_PPA_CONTROL_CHECK
was not checked");
+ Assert.assertFalse(selenium.isChecked(CHK_PPA_ERROR_CHECK),"CHK_PPA_ERROR_CHECK
was not checked");
+ Assert.assertFalse(selenium.isChecked(CHK_PPA_INTERNAL_CHECK),"CHK_PPA_INTERNAL_CHECK
was not checked");
+ Assert.assertFalse(selenium.isChecked(CHK_PPA_NF_CHECK),"CHK_PPA_NF_CHECK was not
checked");
+ Assert.assertFalse(selenium.isChecked(CHK_PPA_RES_CHECK),"CHK_PPA_RES_CHECK was
not checked");
Assert.assertEquals(selenium.getSelectedLabel(SEL_PPA_ACCESS_SELECT), "Redirect to
the specified resource");
Assert.assertEquals(selenium.getSelectedLabel(SEL_PPA_CONTROL_SELECT), "Redirect
to the specified resource");
Assert.assertEquals(selenium.getSelectedLabel(SEL_PPA_ERROR_SELECT), "Display the
default error message");
@@ -548,12 +548,12 @@
selenium.waitForPageToLoad(PAGE_LOAD);
Assert.assertFalse(selenium.isTextPresent(portalPage), "Portal page already
present");
- Assert.assertTrue(selenium.isTextPresent("Create a page named:"));
+ Assert.assertTrue(selenium.isTextPresent("Create a page named:"),
"create page string not found");
selenium.type(INPUT_PAGENAME, portalPage);
selenium.click(INPUT_SUBMIT_PAGECREATE);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isTextPresent(portalPage));
+ Assert.assertTrue(selenium.isTextPresent(portalPage), "portal name not
found");
}
/**
@@ -594,9 +594,9 @@
selenium.click(MessageFormat.format(PAG_TL_DELETE, r));
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isTextPresent("Delete page"));
- Assert.assertTrue(selenium.isTextPresent("WARNING! You are about to delete the
" + portalPage + " page from the " + portalName + " portal! "));
- Assert.assertTrue(selenium.isTextPresent("Are you sure you want to delete this
page?"));
+ Assert.assertTrue(selenium.isTextPresent("Delete page"),"confirmation
message not found");
+ Assert.assertTrue(selenium.isTextPresent("WARNING! You are about to delete the
" + portalPage + " page from the " + portalName + " portal!
"),"confirmation message not found");
+ Assert.assertTrue(selenium.isTextPresent("Are you sure you want to delete this
page?"),"confirmation message not found");
}
@@ -645,10 +645,10 @@
selenium.click(SUB_LAYOUT_ADD_CENTER);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isTextPresent(windowName));
+ Assert.assertTrue(selenium.isTextPresent(windowName),"window name not
found");
selenium.open("/portal/auth/portal/mimikry");
- Assert.assertTrue(selenium.isTextPresent("Current users"));
+ Assert.assertTrue(selenium.isTextPresent("Current users"),"current users
string not found");
}
@@ -679,7 +679,7 @@
clickIfVisible(TAB_PORTALOBJ_ID);
clickIfVisible(LINK_PORTALS_ID);
clickIfVisible(LINK_PORTAL_HOME);
- Assert.assertTrue(selenium.isTextPresent("Create a portal named:"));
+ Assert.assertTrue(selenium.isTextPresent("Create a portal
named:"),"create portal string not found");
int r = findTableRow(TABLE_PORTAL_ADMIN, portalName, 0) - 1;
clickAndWait(MessageFormat.format(POR_TL_MAIN, r));
@@ -749,7 +749,7 @@
clickIfVisible(TAB_PORTALOBJ_ID);
clickIfVisible(LINK_PORTALS_ID);
clickIfVisible(LINK_PORTAL_HOME);
- Assert.assertTrue(selenium.isTextPresent("Create a portal named:"));
+ Assert.assertTrue(selenium.isTextPresent("Create a portal
named:"),"create portal string not found");
int r = findTableRow(TABLE_PORTAL_ADMIN, portalName, 0) - 1;
clickAndWait(MessageFormat.format(POR_TL_MAIN, r));
@@ -796,7 +796,7 @@
clickIfVisible(TAB_PORTALOBJ_ID);
clickIfVisible(LINK_PORTALS_ID);
clickIfVisible(LINK_PORTAL_HOME);
- Assert.assertTrue(selenium.isTextPresent("Create a portal named:"));
+ Assert.assertTrue(selenium.isTextPresent("Create a portal named:"),
"create portal string not found");
r = findTableRow(TABLE_PORTAL_ADMIN, portalName, 0) - 1;
clickAndWait(MessageFormat.format(POR_TL_MAIN, r));
@@ -843,7 +843,7 @@
clickIfVisible(TAB_PORTALOBJ_ID);
clickIfVisible(LINK_PORTALS_ID);
clickIfVisible(LINK_PORTAL_HOME);
- Assert.assertTrue(selenium.isTextPresent("Create a portal named:"));
+ Assert.assertTrue(selenium.isTextPresent("Create a portal
named:"),"create portal string not found");
r = findTableRow(TABLE_PORTAL_ADMIN, portalName, 0) - 1;
clickAndWait(MessageFormat.format(POR_TL_MAIN, r));
@@ -891,16 +891,16 @@
clickIfVisible(TAB_PORTALOBJ_ID);
clickIfVisible(LINK_PORTALS_ID);
clickIfVisible(LINK_PORTAL_HOME);
- Assert.assertTrue(selenium.isTextPresent("Create a portal named:"));
+ Assert.assertTrue(selenium.isTextPresent("Create a portal
named:"),"create portal string not found");
int r = findTableRow(TABLE_PORTAL_ADMIN, portalName, 0) - 1;
clickAndWait(MessageFormat.format(POR_TL_MAIN, r));
r = findTableRow(TABLE_PORTALPAGE_ADMIN, pageName, 0) - 1;
clickAndWait(MessageFormat.format(PAG_TL_THEME, r));
- Assert.assertEquals("default", selenium.getSelectedLabel(PAG_THE_LAY));
- Assert.assertEquals("default", selenium.getSelectedLabel(PAG_THE_THE));
- Assert.assertEquals("default", selenium.getSelectedLabel(PAG_THE_REN));
+ Assert.assertEquals("default",
selenium.getSelectedLabel(PAG_THE_LAY),"PAG_THE_LAY wrong label is selected");
+ Assert.assertEquals("default",
selenium.getSelectedLabel(PAG_THE_THE),"PAG_THE_THE wrong label is selected");
+ Assert.assertEquals("default",
selenium.getSelectedLabel(PAG_THE_REN),"PAG_THE_REN wrong label is selected");
selenium.select(PAG_THE_LAY, "label=3columns");
selenium.select(PAG_THE_THE, "label=maple");
@@ -916,9 +916,9 @@
r = findTableRow(TABLE_PORTALPAGE_ADMIN, pageName, 0) - 1;
clickAndWait(MessageFormat.format(PAG_TL_THEME, r));
- Assert.assertEquals("default", selenium.getSelectedLabel(PAG_THE_LAY));
- Assert.assertEquals("default", selenium.getSelectedLabel(PAG_THE_THE));
- Assert.assertEquals("default", selenium.getSelectedLabel(PAG_THE_REN));
+ Assert.assertEquals("default",
selenium.getSelectedLabel(PAG_THE_LAY),"PAG_THE_LAY wrong label is selected");
+ Assert.assertEquals("default",
selenium.getSelectedLabel(PAG_THE_THE),"PAG_THE_THE wrong label is selected");
+ Assert.assertEquals("default",
selenium.getSelectedLabel(PAG_THE_REN),"PAG_THE_REN wrong label is selected");
selenium.select(PAG_THE_LAY, "label=3columns");
selenium.select(PAG_THE_THE, "label=maple");
selenium.select(PAG_THE_REN, "label=emptyRenderer");