Author: vrockai Date: 2009-06-22 05:57:57 -0400 (Mon, 22 Jun 2009) New Revision: 13474 Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/assert.properties branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileTestCase.java Log: [selnium] - some assert message fixes Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/assert.properties =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/assert.properties 2009-06-19 15:14:33 UTC (rev 13473) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/assert.properties 2009-06-22 09:57:57 UTC (rev 13474) @@ -9,6 +9,10 @@ iden.man.chk.role=Create new role cms.sec.denied=You are not allowed to access the resource +cms.dir.msg.inv.desc=A value below was invalid +cms.file.msg.val.invalid.filename=A value below was invalid +cms.file.msg.val.invalid.title=A value below was invalid +cms.file.msg.val.invalid.desc=A value below was invalid samples.ajax.p3.l3=$256.00 samples.ajax.p3.l2=SANTA CRUZ ALLSTAR 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 2009-06-19 15:14:33 UTC (rev 13473) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileTestCase.java 2009-06-22 09:57:57 UTC (rev 13474) @@ -19,9 +19,9 @@ /** prefix for locator properties = cms.file. */ private final String casePfx = "cms.file."; - private final String MSG_VAL_INVALID_FILENAME = getMess("msg.val.invalid.filename","A value below is invalid"); - private final String MSG_VAL_INVALID_DESC = getMess("msg.val.invalid.desc","A value below is invalid"); - private final String MSG_VAL_INVALID_TITLE = getMess("msg.val.invalid.title","A value below is invalid"); + private final String MSG_VAL_INVALID_FILENAME = getMess(casePfx +"msg.val.invalid.filename","A value belw is invalid"); + private final String MSG_VAL_INVALID_DESC = getMess(casePfx +"msg.val.invalid.desc","A value below is invalid"); + private final String MSG_VAL_INVALID_TITLE = getMess(casePfx +"msg.val.invalid.title","A value below is invalid"); private final String SEL_ACTION = getLoc(casePfx + "sel.action","//div[@id='center']/div/div/div[1]/div/select"); private final String INP_FC_SAVE = getLoc(casePfx + "inp.fc.save","save"); private final String INP_FC_LANGUAGE = getLoc(casePfx + "inp.fc.language","language"); @@ -204,7 +204,7 @@ selenium.select(INP_FC_LANGUAGE, "label=Czech"); selenium.click(INP_FC_SAVE); selenium.waitForPageToLoad(PAGE_LOAD); - + System.out.println("!"+MSG_VAL_INVALID_FILENAME); Assert.assertTrue(selenium.isTextPresent(MSG_VAL_INVALID_FILENAME), "Input validation for filename is missing."); selenium.type(INP_FC_FILENAME, "newFile"); @@ -436,19 +436,24 @@ selenium.click("link=CMS"); selenium.waitForPageToLoad(PAGE_LOAD); - - selenium.select("//div[@id='center']/div/div/div[3]/table/tbody/tr[3]/td[2]/form/select", "label=Delete"); - selenium.click("//div[@id='center']/div/div/div[3]/table/tbody/tr[3]/td[2]/form/select/option[4]"); - selenium.click("//div[@id='center']/div/div/div[3]/table/tbody/tr[3]/td[2]/form/input"); + + int r = findTableRow(TBL_CMS_FILE, "newFile", 0) + 1; + + selenium.select("//div[@id='center']/div/div/div[3]/table/tbody/tr["+r+"]/td[2]/form/select", "label=Delete"); + selenium.click("//div[@id='center']/div/div/div[3]/table/tbody/tr["+r+"]/td[2]/form/select/option[4]"); + selenium.click("//div[@id='center']/div/div/div[3]/table/tbody/tr["+r+"]/td[2]/form/input"); selenium.waitForPageToLoad(PAGE_LOAD); Assert.assertTrue(selenium.isTextPresent("Confirm Deletion of /newFile")); 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?")); selenium.click("cancel"); selenium.waitForPageToLoad(PAGE_LOAD); - selenium.select("//div[@id='center']/div/div/div[3]/table/tbody/tr[3]/td[2]/form/select", "label=Delete"); - selenium.click("//div[@id='center']/div/div/div[3]/table/tbody/tr[3]/td[2]/form/select/option[4]"); - selenium.click("//div[@id='center']/div/div/div[3]/table/tbody/tr[3]/td[2]/form/input"); + + r = findTableRow(TBL_CMS_FILE, "newFile", 0) + 1; + + selenium.select("//div[@id='center']/div/div/div[3]/table/tbody/tr["+r+"]/td[2]/form/select", "label=Delete"); + selenium.click("//div[@id='center']/div/div/div[3]/table/tbody/tr["+r+"]/td[2]/form/select/option[4]"); + selenium.click("//div[@id='center']/div/div/div[3]/table/tbody/tr["+r+"]/td[2]/form/input"); selenium.waitForPageToLoad(PAGE_LOAD); Assert.assertTrue(selenium.isTextPresent("Confirm Deletion of /newFile")); Assert.assertTrue(selenium.isTextPresent("WARNING! You will not be able to undo these change!")); @@ -499,9 +504,11 @@ selenium.click("link=CMS"); selenium.waitForPageToLoad(PAGE_LOAD); - selenium.select("//div[@id='center']/div/div/div[3]/table/tbody/tr[3]/td[2]/form/select", "label=Delete"); - selenium.click("//div[@id='center']/div/div/div[3]/table/tbody/tr[3]/td[2]/form/select/option[4]"); - selenium.click("//div[@id='center']/div/div/div[3]/table/tbody/tr[3]/td[2]/form/input"); + int r = findTableRow(TBL_CMS_FILE, name, 0) + 1; + + selenium.select("//div[@id='center']/div/div/div[3]/table/tbody/tr["+r+"]/td[2]/form/select", "label=Delete"); + selenium.click("//div[@id='center']/div/div/div[3]/table/tbody/tr["+r+"]/td[2]/form/select/option[4]"); + selenium.click("//div[@id='center']/div/div/div[3]/table/tbody/tr["+r+"]/td[2]/form/input"); selenium.waitForPageToLoad(PAGE_LOAD); Assert.assertTrue(selenium.isTextPresent("Confirm Deletion of /" + name)); Assert.assertTrue(selenium.isTextPresent("WARNING! You will not be able to undo these change!"));