Author: vrockai
Date: 2009-06-08 09:42:36 -0400 (Mon, 08 Jun 2009)
New Revision: 13439
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java
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/portal/AdminPortalTestCase.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/EndtoEndPortalAdminTestCase.java
Log:
[selenium] - fixes for failing tests
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java 2009-06-05
15:17:37 UTC (rev 13438)
+++
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java 2009-06-08
13:42:36 UTC (rev 13439)
@@ -80,6 +80,8 @@
private final String LNK_ROLETAB = getLoc(casePfx + "lnk.roletab",
"//a[contains(@id,'user-temp-form:role-mgm-link')]");
private final String LNK_ROLEMAIN = getLoc(casePfx + "lnk.rolemain",
"//a[contains(@id, 'role-temp-form1:role-adm-link')]");
+ private final String LNK_ROLEMAIN2 = getLoc(casePfx + "lnk.rolemain2",
"//a[contains(@id, 'role-admin-link')]");
+
private final String LNK_USERMANG_MAIN = getLoc(casePfx + "lnk.usermang.main",
"//a[contains(@id,'user-temp-form1:assign-role-link')]");
private final String LNK_USERMANG_MAIN2 = getLoc(casePfx +
"lnk.usermang.main2",
"//a[contains(@id,'user-temp-form1:user-mgm-link')]");
private final String LNK_CREATE_USER = getLoc(casePfx + "lnk.create.user",
"//a[contains(@id,':user-form:create-user-link')]");
@@ -410,6 +412,7 @@
clickUntilMembers();
clickIfVisible(LNK_ROLETAB);
clickIfVisible(LNK_ROLEMAIN);
+ clickIfVisible(LNK_ROLEMAIN2);
int r = findTableRow(TBL_ROLELIST, roleName, 0);
selenium.click(MessageFormat.format(LNK_T_ROLLIST_MEMBERS, r - 1));
@@ -966,9 +969,10 @@
selenium.click(LNK_MEMBERS);
selenium.waitForPageToLoad(PAGE_LOAD);
- clickIfVisible(LNK_ROLETAB);
+ clickIfVisible(LNK_ROLETAB);
+ clickIfVisible(LNK_ROLEMAIN);
- clickIfVisible(LNK_ROLEMAIN);
+ clickIfVisible(LNK_ROLEMAIN2);
Assert.assertTrue(selenium.isTextPresent(roleName), "Role name is missing");
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 2009-06-05
15:17:37 UTC (rev 13438)
+++
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java 2009-06-08
13:42:36 UTC (rev 13439)
@@ -397,7 +397,7 @@
@Test(enabled = true)
public void testXssConsumerManage() {
String beaName = "XssBeaConsumer";
-
+
selenium.open("/portal/");
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=Admin");
@@ -423,34 +423,34 @@
selenium.type(INPUT_CONSWSDL, XSS_STR1);
selenium.click(SUBMIT_REFRESHSAVE);
selenium.waitForPageToLoad(PAGE_LOAD);
-
+
Assert.assertTrue(selenium.isTextPresent("Require a well-formed URL"));
-
+
selenium.type(INPUT_CACHEEXP, XSS_STR1);
selenium.type(INPUT_CONSWSDL,
"http://wsrp.bea.com:7001/producer/producer?WSDL");
selenium.click(SUBMIT_REFRESHSAVE);
selenium.waitForPageToLoad(PAGE_LOAD);
-
+
Assert.assertTrue(selenium.isTextPresent("must be a number between"));
-
+
selenium.type(INP_PRODID, XSS_STR1);
selenium.type(INPUT_CACHEEXP, "600");
selenium.type(INPUT_CONSWSDL,
"http://wsrp.bea.com:7001/producer/producer?WSDL");
selenium.click(SUBMIT_REFRESHSAVE);
selenium.waitForPageToLoad(PAGE_LOAD);
-
+
Assert.assertTrue(selenium.isTextPresent("is an invalid Consumer name"));
-
+
selenium.type(INP_PRODID, beaName);
selenium.type(INPUT_CACHEEXP, "600");
selenium.type(INPUT_CONSWSDL,
"http://wsrp.bea.com:7001/producer/producer?WSDL");
selenium.click(SUBMIT_REFRESHSAVE);
selenium.waitForPageToLoad(PAGE_LOAD);
-
+
selenium.type(INPUT_CONS_REGVALUE, XSS_STR1);
selenium.click(SUB_CONS_REGVAL);
selenium.waitForPageToLoad(PAGE_LOAD);
-
+
Assert.assertTrue(selenium.isTextPresent("An unexpected error occured"));
}
@@ -461,19 +461,16 @@
public void testXssProducerManage() {
goToProducers();
- selenium.type("_WSRPConfigurationPortletWindow:j_id24:producer-form:registrationPolicy",
XSS_STR1);
+ selenium.type("//input[contains(@id,'producer-form:registrationPolicy')]",
XSS_STR1);
selenium.click(SUB_PROD_SAVE);
selenium.waitForPageToLoad(PAGE_LOAD);
Assert.assertTrue(selenium.isTextPresent("Couldn't find policy class"));
- // goToProducers();
- // selenium.type(
- // "_WSRPConfigurationPortletWindow:j_id24:producer-form:validator"
- // ,XSS_STR1);
- // selenium.click(SUB_PROD_SAVE);
- // selenium.waitForPageToLoad(PAGE_LOAD);
- //Assert.assertTrue(selenium.isTextPresent("Couldn't find policy class")
- // );
+ goToProducers();
+ selenium.type("//input[contains(@id,'producer-form:validator')]",
XSS_STR1);
+ selenium.click(SUB_PROD_SAVE);
+ selenium.waitForPageToLoad(PAGE_LOAD);
+ Assert.assertTrue(selenium.isTextPresent("Couldn't find policy class"));
// properties
selenium.open("/portal/");
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-05
15:17:37 UTC (rev 13438)
+++
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java 2009-06-08
13:42:36 UTC (rev 13439)
@@ -1107,16 +1107,10 @@
selenium.click(MessageFormat.format(POR_TL_MAIN, r));
selenium.waitForPageToLoad(PAGE_LOAD);
- selenium.type(INP_PP_RES_INPUT, XSS_STR1);
- selenium.click(SUB_PP_ERROR_FORM_UPDATE);
+ selenium.type(INPUT_PAGENAME, XSS_STR1);
+ selenium.click(INPUT_SUBMIT_PAGECREATE);
selenium.waitForPageToLoad(PAGE_LOAD);
-
- Assert.assertTrue(selenium.isTextPresent("is an invalid page name"));
- selenium.type(INP_PPA_RES_SELECT, XSS_STR1);
- selenium.click(SUB_PPA_FORM_UPDATE);
- selenium.waitForPageToLoad(PAGE_LOAD);
-
Assert.assertTrue(selenium.isTextPresent("is an invalid page name"));
}
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/EndtoEndPortalAdminTestCase.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/EndtoEndPortalAdminTestCase.java 2009-06-05
15:17:37 UTC (rev 13438)
+++
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/EndtoEndPortalAdminTestCase.java 2009-06-08
13:42:36 UTC (rev 13439)
@@ -271,11 +271,12 @@
r = findTableRow(TAB_PROPERTIES, "dragadrop", 0) - 1;
Assert.assertTrue(r > -1, "Previously added property drag&drop not found in
the property table");
- // - add partial refresh prop
+ // - add custom partial refresh prop
selenium.type(INP_POR_PROPERTY, "partialRef");
selenium.click(SUB_POR_PROPERTY);
selenium.waitForPageToLoad(PAGE_LOAD);
-
+
+ // set it's value
r = findTableRow(TAB_PROPERTIES, "partialRef", 0) - 1;
selenium.type(MessageFormat.format(TAB_PROP_VAL, r), "partialicek");
selenium.click(SUB_POR_PROPS_UPDATE);
@@ -283,10 +284,12 @@
goToProperties();
// - assert partial refresh is added
- r = findTableRow(TAB_PROPERTIES, "partialRef", 0) - 1;
+ r = findTableRow(TAB_PROPERTIES, "partialRef", 0) - 1;
+
Assert.assertTrue(r > -1, "Previously added property partial refresh not found
in the property table");
- r = findTableRow(TAB_PROPERTIES, "partialicek", 0) - 1;
- Assert.assertTrue(r > -1, "Previously added property partial refresh not found
in the property table");
+
+ String propVal = selenium.getValue(MessageFormat.format(TAB_PROP_VAL,r));
+ Assert.assertEquals(propVal,"partialicek", "Previously added property
partial refresh not found in the property table");
// - delete d&d prop
r = findTableRow(TAB_PROPERTIES, "dragadrop", 0) - 1;