6:48 a.m.
Author: vrockai
Date: 2009-06-25 07:48:06 -0400 (Thu, 25 Jun 2009)
New Revision: 13499
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/CoordinationSamplesFullTestCase.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/CoordinationSamplesTestCase.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/EndToEndBeaPortlet.java
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/JBossPortalSeleniumTestCase.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/PortletUserCreationTestCase.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/UserLoginTestCase.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/cms/CMSDirectoryTestCase.java
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/CMSFileWorkflowTestCase.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileWorkflowUploadTestCase.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSSecureTestCase.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/locator.properties
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/DashboardsTestCase.java
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/PageCoordinationTestCase.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletDefinitionsTestCase.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java
Log:
[selenium] - many assert descriptions
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/CoordinationSamplesFullTestCase.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/CoordinationSamplesFullTestCase.java 2009-06-24
23:28:48 UTC (rev 13498)
+++
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/CoordinationSamplesFullTestCase.java 2009-06-25
11:48:06 UTC (rev 13499)
@@ -102,6 +102,10 @@
Assert.assertTrue(selenium.getLocation().endsWith("/portal/portal/default/Coordination+Samples?xyz=123"));
}
+ private void assertIsInTable(String table, String value){
+ Assert.assertTrue(findTableRow(table, value, 0) > 0, value + " not found in
table " + table);
+ }
+
@Test(enabled = true)
public void eventsExplicitTest() {
selenium.click("link=Events - Explicit");
@@ -119,14 +123,14 @@
selenium.click(MessageFormat.format(EVT_L_LNK, r));
waitFor(AJAX_LOAD);
- Assert.assertTrue(findTableRow(EVT_L2_TAB, EVT_L_C1, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_L3_TAB, EVT_L_C1, 0) > 0);
+ assertIsInTable(EVT_L2_TAB, EVT_L_C1);
+ assertIsInTable(EVT_L3_TAB, EVT_L_C1);
- Assert.assertTrue(findTableRow(EVT_L2_TAB, EVT_L_C2, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_L3_TAB, EVT_L_C2, 0) > 0);
+ assertIsInTable(EVT_L2_TAB, EVT_L_C2);
+ assertIsInTable(EVT_L3_TAB, EVT_L_C2);
- Assert.assertTrue(findTableRow(EVT_L2_TAB, EVT_L_C3, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_L3_TAB, EVT_L_C3, 0) > 0);
+ assertIsInTable(EVT_L2_TAB, EVT_L_C3);
+ assertIsInTable(EVT_L3_TAB, EVT_L_C3);
Assert.assertFalse(selenium.isElementPresent(EVT_R2_TAB));
Assert.assertFalse(selenium.isElementPresent(EVT_R3_TAB));
@@ -141,23 +145,23 @@
selenium.click(MessageFormat.format(EVT_R_LNK, r));
waitFor(AJAX_LOAD);
- Assert.assertTrue(findTableRow(EVT_L2_TAB, EVT_L_C1, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_L3_TAB, EVT_L_C1, 0) > 0);
+ assertIsInTable(EVT_L2_TAB, EVT_L_C1);
+ assertIsInTable(EVT_L3_TAB, EVT_L_C1);
- Assert.assertTrue(findTableRow(EVT_L2_TAB, EVT_L_C2, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_L3_TAB, EVT_L_C2, 0) > 0);
+ assertIsInTable(EVT_L2_TAB, EVT_L_C2);
+ assertIsInTable(EVT_L3_TAB, EVT_L_C2);
- Assert.assertTrue(findTableRow(EVT_L2_TAB, EVT_L_C3, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_L3_TAB, EVT_L_C3, 0) > 0);
+ assertIsInTable(EVT_L2_TAB, EVT_L_C3);
+ assertIsInTable(EVT_L3_TAB, EVT_L_C3);
- Assert.assertTrue(findTableRow(EVT_R2_TAB, EVT_R_C1, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_R3_TAB, EVT_R_C1, 0) > 0);
+ assertIsInTable(EVT_R2_TAB, EVT_R_C1);
+ assertIsInTable(EVT_R3_TAB, EVT_R_C1);
- Assert.assertTrue(findTableRow(EVT_R2_TAB, EVT_R_C2, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_R3_TAB, EVT_R_C2, 0) > 0);
+ assertIsInTable(EVT_R2_TAB, EVT_R_C2);
+ assertIsInTable(EVT_R3_TAB, EVT_R_C2);
- Assert.assertTrue(findTableRow(EVT_R2_TAB, EVT_R_C3, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_R3_TAB, EVT_R_C3, 0) > 0);
+ assertIsInTable(EVT_R2_TAB, EVT_R_C3);
+ assertIsInTable(EVT_R3_TAB, EVT_R_C3);
}
@Test(enabled = true)
@@ -177,17 +181,17 @@
selenium.click(MessageFormat.format(EVT_L_LNK, r));
waitFor(AJAX_LOAD);
- Assert.assertTrue(findTableRow(EVT_L2_TAB, EVT_L_C1, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_L3_TAB, EVT_L_C1, 0) > 0);
+ assertIsInTable(EVT_L2_TAB, EVT_L_C1);
+ assertIsInTable(EVT_L3_TAB, EVT_L_C1);
- Assert.assertTrue(findTableRow(EVT_L2_TAB, EVT_L_C2, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_L3_TAB, EVT_L_C2, 0) > 0);
+ assertIsInTable(EVT_L2_TAB, EVT_L_C2);
+ assertIsInTable(EVT_L3_TAB, EVT_L_C2);
- Assert.assertTrue(findTableRow(EVT_L2_TAB, EVT_L_C3, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_L3_TAB, EVT_L_C3, 0) > 0);
+ assertIsInTable(EVT_L2_TAB, EVT_L_C3);
+ assertIsInTable(EVT_L3_TAB, EVT_L_C3);
- Assert.assertFalse(selenium.isElementPresent(EVT_R2_TAB));
- Assert.assertFalse(selenium.isElementPresent(EVT_R3_TAB));
+ Assert.assertFalse(selenium.isElementPresent(EVT_R2_TAB),EVT_R2_TAB + " table was
found");
+ Assert.assertFalse(selenium.isElementPresent(EVT_R3_TAB),EVT_R3_TAB + " table was
found");
r = findTableRow(EVT_R1_TAB, EVT_R_C1, 0);
selenium.click(MessageFormat.format(EVT_R_LNK, r));
@@ -199,23 +203,23 @@
selenium.click(MessageFormat.format(EVT_R_LNK, r));
waitFor(AJAX_LOAD);
- Assert.assertTrue(findTableRow(EVT_L2_TAB, EVT_L_C1, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_L3_TAB, EVT_L_C1, 0) > 0);
+ assertIsInTable(EVT_L2_TAB, EVT_L_C1);
+ assertIsInTable(EVT_L3_TAB, EVT_L_C1);
- Assert.assertTrue(findTableRow(EVT_L2_TAB, EVT_L_C2, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_L3_TAB, EVT_L_C2, 0) > 0);
+ assertIsInTable(EVT_L2_TAB, EVT_L_C2);
+ assertIsInTable(EVT_L3_TAB, EVT_L_C2);
- Assert.assertTrue(findTableRow(EVT_L2_TAB, EVT_L_C3, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_L3_TAB, EVT_L_C3, 0) > 0);
+ assertIsInTable(EVT_L2_TAB, EVT_L_C3);
+ assertIsInTable(EVT_L3_TAB, EVT_L_C3);
- Assert.assertTrue(findTableRow(EVT_R2_TAB, EVT_R_C1, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_R3_TAB, EVT_R_C1, 0) > 0);
+ assertIsInTable(EVT_R2_TAB, EVT_R_C1);
+ assertIsInTable(EVT_R3_TAB, EVT_R_C1);
- Assert.assertTrue(findTableRow(EVT_R2_TAB, EVT_R_C2, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_R3_TAB, EVT_R_C2, 0) > 0);
+ assertIsInTable(EVT_R2_TAB, EVT_R_C2);
+ assertIsInTable(EVT_R3_TAB, EVT_R_C2);
- Assert.assertTrue(findTableRow(EVT_R2_TAB, EVT_R_C3, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_R3_TAB, EVT_R_C3, 0) > 0);
+ assertIsInTable(EVT_R2_TAB, EVT_R_C3);
+ assertIsInTable(EVT_R3_TAB, EVT_R_C3);
}
@Test(enabled = true)
@@ -235,23 +239,23 @@
selenium.click(MessageFormat.format(EVT_L_LNK, r));
waitFor(AJAX_LOAD);
- Assert.assertTrue(findTableRow(EVT_L2_TAB, EVT_L_C1, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_L3_TAB, EVT_L_C1, 0) > 0);
+ assertIsInTable(EVT_L2_TAB, EVT_L_C1);
+ assertIsInTable(EVT_L3_TAB, EVT_L_C1);
- Assert.assertTrue(findTableRow(EVT_L2_TAB, EVT_L_C2, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_L3_TAB, EVT_L_C2, 0) > 0);
+ assertIsInTable(EVT_L2_TAB, EVT_L_C2);
+ assertIsInTable(EVT_L3_TAB, EVT_L_C2);
- Assert.assertTrue(findTableRow(EVT_L2_TAB, EVT_L_C3, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_L3_TAB, EVT_L_C3, 0) > 0);
+ assertIsInTable(EVT_L2_TAB, EVT_L_C3);
+ assertIsInTable(EVT_L3_TAB, EVT_L_C3);
- Assert.assertTrue(findTableRow(EVT_R2_TAB, EVT_L_C1, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_R3_TAB, EVT_L_C1, 0) > 0);
+ assertIsInTable(EVT_R2_TAB, EVT_L_C1);
+ assertIsInTable(EVT_R3_TAB, EVT_L_C1);
- Assert.assertTrue(findTableRow(EVT_R2_TAB, EVT_L_C2, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_R3_TAB, EVT_L_C2, 0) > 0);
+ assertIsInTable(EVT_R2_TAB, EVT_L_C2);
+ assertIsInTable(EVT_R3_TAB, EVT_L_C2);
- Assert.assertTrue(findTableRow(EVT_R2_TAB, EVT_L_C3, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_R3_TAB, EVT_L_C3, 0) > 0);
+ assertIsInTable(EVT_R2_TAB, EVT_L_C3);
+ assertIsInTable(EVT_R3_TAB, EVT_L_C3);
r = findTableRow(EVT_R1_TAB, EVT_R_C1, 0);
selenium.click(MessageFormat.format(EVT_R_LNK, r));
@@ -263,41 +267,41 @@
selenium.click(MessageFormat.format(EVT_R_LNK, r));
waitFor(AJAX_LOAD);
- Assert.assertTrue(findTableRow(EVT_L2_TAB, EVT_L_C1, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_L3_TAB, EVT_L_C1, 0) > 0);
+ assertIsInTable(EVT_L2_TAB, EVT_L_C1);
+ assertIsInTable(EVT_L3_TAB, EVT_L_C1);
- Assert.assertTrue(findTableRow(EVT_L2_TAB, EVT_L_C2, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_L3_TAB, EVT_L_C2, 0) > 0);
+ assertIsInTable(EVT_L2_TAB, EVT_L_C2);
+ assertIsInTable(EVT_L3_TAB, EVT_L_C2);
- Assert.assertTrue(findTableRow(EVT_L2_TAB, EVT_L_C3, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_L3_TAB, EVT_L_C3, 0) > 0);
+ assertIsInTable(EVT_L2_TAB, EVT_L_C3);
+ assertIsInTable(EVT_L3_TAB, EVT_L_C3);
- Assert.assertTrue(findTableRow(EVT_R2_TAB, EVT_L_C1, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_R3_TAB, EVT_L_C1, 0) > 0);
+ assertIsInTable(EVT_R2_TAB, EVT_L_C1);
+ assertIsInTable(EVT_R3_TAB, EVT_L_C1);
- Assert.assertTrue(findTableRow(EVT_R2_TAB, EVT_L_C2, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_R3_TAB, EVT_L_C2, 0) > 0);
+ assertIsInTable(EVT_R2_TAB, EVT_L_C2);
+ assertIsInTable(EVT_R3_TAB, EVT_L_C2);
- Assert.assertTrue(findTableRow(EVT_R2_TAB, EVT_L_C3, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_R3_TAB, EVT_L_C3, 0) > 0);
+ assertIsInTable(EVT_R2_TAB, EVT_L_C3);
+ assertIsInTable(EVT_R3_TAB, EVT_L_C3);
//--------------------------------------------------------//
- Assert.assertTrue(findTableRow(EVT_L2_TAB, EVT_R_C1, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_L3_TAB, EVT_R_C1, 0) > 0);
+ assertIsInTable(EVT_L2_TAB, EVT_R_C1);
+ assertIsInTable(EVT_L3_TAB, EVT_R_C1);
- Assert.assertTrue(findTableRow(EVT_L2_TAB, EVT_R_C2, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_L3_TAB, EVT_R_C2, 0) > 0);
+ assertIsInTable(EVT_L2_TAB, EVT_R_C2);
+ assertIsInTable(EVT_L3_TAB, EVT_R_C2);
- Assert.assertTrue(findTableRow(EVT_L2_TAB, EVT_R_C3, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_L3_TAB, EVT_R_C3, 0) > 0);
+ assertIsInTable(EVT_L2_TAB, EVT_R_C3);
+ assertIsInTable(EVT_L3_TAB, EVT_R_C3);
- Assert.assertTrue(findTableRow(EVT_R2_TAB, EVT_R_C1, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_R3_TAB, EVT_R_C1, 0) > 0);
+ assertIsInTable(EVT_R2_TAB, EVT_R_C1);
+ assertIsInTable(EVT_R3_TAB, EVT_R_C1);
- Assert.assertTrue(findTableRow(EVT_R2_TAB, EVT_R_C2, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_R3_TAB, EVT_R_C2, 0) > 0);
+ assertIsInTable(EVT_R2_TAB, EVT_R_C2);
+ assertIsInTable(EVT_R3_TAB, EVT_R_C2);
- Assert.assertTrue(findTableRow(EVT_R2_TAB, EVT_R_C3, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_R3_TAB, EVT_R_C3, 0) > 0);
+ assertIsInTable(EVT_R2_TAB, EVT_R_C3);
+ assertIsInTable(EVT_R3_TAB, EVT_R_C3);
}
@Test(enabled = true)
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/CoordinationSamplesTestCase.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/CoordinationSamplesTestCase.java 2009-06-24
23:28:48 UTC (rev 13498)
+++
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/CoordinationSamplesTestCase.java 2009-06-25
11:48:06 UTC (rev 13499)
@@ -144,7 +144,10 @@
Assert.assertTrue(selenium.getLocation().endsWith("/portal/portal/default/Coordination+Samples?xyz=123"));
}
-
+ private void assertIsInTable(String table, String value){
+ Assert.assertTrue(findTableRow(table, value, 0) > 0, value + " not found in
table " + table);
+ }
+
/**
* Events explicit test.
*
@@ -193,14 +196,14 @@
selenium.click(MessageFormat.format(EVT_L_LNK, r));
waitFor(AJAX_LOAD);
- Assert.assertTrue(findTableRow(EVT_L2_TAB, EVT_L_C1, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_L3_TAB, EVT_L_C1, 0) > 0);
+ assertIsInTable(EVT_L2_TAB, EVT_L_C1);
+ assertIsInTable(EVT_L3_TAB, EVT_L_C1);
- Assert.assertTrue(findTableRow(EVT_L2_TAB, EVT_L_C2, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_L3_TAB, EVT_L_C2, 0) > 0);
+ assertIsInTable(EVT_L2_TAB, EVT_L_C2);
+ assertIsInTable(EVT_L3_TAB, EVT_L_C2);
- Assert.assertTrue(findTableRow(EVT_L2_TAB, EVT_L_C3, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_L3_TAB, EVT_L_C3, 0) > 0);
+ assertIsInTable(EVT_L2_TAB, EVT_L_C3);
+ assertIsInTable(EVT_L3_TAB, EVT_L_C3);
Assert.assertFalse(selenium.isElementPresent(EVT_R2_TAB));
Assert.assertFalse(selenium.isElementPresent(EVT_R3_TAB));
@@ -215,23 +218,23 @@
selenium.click(MessageFormat.format(EVT_R_LNK, r));
waitFor(AJAX_LOAD);
- Assert.assertTrue(findTableRow(EVT_L2_TAB, EVT_L_C1, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_L3_TAB, EVT_L_C1, 0) > 0);
+ assertIsInTable(EVT_L2_TAB, EVT_L_C1);
+ assertIsInTable(EVT_L3_TAB, EVT_L_C1);
- Assert.assertTrue(findTableRow(EVT_L2_TAB, EVT_L_C2, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_L3_TAB, EVT_L_C2, 0) > 0);
+ assertIsInTable(EVT_L2_TAB, EVT_L_C2);
+ assertIsInTable(EVT_L3_TAB, EVT_L_C2);
- Assert.assertTrue(findTableRow(EVT_L2_TAB, EVT_L_C3, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_L3_TAB, EVT_L_C3, 0) > 0);
+ assertIsInTable(EVT_L2_TAB, EVT_L_C3);
+ assertIsInTable(EVT_L3_TAB, EVT_L_C3);
- Assert.assertTrue(findTableRow(EVT_R2_TAB, EVT_R_C1, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_R3_TAB, EVT_R_C1, 0) > 0);
+ assertIsInTable(EVT_R2_TAB, EVT_R_C1);
+ assertIsInTable(EVT_R3_TAB, EVT_R_C1);
- Assert.assertTrue(findTableRow(EVT_R2_TAB, EVT_R_C2, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_R3_TAB, EVT_R_C2, 0) > 0);
+ assertIsInTable(EVT_R2_TAB, EVT_R_C2);
+ assertIsInTable(EVT_R3_TAB, EVT_R_C2);
- Assert.assertTrue(findTableRow(EVT_R2_TAB, EVT_R_C3, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_R3_TAB, EVT_R_C3, 0) > 0);
+ assertIsInTable(EVT_R2_TAB, EVT_R_C3);
+ assertIsInTable(EVT_R3_TAB, EVT_R_C3);
}
/**
@@ -284,14 +287,14 @@
selenium.click(MessageFormat.format(EVT_L_LNK, r));
waitFor(AJAX_LOAD);
- Assert.assertTrue(findTableRow(EVT_L2_TAB, EVT_L_C1, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_L3_TAB, EVT_L_C1, 0) > 0);
+ assertIsInTable(EVT_L2_TAB, EVT_L_C1);
+ assertIsInTable(EVT_L3_TAB, EVT_L_C1);
- Assert.assertTrue(findTableRow(EVT_L2_TAB, EVT_L_C2, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_L3_TAB, EVT_L_C2, 0) > 0);
+ assertIsInTable(EVT_L2_TAB, EVT_L_C2);
+ assertIsInTable(EVT_L3_TAB, EVT_L_C2);
- Assert.assertTrue(findTableRow(EVT_L2_TAB, EVT_L_C3, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_L3_TAB, EVT_L_C3, 0) > 0);
+ assertIsInTable(EVT_L2_TAB, EVT_L_C3);
+ assertIsInTable(EVT_L3_TAB, EVT_L_C3);
Assert.assertFalse(selenium.isElementPresent(EVT_R2_TAB));
Assert.assertFalse(selenium.isElementPresent(EVT_R3_TAB));
@@ -306,23 +309,23 @@
selenium.click(MessageFormat.format(EVT_R_LNK, r));
waitFor(AJAX_LOAD);
- Assert.assertTrue(findTableRow(EVT_L2_TAB, EVT_L_C1, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_L3_TAB, EVT_L_C1, 0) > 0);
+ assertIsInTable(EVT_L2_TAB, EVT_L_C1);
+ assertIsInTable(EVT_L3_TAB, EVT_L_C1);
- Assert.assertTrue(findTableRow(EVT_L2_TAB, EVT_L_C2, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_L3_TAB, EVT_L_C2, 0) > 0);
+ assertIsInTable(EVT_L2_TAB, EVT_L_C2);
+ assertIsInTable(EVT_L3_TAB, EVT_L_C2);
- Assert.assertTrue(findTableRow(EVT_L2_TAB, EVT_L_C3, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_L3_TAB, EVT_L_C3, 0) > 0);
+ assertIsInTable(EVT_L2_TAB, EVT_L_C3);
+ assertIsInTable(EVT_L3_TAB, EVT_L_C3);
- Assert.assertTrue(findTableRow(EVT_R2_TAB, EVT_R_C1, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_R3_TAB, EVT_R_C1, 0) > 0);
+ assertIsInTable(EVT_R2_TAB, EVT_R_C1);
+ assertIsInTable(EVT_R3_TAB, EVT_R_C1);
- Assert.assertTrue(findTableRow(EVT_R2_TAB, EVT_R_C2, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_R3_TAB, EVT_R_C2, 0) > 0);
+ assertIsInTable(EVT_R2_TAB, EVT_R_C2);
+ assertIsInTable(EVT_R3_TAB, EVT_R_C2);
- Assert.assertTrue(findTableRow(EVT_R2_TAB, EVT_R_C3, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_R3_TAB, EVT_R_C3, 0) > 0);
+ assertIsInTable(EVT_R2_TAB, EVT_R_C3);
+ assertIsInTable(EVT_R3_TAB, EVT_R_C3);
}
/**
@@ -375,23 +378,23 @@
selenium.click(MessageFormat.format(EVT_L_LNK, r));
waitFor(AJAX_LOAD);
- Assert.assertTrue(findTableRow(EVT_L2_TAB, EVT_L_C1, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_L3_TAB, EVT_L_C1, 0) > 0);
+ assertIsInTable(EVT_L2_TAB, EVT_L_C1);
+ assertIsInTable(EVT_L3_TAB, EVT_L_C1);
- Assert.assertTrue(findTableRow(EVT_L2_TAB, EVT_L_C2, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_L3_TAB, EVT_L_C2, 0) > 0);
+ assertIsInTable(EVT_L2_TAB, EVT_L_C2);
+ assertIsInTable(EVT_L3_TAB, EVT_L_C2);
- Assert.assertTrue(findTableRow(EVT_L2_TAB, EVT_L_C3, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_L3_TAB, EVT_L_C3, 0) > 0);
+ assertIsInTable(EVT_L2_TAB, EVT_L_C3);
+ assertIsInTable(EVT_L3_TAB, EVT_L_C3);
- Assert.assertTrue(findTableRow(EVT_R2_TAB, EVT_L_C1, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_R3_TAB, EVT_L_C1, 0) > 0);
+ assertIsInTable(EVT_R2_TAB, EVT_L_C1);
+ assertIsInTable(EVT_R3_TAB, EVT_L_C1);
- Assert.assertTrue(findTableRow(EVT_R2_TAB, EVT_L_C2, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_R3_TAB, EVT_L_C2, 0) > 0);
+ assertIsInTable(EVT_R2_TAB, EVT_L_C2);
+ assertIsInTable(EVT_R3_TAB, EVT_L_C2);
- Assert.assertTrue(findTableRow(EVT_R2_TAB, EVT_L_C3, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_R3_TAB, EVT_L_C3, 0) > 0);
+ assertIsInTable(EVT_R2_TAB, EVT_L_C3);
+ assertIsInTable(EVT_R3_TAB, EVT_L_C3);
r = findTableRow(EVT_R1_TAB, EVT_R_C1, 0);
selenium.click(MessageFormat.format(EVT_R_LNK, r));
@@ -403,41 +406,41 @@
selenium.click(MessageFormat.format(EVT_R_LNK, r));
waitFor(AJAX_LOAD);
- Assert.assertTrue(findTableRow(EVT_L2_TAB, EVT_L_C1, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_L3_TAB, EVT_L_C1, 0) > 0);
+ assertIsInTable(EVT_L2_TAB, EVT_L_C1);
+ assertIsInTable(EVT_L3_TAB, EVT_L_C1);
- Assert.assertTrue(findTableRow(EVT_L2_TAB, EVT_L_C2, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_L3_TAB, EVT_L_C2, 0) > 0);
+ assertIsInTable(EVT_L2_TAB, EVT_L_C2);
+ assertIsInTable(EVT_L3_TAB, EVT_L_C2);
- Assert.assertTrue(findTableRow(EVT_L2_TAB, EVT_L_C3, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_L3_TAB, EVT_L_C3, 0) > 0);
+ assertIsInTable(EVT_L2_TAB, EVT_L_C3);
+ assertIsInTable(EVT_L3_TAB, EVT_L_C3);
- Assert.assertTrue(findTableRow(EVT_R2_TAB, EVT_L_C1, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_R3_TAB, EVT_L_C1, 0) > 0);
+ assertIsInTable(EVT_R2_TAB, EVT_L_C1);
+ assertIsInTable(EVT_R3_TAB, EVT_L_C1);
- Assert.assertTrue(findTableRow(EVT_R2_TAB, EVT_L_C2, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_R3_TAB, EVT_L_C2, 0) > 0);
+ assertIsInTable(EVT_R2_TAB, EVT_L_C2);
+ assertIsInTable(EVT_R3_TAB, EVT_L_C2);
- Assert.assertTrue(findTableRow(EVT_R2_TAB, EVT_L_C3, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_R3_TAB, EVT_L_C3, 0) > 0);
+ assertIsInTable(EVT_R2_TAB, EVT_L_C3);
+ assertIsInTable(EVT_R3_TAB, EVT_L_C3);
// --------------------------------------------------------//
- Assert.assertTrue(findTableRow(EVT_L2_TAB, EVT_R_C1, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_L3_TAB, EVT_R_C1, 0) > 0);
+ assertIsInTable(EVT_L2_TAB, EVT_R_C1);
+ assertIsInTable(EVT_L3_TAB, EVT_R_C1);
- Assert.assertTrue(findTableRow(EVT_L2_TAB, EVT_R_C2, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_L3_TAB, EVT_R_C2, 0) > 0);
+ assertIsInTable(EVT_L2_TAB, EVT_R_C2);
+ assertIsInTable(EVT_L3_TAB, EVT_R_C2);
- Assert.assertTrue(findTableRow(EVT_L2_TAB, EVT_R_C3, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_L3_TAB, EVT_R_C3, 0) > 0);
+ assertIsInTable(EVT_L2_TAB, EVT_R_C3);
+ assertIsInTable(EVT_L3_TAB, EVT_R_C3);
- Assert.assertTrue(findTableRow(EVT_R2_TAB, EVT_R_C1, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_R3_TAB, EVT_R_C1, 0) > 0);
+ assertIsInTable(EVT_R2_TAB, EVT_R_C1);
+ assertIsInTable(EVT_R3_TAB, EVT_R_C1);
- Assert.assertTrue(findTableRow(EVT_R2_TAB, EVT_R_C2, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_R3_TAB, EVT_R_C2, 0) > 0);
+ assertIsInTable(EVT_R2_TAB, EVT_R_C2);
+ assertIsInTable(EVT_R3_TAB, EVT_R_C2);
- Assert.assertTrue(findTableRow(EVT_R2_TAB, EVT_R_C3, 0) > 0);
- Assert.assertTrue(findTableRow(EVT_R3_TAB, EVT_R_C3, 0) > 0);
+ assertIsInTable(EVT_R2_TAB, EVT_R_C3);
+ assertIsInTable(EVT_R3_TAB, EVT_R_C3);
}
/**
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java 2009-06-24
23:28:48 UTC (rev 13498)
+++
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java 2009-06-25
11:48:06 UTC (rev 13499)
@@ -371,8 +371,8 @@
selenium.click("link=" + pageName);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertFalse(assertTextOrder("Current;Greetings"));
- Assert.assertTrue(assertTextOrder("Greetings;Current"));
+ Assert.assertFalse(assertTextOrder("Current;Greetings"),"greetings and
current strings not in expected order");
+ Assert.assertTrue(assertTextOrder("Greetings;Current"),"greetings and
current strings not in expected order");
selenium.click(LNK_CONFIGURE_DASHBOARD);
// selenium.waitForPageToLoad(PAGE_LOAD);
@@ -388,8 +388,8 @@
selenium.click("link=" + pageName);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(assertTextOrder("Current;Greetings"));
- Assert.assertFalse(assertTextOrder("Greetings;Current"));
+ Assert.assertTrue(assertTextOrder("Current;Greetings"),"greetings and
current strings not in expected order");
+ Assert.assertFalse(assertTextOrder("Greetings;Current"),"greetings and
current strings not in expected order");
}
@@ -535,7 +535,7 @@
Assert.assertTrue(selenium.isElementPresent("link=" + pageName));
selenium.click("link=" + pageName);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isTextPresent(MSG_POWER));
+ Assert.assertTrue(selenium.isTextPresent(MSG_POWER),"powered by jboss message is
missing");
// then rename it
selenium.click(LNK_CONFIGURE_DASHBOARD);
@@ -576,7 +576,7 @@
selenium.click(SUB_ADDCENTER);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isTextPresent(MSG_WINDOW_NAME_VALID));
+ Assert.assertTrue(selenium.isTextPresent(MSG_WINDOW_NAME_VALID),"validation
message missing or other than expected");
}
/**
@@ -667,7 +667,7 @@
selenium.click("link=" + pageName);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isTextPresent(MSG_POWER));
+ Assert.assertTrue(selenium.isTextPresent(MSG_POWER),"powered by jboss message not
found");
// add weather portlet
selenium.open("/portal/");
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/EndToEndBeaPortlet.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/EndToEndBeaPortlet.java 2009-06-24
23:28:48 UTC (rev 13498)
+++
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/EndToEndBeaPortlet.java 2009-06-25
11:48:06 UTC (rev 13499)
@@ -124,8 +124,7 @@
selenium.type(INPUT_CONSWSDL,
"http://wsrp.bea.com:7001/producer/producer?WSDL");
selenium.click(SUBMIT_REFRESHSAVE);
selenium.waitForPageToLoad(PAGE_LOAD);
- //Assert.assertTrue(selenium.isTextPresent("Refresh failed (probably because the
registration information was not valid)."));
- Assert.assertTrue(selenium.isTextPresent("Missing value"));
+ Assert.assertTrue(selenium.isTextPresent("Missing value"),"missing value
message missing or other than expected");
selenium.type(INPUT_CONS_REGVALUE, "public");
selenium.click(SUBMIT_CONS_REGVAL);
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-24
23:28:48 UTC (rev 13498)
+++
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java 2009-06-25
11:48:06 UTC (rev 13499)
@@ -510,7 +510,7 @@
selenium.type(INP_USERNAME, XSS_STR1);
clickAndWait(SUB_CREATE_USER);
- Assert.assertTrue(selenium.isTextPresent("is an invalid username"));
+ Assert.assertTrue(selenium.isTextPresent("is an invalid
username"),"validation message missing or other than expected");
openAndWait(ADR_PORTAL);
@@ -523,7 +523,7 @@
clickAndWait(SUB_CREATE_USER);
- Assert.assertTrue(selenium.isTextPresent("Invalid E-Mail address."));
+ Assert.assertTrue(selenium.isTextPresent("Invalid E-Mail
address."),"validation message missing or other than expected");
}
@@ -550,7 +550,7 @@
selenium.type(INP_ROLEDISNAME, "diddi");
clickAndWait(SUB_ROLE_CREATE);
- Assert.assertTrue(selenium.isTextPresent(MSG_ROLE_NAME_VALID));
+ Assert.assertTrue(selenium.isTextPresent(MSG_ROLE_NAME_VALID),"validation message
missing or other than expected");
openAndWait(ADR_PORTAL);
clickIfVisible(LNK_ADMIN);
@@ -565,7 +565,7 @@
clickAndWait(SUB_ROLE_CREATE);
- Assert.assertTrue(selenium.isTextPresent(MSG_ROLE_DISPNAME_VALID));
+ Assert.assertTrue(selenium.isTextPresent(MSG_ROLE_DISPNAME_VALID),"validation
message missing or other than expected");
}
@@ -607,7 +607,7 @@
selenium.click(SUB_EDIT_ROLE_SUBMIT);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isTextPresent(MSG_ROLE_DISPNAME_VALID));
+ Assert.assertTrue(selenium.isTextPresent(MSG_ROLE_DISPNAME_VALID),"validation
message missing or other than expected");
deleteRole(roleName);
}
@@ -700,7 +700,7 @@
waitFor(SEARCH_TIMEOUT);
- Assert.assertTrue(selenium.isTextPresent("is an invalid"));
+ Assert.assertTrue(selenium.isTextPresent("is an invalid"),"validation
message missing or other than expected");
}
/**
@@ -720,7 +720,7 @@
selenium.click(SUB_ROLE_SEARCH_USER);
waitFor(10000);
- Assert.assertTrue(selenium.isTextPresent("is an invalid"));
+ Assert.assertTrue(selenium.isTextPresent("is an invalid"),"validation
message missing or other than expected");
}
private void goToEdit(String userName, String userMail) {
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java 2009-06-24
23:28:48 UTC (rev 13498)
+++
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java 2009-06-25
11:48:06 UTC (rev 13499)
@@ -40,7 +40,7 @@
}
protected final String LINK_LOGOUT = getLoc(casePfx + "link.logout",
"link=Logout");
- protected final String SUBMIT_LOGIN = getLoc(casePfx + "submit.login",
"login");
+ protected final String SUBMIT_LOGIN = getLoc(casePfx + "sub.login",
"login");
protected final String ADR_PORTAL = getLoc(casePfx + "addr.portal",
"/portal/");
protected final String FRAME_LOGIN_CONTENT = getLoc(casePfx +
"frame.login.content", "login-content");
protected final String LINK_LOGIN = getLoc(casePfx + "link.login",
"link=Login");
@@ -395,7 +395,7 @@
selenium.type(INPUT_USERNAME, username);
selenium.type(INPUT_PASSWORD, password);
selenium.fireEvent(INPUT_PASSWORD, "keydown");
- Assert.assertTrue(selenium.isElementPresent(SUBMIT_LOGIN));
+ Assert.assertTrue(selenium.isElementPresent(SUBMIT_LOGIN),"login submit button not
found");
selenium.click(SUBMIT_LOGIN);
selenium.waitForPageToLoad(PAGE_LOAD);
Assert.assertTrue(selenium.isTextPresent("Logged in as: " + username),
"Not logged in, login message missing.");
@@ -407,7 +407,7 @@
public void logout() {
selenium.open(ADR_PORTAL);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isElementPresent(LINK_LOGOUT));
+ Assert.assertTrue(selenium.isElementPresent(LINK_LOGOUT),"logout link not
found");
selenium.click(LINK_LOGOUT);
selenium.waitForPageToLoad(PAGE_LOAD);
Assert.assertFalse(selenium.isTextPresent("Logged in as:"), "Not logged
in, login message missing.");
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/PortletUserCreationTestCase.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/PortletUserCreationTestCase.java 2009-06-24
23:28:48 UTC (rev 13498)
+++
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/PortletUserCreationTestCase.java 2009-06-25
11:48:06 UTC (rev 13499)
@@ -41,24 +41,24 @@
selenium.open("/portal");
selenium.waitForPageToLoad(PAGE_LOAD);
clickIfVisible(TAB_WELCOME);
- Assert.assertTrue((selenium.isElementPresent(LNK_CREATE_USER)));
+ Assert.assertTrue((selenium.isElementPresent(LNK_CREATE_USER)),"create user link
not found");
selenium.click(LNK_CREATE_USER);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue((selenium.isTextPresent("Username *")));
- Assert.assertTrue((selenium.isTextPresent("E-Mail *")));
- Assert.assertTrue((selenium.isTextPresent("Password *")));
- Assert.assertTrue((selenium.isTextPresent("Confirm Password *")));
+ Assert.assertTrue((selenium.isTextPresent("Username *")),"username form
label not found");
+ Assert.assertTrue((selenium.isTextPresent("E-Mail *")),"email form label
not found");
+ Assert.assertTrue((selenium.isTextPresent("Password *")),"password form
label not found");
+ Assert.assertTrue((selenium.isTextPresent("Confirm Password
*")),"password confirm form label not found");
selenium.type(INP_USERNAME, "portletUser");
selenium.type(INP_USERMAIL, "portletUser(a)redhat.com");
selenium.type(INP_USERPASSWD, "portletUserPassword");
selenium.type(INP_USERPASSWDCONF, "portletUserPassword");
selenium.click(SUB_CREATE_USER);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue((selenium.isTextPresent("portletUser")));
- Assert.assertTrue((selenium.isTextPresent("portletUser(a)redhat.com")));
+ Assert.assertTrue((selenium.isTextPresent("portletUser")), "portletUser
not found on screen");
+ Assert.assertTrue((selenium.isTextPresent("portletUser(a)redhat.com")),"user
email not found");
selenium.click(SUB_CREATE_CONF);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue((selenium.isTextPresent("Your account has been successfully
created. You may want to login now.")));
+ Assert.assertTrue((selenium.isTextPresent("Your account has been successfully
created. You may want to login now.")),"account created message not
found");
}
/**
@@ -71,13 +71,13 @@
selenium.open("/portal");
selenium.waitForPageToLoad(PAGE_LOAD);
clickIfVisible(TAB_WELCOME);
- Assert.assertTrue((selenium.isElementPresent(LNK_CREATE_USER)));
+ Assert.assertTrue((selenium.isElementPresent(LNK_CREATE_USER)),"create user link
not found");
selenium.click(LNK_CREATE_USER);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue((selenium.isTextPresent("Username *")));
- Assert.assertTrue((selenium.isTextPresent("E-Mail *")));
- Assert.assertTrue((selenium.isTextPresent("Password *")));
- Assert.assertTrue((selenium.isTextPresent("Confirm Password *")));
+ Assert.assertTrue((selenium.isTextPresent("Username *")),"username form
label not found");
+ Assert.assertTrue((selenium.isTextPresent("E-Mail *")),"email form label
not found");
+ Assert.assertTrue((selenium.isTextPresent("Password *")),"password form
label not found");
+ Assert.assertTrue((selenium.isTextPresent("Confirm Password
*")),"password confirmation form label not found");
selenium.type(INP_USERNAME, "portletLongUser");
selenium.type(INP_USERMAIL, "portletLongUser(a)redhat.com");
selenium.type(INP_USERPASSWD, "portletLongUserPassword");
@@ -90,7 +90,7 @@
selenium.open("/portal");
selenium.waitForPageToLoad(PAGE_LOAD);
clickIfVisible(TAB_WELCOME);
- Assert.assertTrue((selenium.isElementPresent(LNK_CREATE_USER)));
+ Assert.assertTrue((selenium.isElementPresent(LNK_CREATE_USER)),"create user link
not found");
selenium.click(LNK_CREATE_USER);
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.type(INP_USERNAME, "portlextLongUser");
@@ -184,7 +184,7 @@
selenium.type(INP_USERPASSWDCONF, "invalidMailp");
selenium.click(SUB_CREATE_USER);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isTextPresent("Invalid E-Mail address."));
+ Assert.assertTrue(selenium.isTextPresent("Invalid E-Mail
address."),"validation message not found");
}
@@ -204,7 +204,7 @@
selenium.type(INP_USERPASSWDCONF, "wrongPass2");
selenium.click(SUB_CREATE_USER);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isTextPresent("The passwords doesn't
match."));
+ Assert.assertTrue(selenium.isTextPresent("The passwords doesn't
match."),"password not match message not found");
}
/**
@@ -220,7 +220,8 @@
selenium.open("/portal");
selenium.waitForPageToLoad(PAGE_LOAD);
clickIfVisible(TAB_WELCOME);
- Assert.assertTrue((selenium.isElementPresent(LNK_CREATE_USER)));
+ Assert.assertTrue((selenium.isElementPresent(LNK_CREATE_USER)),"create user link
not found");
+
selenium.click(LNK_CREATE_USER);
selenium.waitForPageToLoad(PAGE_LOAD);
@@ -291,7 +292,7 @@
selenium.type(INP_USERPASSWDCONF, "w1");
selenium.click(SUB_CREATE_USER);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isTextPresent("password: Validation Error: Value is
less than allowable minimum of '6'"));
+ Assert.assertTrue(selenium.isTextPresent("password: Validation Error: Value is
less than allowable minimum of '6'"),"min lenght password message not
found");
}
}
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/UserLoginTestCase.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/UserLoginTestCase.java 2009-06-24
23:28:48 UTC (rev 13498)
+++
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/UserLoginTestCase.java 2009-06-25
11:48:06 UTC (rev 13499)
@@ -259,7 +259,7 @@
selenium.fireEvent(INP_PASSWORD, "keydown");
selenium.click(SUB_LOGIN);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isTextPresent(MSG_LOGIN_WRONGPASS));
+ Assert.assertTrue(selenium.isTextPresent(MSG_LOGIN_WRONGPASS),"validation message
missing or other than expected");
selenium.open(ADR_PORTAL);
selenium.waitForPageToLoad(PAGE_LOAD);
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-24
23:28:48 UTC (rev 13498)
+++
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java 2009-06-25
11:48:06 UTC (rev 13499)
@@ -116,16 +116,16 @@
selenium.type(INPUT_CONSWSDL,
"http://wsrp.bea.com:7001/producer/producer?WSDL");
selenium.click(SUBMIT_REFRESHSAVE);
selenium.waitForPageToLoad(PAGE_LOAD);
- //Assert.assertTrue(selenium.isTextPresent("Refresh failed (probably because the
registration information was not valid)."));
- Assert.assertTrue(selenium.isTextPresent("Missing value"));
+
+ Assert.assertTrue(selenium.isTextPresent("Missing value"),"missing value
message missing or other than expected");
selenium.type(INPUT_CONS_REGVALUE, "public");
selenium.click(SUB_CONS_REGVAL);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isTextPresent("configuration (active)"));
+ Assert.assertTrue(selenium.isTextPresent("configuration
(active)"),"message about active configuration missing or other than
expected");
selenium.click(SUB_REFRESHFINAL);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isTextPresent("BEA"));
+ Assert.assertTrue(selenium.isTextPresent("BEA"),"name of consumer
missing or other than expected");
}
/**
@@ -192,11 +192,11 @@
clickIfVisible(LINK_CONSUMER_HOME);
int r = findTableRow(WSRP_CONSUMER_TABLE, "BEAact", 0) - 1;
- Assert.assertTrue(selenium.isTextPresent("BEAact (inactive) (refresh
needed)"));
+ Assert.assertTrue(selenium.isTextPresent("BEAact (inactive) (refresh
needed)"),"message about inactive configuration missing or other than
expected");
selenium.click(MessageFormat.format(LINK_T_CONS_ACT, r));
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertFalse(selenium.isTextPresent("BEAact (inactive) (refresh
needed)"));
+ Assert.assertFalse(selenium.isTextPresent("BEAact (inactive) (refresh
needed)"),"message about inactive configuration was found");
}
@@ -219,11 +219,11 @@
int r = findTableRow(WSRP_CONSUMER_TABLE, "BEAact", 0) - 1;
- Assert.assertFalse(selenium.isTextPresent("BEAact (inactive) (refresh
needed)"));
+ Assert.assertFalse(selenium.isTextPresent("BEAact (inactive) (refresh
needed)"),"message about inactive configuration was found");
selenium.click(MessageFormat.format(LINK_T_CONS_DEA, r));
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isTextPresent("BEAact (inactive) (refresh
needed)"));
+ Assert.assertTrue(selenium.isTextPresent("BEAact (inactive) (refresh
needed)"),"message about inactive configuration missing or other than
expected");
}
@@ -304,7 +304,7 @@
selenium.click(SUB_PROD_SAVE);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isTextPresent(MSG_PROD_SAVED));
+ Assert.assertTrue(selenium.isTextPresent(MSG_PROD_SAVED),"producer saved message
is missing");
clickIfVisible(ID_LINK_CONSCONF);
clickIfVisible(ID_LINK_PRODCONF);
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-24
23:28:48 UTC (rev 13498)
+++
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSDirectoryTestCase.java 2009-06-25
11:48:06 UTC (rev 13499)
@@ -93,9 +93,8 @@
// assuring that the directory is created
- selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isElementPresent("//div[@id='center']/div/div/ul/li[3]"));
- Assert.assertEquals(tempDirName,
selenium.getText("//div[@id='center']/div/div/ul/li[3]"));
+ selenium.waitForPageToLoad(PAGE_LOAD);
+
selenium.click("link=Home");
selenium.waitForPageToLoad(PAGE_LOAD);
Assert.assertTrue(selenium.isElementPresent("link=" +
tempDirName),"Created directory link not found.");
@@ -216,8 +215,10 @@
/**
* Copies a directory.
*
- * With action selector an action to copy a directory is chosen. Before that a
directory named "copySrc" was created.
- * Then it was copied into "default" directory. Then the existence of the
copied directory in both root and default directories is asserted.
+ * With action selector an action to copy a directory is chosen. Before that
+ * a directory named "copySrc" was created. Then it was copied into
+ * "default" directory. Then the existence of the copied directory in both
+ * root and default directories is asserted.
*/
@Test(enabled = true, dependsOnMethods = "testCreateDirectory", description =
"Copying of directory.")
public void testCopyDirectory() {
@@ -249,13 +250,13 @@
selenium.click(INP_DIR_SUB);
selenium.waitForPageToLoad(PAGE_LOAD);
Assert.assertEquals("copySrc",
selenium.getText("//div[@id='center']/div/div/ul/li[5]"));
- Assert.assertTrue(selenium.isElementPresent("link=" + defaultDirName));
+ Assert.assertTrue(selenium.isElementPresent("link=" +
defaultDirName),"default dir link not found.");
selenium.click("link=Home");
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isElementPresent("link=" + copyDirName));
+ Assert.assertTrue(selenium.isElementPresent("link=" +
copyDirName),"copied directory not found in home directory");
selenium.click("link=" + defaultDirName);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isElementPresent("link=" + copyDirName));
+ Assert.assertTrue(selenium.isElementPresent("link=" +
copyDirName),"copied directory not found in default directory");
}
@@ -306,8 +307,10 @@
/**
* Moves a directory.
*
- * With action selector an action to move a directory is chosen. Before that a
directory named "moveSrc" was created.
- * Then it was copied into "default" directory. Then the existence of the
moved directory in default and not in the root directory is asserted.
+ * With action selector an action to move a directory is chosen. Before that
+ * a directory named "moveSrc" was created. Then it was copied into
+ * "default" directory. Then the existence of the moved directory in default
+ * and not in the root directory is asserted.
*/
@Test(enabled = true, dependsOnMethods = "testCreateDirectory", description =
"Moving a directory.")
public void testMoveDirectory() {
@@ -317,9 +320,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"),"confirm message
missing or other than expected");
selenium.type(INP_DIR_NAME, moveDirName);
selenium.type(INP_DIR_DESC, "source folder for move");
@@ -331,7 +334,7 @@
selenium.click("link=Home");
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isElementPresent("link=" + moveDirName));
+ Assert.assertTrue(selenium.isElementPresent("link=" +
moveDirName),"directory for moving link not found");
selenium.select(takeAction(moveDirName) + "/select",
"label=Move");
selenium.click(takeAction(moveDirName) + "/select/option[2]");
selenium.click(takeAction(moveDirName) + "/input");
@@ -342,13 +345,13 @@
selenium.waitForPageToLoad(PAGE_LOAD);
Assert.assertEquals(moveDirName,
selenium.getText("//div[@id='center']/div/div/ul/li[5]"));
- Assert.assertTrue(selenium.isElementPresent("link=" + defaultDirName));
+ Assert.assertTrue(selenium.isElementPresent("link=" +
defaultDirName),"defaut directory link not found");
selenium.click("link=Home");
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertFalse(selenium.isElementPresent("link=" + moveDirName));
+ Assert.assertFalse(selenium.isElementPresent("link=" +
moveDirName),"moved directory found in root directory");
selenium.click("link=" + defaultDirName);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isElementPresent("link=" + moveDirName));
+ Assert.assertTrue(selenium.isElementPresent("link=" +
moveDirName),"moved directory not found in default directory");
}
@@ -368,9 +371,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),"input for directory
name not found");
+ Assert.assertTrue(selenium.isElementPresent(INP_DIR_DESC),"input for directory
description not found");
+ Assert.assertEquals("Confirm Directory Creation",
selenium.getText("//div[@id='center']/div/h3"),"confirmation
message not found or other than expected");
selenium.type(INP_DIR_NAME, moveCancelDirName);
selenium.type(INP_DIR_DESC, "source folder for move");
@@ -389,7 +392,7 @@
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isElementPresent("link=" + moveCancelDirName));
+ Assert.assertTrue(selenium.isElementPresent("link=" +
moveCancelDirName),"previously created directory not found");
selenium.click("link=Home");
selenium.waitForPageToLoad(PAGE_LOAD);
@@ -397,7 +400,7 @@
selenium.click("link=" + defaultDirName);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertFalse(selenium.isElementPresent("link=" + moveCancelDirName));
+ Assert.assertFalse(selenium.isElementPresent("link=" +
moveCancelDirName),"moving to default directory was canceled, but the directory was
found in the default directory");
}
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-24
23:28:48 UTC (rev 13498)
+++
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileTestCase.java 2009-06-25
11:48:06 UTC (rev 13499)
@@ -56,16 +56,16 @@
selenium.click("link=CMS");
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isElementPresent("link=default"));
+ Assert.assertTrue(selenium.isElementPresent("link=default"),"default
link not found");
selenium.click("link=default");
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isElementPresent("link=images"));
- Assert.assertTrue(selenium.isElementPresent("link=private"));
- Assert.assertTrue(selenium.isElementPresent("link=index.html"));
- Assert.assertTrue(selenium.isElementPresent("link=project.html"));
+ Assert.assertTrue(selenium.isElementPresent("link=images"),"images link
not found");
+ Assert.assertTrue(selenium.isElementPresent("link=private"),"private
link not found");
+ Assert.assertTrue(selenium.isElementPresent("link=index.html"),"index
link not found");
+ Assert.assertTrue(selenium.isElementPresent("link=project.html"),"project
link not found");
selenium.click("link=index.html");
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isElementPresent("link=text/html"));
+ Assert.assertTrue(selenium.isElementPresent("link=text/html"),"xontenty
type link not found");
Assert.assertTrue(selenium.isElementPresent("//div[@id='center']/div/div/table/tbody/tr[4]/td[6]"));
Assert.assertEquals("JBoss Portal",
selenium.getText("//div[@id='center']/div/div/table/tbody/tr[4]/td[6]"));
selenium.click("link=Home");
@@ -74,7 +74,7 @@
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=images");
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isElementPresent("link=jbosslogo.png"));
+ Assert.assertTrue(selenium.isElementPresent("link=jbosslogo.png"),"jboss
logo link not found");
}
/**
@@ -154,22 +154,12 @@
selenium.select(INP_FC_LANGUAGE, "label=Czech");
selenium.click(INP_FC_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.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);
+ Assert.assertTrue(findTableRow(TBL_CMS_FILEVER, "text/plain", 0) >=
0,"file content type not found in the table");
+ Assert.assertTrue(findTableRow(TBL_CMS_FILEVER, "0kb", 1) >= 0,"file
size not found in the table");
+ Assert.assertTrue(findTableRow(TBL_CMS_FILEVER, "1.0", 2) >= 0,"file
version not found in the table");
+ Assert.assertTrue(findTableRow(TBL_CMS_FILEVER, "newFile title", 5) >=
0,"file title not found in the table");
selenium.click("link=Home");
selenium.waitForPageToLoad(PAGE_LOAD);
@@ -259,7 +249,7 @@
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click(INP_FC_SAVE);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isTextPresent("1.1"));
+ Assert.assertTrue(selenium.isTextPresent("1.1"),"correct version string
not found");
Assert.assertTrue(selenium.isElementPresent("//div[@id='center']/div/div/table/tbody/tr[5]/td[3]/img"));
selenium.click("link=Home");
@@ -295,9 +285,9 @@
selenium.waitForPageToLoad(PAGE_LOAD);
Assert.assertEquals("Czech", selenium.getText("link=Czech"));
Assert.assertEquals("text/plain",
selenium.getText("link=text/plain"));
- Assert.assertTrue(selenium.isTextPresent("1.0"));
- Assert.assertTrue(selenium.isTextPresent("1.1"));
- Assert.assertFalse(selenium.isTextPresent("1.2"));
+ Assert.assertTrue(selenium.isTextPresent("1.0"),"correct version string
not found");
+ Assert.assertTrue(selenium.isTextPresent("1.1"),"correct version string
not found");
+ Assert.assertFalse(selenium.isTextPresent("1.2"),"uncorrect version
string was found");
selenium.click("link=Home");
selenium.waitForPageToLoad(PAGE_LOAD);
Assert.assertEquals("existingFile", selenium.getText("link=" +
filename));
@@ -443,9 +433,9 @@
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?"));
+ Assert.assertTrue(selenium.isTextPresent("Confirm Deletion of
/newFile"),"confirmation message missing or other than expected");
+ Assert.assertTrue(selenium.isTextPresent("WARNING! You will not be able to undo
these change!"),"confirmation message missing or other than expected");
+ Assert.assertTrue(selenium.isTextPresent("Are you sure you want to delete this
resource?"),"confirmation message missing or other than expected");
selenium.click("cancel");
selenium.waitForPageToLoad(PAGE_LOAD);
@@ -455,9 +445,9 @@
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?"));
+ Assert.assertTrue(selenium.isTextPresent("Confirm Deletion of
/newFile"),"confirmation message missing or other than expected");
+ Assert.assertTrue(selenium.isTextPresent("WARNING! You will not be able to undo
these change!"),"confirmation message missing or other than expected");
+ Assert.assertTrue(selenium.isTextPresent("Are you sure you want to delete this
resource?"),"confirmation message missing or other than expected");
selenium.click("submit");
selenium.waitForPageToLoad(PAGE_LOAD);
}
@@ -510,9 +500,9 @@
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!"));
- Assert.assertTrue(selenium.isTextPresent("Are you sure you want to delete this
resource?"));
+ Assert.assertTrue(selenium.isTextPresent("Confirm Deletion of /" +
name),"confirmation message not found");
+ Assert.assertTrue(selenium.isTextPresent("WARNING! You will not be able to undo
these change!"),"confirmation message not found");
+ Assert.assertTrue(selenium.isTextPresent("Are you sure you want to delete this
resource?"),"confirmation message not found");
selenium.click("submit");
selenium.waitForPageToLoad(PAGE_LOAD);
logout();
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileWorkflowTestCase.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileWorkflowTestCase.java 2009-06-24
23:28:48 UTC (rev 13498)
+++
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileWorkflowTestCase.java 2009-06-25
11:48:06 UTC (rev 13499)
@@ -109,10 +109,10 @@
int row = countTableRows(CMS_WF_TABLE) - 1;
Assert.assertEquals(row, 1, "More instances of newly created document
exists.");
- Assert.assertTrue(selenium.isTextPresent("Pending Approval Queue"));
- Assert.assertTrue(selenium.isElementPresent(LNK_PREVIEW));
- Assert.assertTrue(selenium.isElementPresent(LNK_APPROVE));
- Assert.assertTrue(selenium.isElementPresent(LNK_DENY));
+ Assert.assertTrue(selenium.isTextPresent("Pending Approval
Queue"),"pending queue text not found");
+ Assert.assertTrue(selenium.isElementPresent(LNK_PREVIEW), "preview link not
found");
+ Assert.assertTrue(selenium.isElementPresent(LNK_APPROVE), "approve link not
found");
+ Assert.assertTrue(selenium.isElementPresent(LNK_DENY), "deny link not
found");
selenium.click(LNK_APPROVE);
selenium.waitForPageToLoad(PAGE_LOAD);
@@ -146,10 +146,10 @@
int row = countTableRows(CMS_WF_TABLE) - 1;
Assert.assertEquals(row, 1, "More instances of newly created document
exists.");
- Assert.assertTrue(selenium.isTextPresent("Pending Approval Queue"));
- Assert.assertTrue(selenium.isElementPresent(LNK_PREVIEW));
- Assert.assertTrue(selenium.isElementPresent(LNK_APPROVE));
- Assert.assertTrue(selenium.isElementPresent(LNK_DENY));
+ Assert.assertTrue(selenium.isTextPresent("Pending Approval
Queue"),"pending queue text not found");
+ Assert.assertTrue(selenium.isElementPresent(LNK_PREVIEW), "preview link not
found");
+ Assert.assertTrue(selenium.isElementPresent(LNK_APPROVE), "approve link not
found");
+ Assert.assertTrue(selenium.isElementPresent(LNK_DENY), "deny link not
found");
selenium.click(LNK_DENY);
selenium.waitForPageToLoad(PAGE_LOAD);
@@ -187,10 +187,10 @@
selenium.click(LNK_PREVIEW);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isTextPresent("Pending Approval Queue"));
+ Assert.assertTrue(selenium.isTextPresent("Pending Approval
Queue"),"pending queue text not found");
selenium.selectFrame(WYSIWYG_EDITOR_LOCATOR);
- Assert.assertTrue(selenium.isTextPresent("vivat!"));
+ Assert.assertTrue(selenium.isTextPresent("vivat!"),"file content text
not found");
selenium.selectFrame("relative=top");
}
@@ -216,9 +216,9 @@
selenium.click(MessageFormat.format(CMS_T_SUBMIT, row));
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?"));
+ Assert.assertTrue(selenium.isTextPresent("Confirm Deletion of
/newFile"),"confirmation message not found");
+ Assert.assertTrue(selenium.isTextPresent("WARNING! You will not be able to undo
these change!"),"confirmation message not found");
+ Assert.assertTrue(selenium.isTextPresent("Are you sure you want to delete this
resource?"),"confirmation message not found");
selenium.click(SUB_FILE_CREATE_CANCEL);
selenium.waitForPageToLoad(PAGE_LOAD);
@@ -229,9 +229,9 @@
selenium.click(MessageFormat.format(CMS_T_SUBMIT, row));
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?"));
+ Assert.assertTrue(selenium.isTextPresent("Confirm Deletion of
/newFile"),"confirmation message not found");
+ Assert.assertTrue(selenium.isTextPresent("WARNING! You will not be able to undo
these change!"),"confirmation message not found");
+ Assert.assertTrue(selenium.isTextPresent("Are you sure you want to delete this
resource?"),"confirmation message not found");
selenium.click(SUB_MOVE);
selenium.waitForPageToLoad(PAGE_LOAD);
Assert.assertFalse(selenium.isTextPresent("newFile"));
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileWorkflowUploadTestCase.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileWorkflowUploadTestCase.java 2009-06-24
23:28:48 UTC (rev 13498)
+++
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileWorkflowUploadTestCase.java 2009-06-25
11:48:06 UTC (rev 13499)
@@ -123,15 +123,15 @@
selenium.click(SUB_FIL_SUBMIT);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isElementPresent(LNK_PREVIEW));
- Assert.assertTrue(selenium.isElementPresent(LNK_APPROVE));
- Assert.assertTrue(selenium.isElementPresent(LNK_DENY));
+ Assert.assertTrue(selenium.isElementPresent(LNK_PREVIEW),"preview link not
found");
+ Assert.assertTrue(selenium.isElementPresent(LNK_APPROVE),"approve link not
found");
+ Assert.assertTrue(selenium.isElementPresent(LNK_DENY),"deny link not
found");
selenium.click(LNK_APPROVE);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isTextPresent(fileName));
- Assert.assertTrue(selenium.isElementPresent("link=text/plain"));
+ Assert.assertTrue(selenium.isTextPresent(fileName),"filename not found on
screen");
+ Assert.assertTrue(selenium.isElementPresent("link=text/plain"),"link
about content format missing");
int r = findTableRow(TAB_FILE_VER, "file to upload", 5);
@@ -172,9 +172,9 @@
selenium.click(SUB_FIL_SUBMIT);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isElementPresent(LNK_PREVIEW));
- Assert.assertTrue(selenium.isElementPresent(LNK_APPROVE));
- Assert.assertTrue(selenium.isElementPresent(LNK_DENY));
+ Assert.assertTrue(selenium.isElementPresent(LNK_PREVIEW),"preview link not
found");
+ Assert.assertTrue(selenium.isElementPresent(LNK_APPROVE),"approve link not
found");
+ Assert.assertTrue(selenium.isElementPresent(LNK_DENY),"deny link not
found");
selenium.click(LNK_DENY);
selenium.waitForPageToLoad(PAGE_LOAD);
@@ -214,9 +214,9 @@
selenium.click(SUB_FIL_SUBMIT);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isElementPresent(LNK_PREVIEW));
- Assert.assertTrue(selenium.isElementPresent(LNK_APPROVE));
- Assert.assertTrue(selenium.isElementPresent(LNK_DENY));
+ Assert.assertTrue(selenium.isElementPresent(LNK_PREVIEW),"preview link not
found");
+ Assert.assertTrue(selenium.isElementPresent(LNK_APPROVE),"approve link not
found");
+ Assert.assertTrue(selenium.isElementPresent(LNK_DENY),"deny link not
found");
selenium.click(LNK_PREVIEW);
selenium.waitForPageToLoad(PAGE_LOAD);
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSSecureTestCase.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSSecureTestCase.java 2009-06-24
23:28:48 UTC (rev 13498)
+++
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSSecureTestCase.java 2009-06-25
11:48:06 UTC (rev 13499)
@@ -309,11 +309,11 @@
logout();
- Assert.assertTrue(selenium.isTextPresent(MSG_ACCESS_DENIED));
+ Assert.assertTrue(selenium.isTextPresent(MSG_ACCESS_DENIED),"access denied message
not found");
login("user", "user");
- Assert.assertTrue(selenium.isTextPresent(MSG_ACCESS_DENIED));
+ Assert.assertTrue(selenium.isTextPresent(MSG_ACCESS_DENIED),"access denied message
not found");
logout();
}
@@ -360,12 +360,12 @@
selenium.open("/portal/portal/default");
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertFalse(selenium.isTextPresent("Enteprise Portal Platform"));
- Assert.assertTrue(selenium.isElementPresent("//img[@alt='JBoss Portal 2.7: Go
Faster!']"));
+ Assert.assertFalse(selenium.isTextPresent("Enteprise Portal
Platform"),"JBoss portal name was found on default page");
+ Assert.assertTrue(selenium.isElementPresent("//img[@alt='JBoss Portal 2.7: Go
Faster!']"),"JBoss portal logo not found on default page");
selenium.click(LNK_EXPLORE);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isTextPresent("Enteprise Portal Platform"));
- Assert.assertFalse(selenium.isElementPresent("//img[@alt='JBoss Portal 2.7: Go
Faster!']"));
+ Assert.assertTrue(selenium.isTextPresent("Enteprise Portal
Platform"),"JBoss portal name is not found on explore page");
+ Assert.assertFalse(selenium.isElementPresent("//img[@alt='JBoss Portal 2.7: Go
Faster!']"),"JBoss portal logo is found on explore page");
login("admin", "admin");
selenium.click(LNK_ADMIN);
@@ -389,7 +389,7 @@
logout();
Assert.assertFalse(selenium.isTextPresent("Enteprise Portal Platform"));
- Assert.assertTrue(selenium.isElementPresent("//img[@alt='JBoss Portal 2.7: Go
Faster!']"));
+ Assert.assertTrue(selenium.isElementPresent("//img[@alt='JBoss Portal 2.7: Go
Faster!']"),"jboss portal logo not found");
selenium.open("/portal/portal/default");
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click(LNK_EXPLORE);
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/locator.properties
===================================================================
---
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/locator.properties 2009-06-24
23:28:48 UTC (rev 13498)
+++
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/locator.properties 2009-06-25
11:48:06 UTC (rev 13499)
@@ -1,7 +1,7 @@
# JBossPortalSeleniumTestCase
portal.lnk.logout=link=Logout
-portal.sub.login=login
+portal.sub.login=login-submit
portal.adr.portal=/portal/
portal.frm.login.content=login-content
portal.inp.password=//input[contains(@id,'j_password')]
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-24
23:28:48 UTC (rev 13498)
+++
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java 2009-06-25
11:48:06 UTC (rev 13499)
@@ -1079,7 +1079,7 @@
selenium.click(INPUT_SUBMIT_CREATEPORTAL);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isTextPresent("is an invalid portal name"));
+ Assert.assertTrue(selenium.isTextPresent("is an invalid portal
name"),"validation message not found");
}
@@ -1117,7 +1117,7 @@
selenium.click(INPUT_SUBMIT_PAGECREATE);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isTextPresent(MSG_PAGE_NAME_VALID));
+ Assert.assertTrue(selenium.isTextPresent(MSG_PAGE_NAME_VALID),"validation message
missing or other than expected");
}
/**
@@ -1158,7 +1158,7 @@
selenium.click(SUB_LAYOUT_ADD_CENTER);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isTextPresent(MSG_WINDOW_NAME_VALID));
+ Assert.assertTrue(selenium.isTextPresent(MSG_WINDOW_NAME_VALID),"validation
message missing or other than expected");
}
@@ -1200,7 +1200,7 @@
selenium.click(SUB_PP_PROPADD);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isTextPresent(MSG_PROP_NAME_VALID));
+ Assert.assertTrue(selenium.isTextPresent(MSG_PROP_NAME_VALID),"validation message
missing or other than expected");
selenium.type(INP_PP_PROPNAME, "XssValuesProp");
selenium.click(SUB_PP_PROPADD);
@@ -1212,7 +1212,7 @@
selenium.click(SUB_PP_PROPVAL_UPDATE);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isTextPresent(MSG_PROP_VAL_VALID));
+ Assert.assertTrue(selenium.isTextPresent(MSG_PROP_VAL_VALID),"validation message
missing or other than expected");
// redirection
@@ -1221,14 +1221,14 @@
selenium.type(INP_PP_RES_INPUT, XSS_STR1);
selenium.click(SUB_PP_ERROR_FORM_UPDATE);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isTextPresent(MSG_PORTAL_ERR_VALID));
+ Assert.assertTrue(selenium.isTextPresent(MSG_PORTAL_ERR_VALID),"validation message
missing or other than expected");
check(CHK_PPA_RES_CHECK, false);
waitFor(AJAX_LOAD);
selenium.type(INP_PPA_RES_SELECT, XSS_STR1);
selenium.click(SUB_PPA_FORM_UPDATE);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isTextPresent(MSG_PAGE_ERR_VALID));
+ Assert.assertTrue(selenium.isTextPresent(MSG_PAGE_ERR_VALID),"validation message
missing or other than expected");
}
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/DashboardsTestCase.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/DashboardsTestCase.java 2009-06-24
23:28:48 UTC (rev 13498)
+++
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/DashboardsTestCase.java 2009-06-25
11:48:06 UTC (rev 13499)
@@ -79,7 +79,7 @@
selenium.type(INPUT_PROP_NAME, propName);
selenium.click(SUBMIT_ADD_PROP);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isTextPresent(propName));
+ Assert.assertTrue(selenium.isTextPresent(propName),"property name string not
found");
}
/**
@@ -95,7 +95,7 @@
selenium.type(INPUT_PROP_NAME, XSS_STR1);
selenium.click(SUBMIT_ADD_PROP);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isTextPresent(MSG_PROP_ADD_VALID));
+ Assert.assertTrue(selenium.isTextPresent(MSG_PROP_ADD_VALID),"validation message
missing or other than expected");
}
/**
@@ -112,7 +112,7 @@
selenium.type(INPUT_PROP_NAME, propName);
selenium.click(SUBMIT_ADD_PROP);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isTextPresent(propName));
+ Assert.assertTrue(selenium.isTextPresent(propName),"property name string not
found");
int r = findTableRow(TABLE_PROPS, propName, 1);
@@ -138,7 +138,7 @@
selenium.type(INPUT_PROP_NAME, propName);
selenium.click(SUBMIT_ADD_PROP);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isTextPresent(propName));
+ Assert.assertTrue(selenium.isTextPresent(propName),"property name string not
found");
int r = findTableRow(TABLE_PROPS, propName, 1);
@@ -146,7 +146,7 @@
selenium.click(SUBMIT_UPDATE_VALUE);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isTextPresent(MSG_PROP_UPDATE_VALID));
+ Assert.assertTrue(selenium.isTextPresent(MSG_PROP_UPDATE_VALID),"validation
message missing or other than expected");
}
/**
@@ -163,7 +163,7 @@
selenium.click(SUBMIT_ADD_PROP);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isTextPresent(propName));
+ Assert.assertTrue(selenium.isTextPresent(propName),"property name string not
found");
int r = findTableRow(TABLE_PROPS, propName, 0);
@@ -216,7 +216,7 @@
selenium.click(T_PO_SUB_UPDATE);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isTextPresent(MSG_PORTAL_ERR_VALID));
+ Assert.assertTrue(selenium.isTextPresent(MSG_PORTAL_ERR_VALID),"validation message
missing or other than expected");
}
/**
@@ -265,7 +265,7 @@
selenium.click(T_PA_SUB_UPDATE);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isTextPresent(MSG_PAGE_ERR_VALID));
+ Assert.assertTrue(selenium.isTextPresent(MSG_PAGE_ERR_VALID),"validation message
missing or other than expected");
}
/**
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-24
23:28:48 UTC (rev 13498)
+++
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/EndtoEndPortalAdminTestCase.java 2009-06-25
11:48:06 UTC (rev 13499)
@@ -197,11 +197,11 @@
selenium.open(ADR_PORTAL);
selenium.waitForPageToLoad(PAGE_LOAD);
Assert.assertEquals("", selenium.getText(DIV_PORT_CONTENT));
- Assert.assertTrue(selenium.isElementPresent("link=" + page1Name));
- Assert.assertTrue(selenium.isElementPresent("link=" + page2Name));
- Assert.assertTrue(selenium.isElementPresent("link=" + page3Name));
- Assert.assertTrue(selenium.isElementPresent("link=" + page4Name));
- Assert.assertTrue(selenium.isElementPresent("link=" + page5Name));
+ Assert.assertTrue(selenium.isElementPresent("link=" + page1Name),"link
"+page1Name+" not found");
+ Assert.assertTrue(selenium.isElementPresent("link=" + page2Name),"link
"+page2Name+" not found");
+ Assert.assertTrue(selenium.isElementPresent("link=" + page3Name),"link
"+page3Name+" not found");
+ Assert.assertTrue(selenium.isElementPresent("link=" + page4Name),"link
"+page4Name+" not found");
+ Assert.assertTrue(selenium.isElementPresent("link=" + page5Name),"link
"+page5Name+" not found");
// Assert pages contain what they should
assertPageContains(page1Name, por1str);
@@ -497,7 +497,7 @@
selenium.click(INP_SUBMIT_CREATEPORTAL);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isTextPresent(portalName));
+ Assert.assertTrue(selenium.isTextPresent(portalName),"portal name string not
found");
}
private void addPage(String portalName, String pageName) {
@@ -521,12 +521,12 @@
selenium.waitForPageToLoad(PAGE_LOAD);
Assert.assertFalse(selenium.isTextPresent(pageName), "Portal page already
present");
- Assert.assertTrue(selenium.isTextPresent("Create a page named:"));
+ Assert.assertTrue(selenium.isTextPresent("Create a page named:"),"create
page label string not found");
selenium.type(INP_PAGENAME, pageName);
selenium.click(INP_SUBMIT_PAGECREATE);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isTextPresent(pageName));
+ Assert.assertTrue(selenium.isTextPresent(pageName),"page name string not
found");
}
private void addPortlet(String portalName, String pageName, String portletName, String
type) {
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PageCoordinationTestCase.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PageCoordinationTestCase.java 2009-06-24
23:28:48 UTC (rev 13498)
+++
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PageCoordinationTestCase.java 2009-06-25
11:48:06 UTC (rev 13499)
@@ -94,20 +94,20 @@
@Test(enabled = true)
public void testDefaultPageCoordination(){
openAndWait("/portal/auth/portal/default/Coordination+Samples");
- Assert.assertTrue(selenium.isTextPresent("Weather for (my_zipcode):null"));
- Assert.assertTrue(selenium.isTextPresent("Map for (your_zipcode):null"));
+ Assert.assertTrue(selenium.isTextPresent("Weather for
(my_zipcode):null"),"weather zipcode other than expected");
+ Assert.assertTrue(selenium.isTextPresent("Map for
(your_zipcode):null"),"map zipcode other than expected");
openAndWait("/portal/auth/portal/default/Coordination+Samples?zipcode=10101");
- Assert.assertTrue(selenium.isTextPresent("Weather for (my_zipcode):null"));
- Assert.assertTrue(selenium.isTextPresent("Map for (your_zipcode):10101"));
+ Assert.assertTrue(selenium.isTextPresent("Weather for
(my_zipcode):null"),"weather zipcode other than expected");
+ Assert.assertTrue(selenium.isTextPresent("Map for
(your_zipcode):10101"),"map zipcode other than expected");
openAndWait("/portal/auth/portal/default/Coordination+Samples?zip=10102");
- Assert.assertTrue(selenium.isTextPresent("Weather for (my_zipcode):10102"));
- Assert.assertTrue(selenium.isTextPresent("Map for (your_zipcode):10102"));
+ Assert.assertTrue(selenium.isTextPresent("Weather for
(my_zipcode):10102"),"weather zipcode other than expected");
+ Assert.assertTrue(selenium.isTextPresent("Map for
(your_zipcode):10102"),"map zipcode other than expected");
openAndWait("/portal/auth/portal/default/Coordination+Samples?zipcode=10103");
- Assert.assertTrue(selenium.isTextPresent("Weather for (my_zipcode):null"));
- Assert.assertTrue(selenium.isTextPresent("Map for (your_zipcode):10103"));
+ Assert.assertTrue(selenium.isTextPresent("Weather for
(my_zipcode):null"),"weather zipcode other than expected");
+ Assert.assertTrue(selenium.isTextPresent("Map for
(your_zipcode):10103"),"map zipcode other than expected");
}
/**
@@ -154,8 +154,8 @@
selenium.waitForPageToLoad(PAGE_LOAD);
openAndWait("/portal/auth/portal/default/Coordination+Samples?aliasBindTest=222333");
- Assert.assertTrue(selenium.isTextPresent("Weather for (my_zipcode):null"));
- Assert.assertTrue(selenium.isTextPresent("Map for (your_zipcode):222333"));
+ Assert.assertTrue(selenium.isTextPresent("Weather for
(my_zipcode):null"),"weather zipcode other than expected");
+ Assert.assertTrue(selenium.isTextPresent("Map for
(your_zipcode):222333"),"map zipcode other than expected");
}
@@ -184,7 +184,7 @@
debugScreenshot(++count + ".jpg");
clickIfVisible(LINK_PORTAL_HOME);
debugScreenshot(++count + ".jpg");
- Assert.assertTrue(selenium.isTextPresent("Create a portal named:"));
+ Assert.assertTrue(selenium.isTextPresent("Create a portal
named:"),"create portal label not found");
int r = findTableRow(TABLE_PORTAL_ADMIN, portalName, 0) - 1;
debugPrint("Position of admin portal : " +
findTableRow(TABLE_PORTAL_ADMIN, "admin", 0));
@@ -380,7 +380,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 message not found");
int r = findTableRow(TABLE_PORTAL_ADMIN, portalName, 0) - 1;
clickAndWait(MessageFormat.format(POR_TL_MAIN, r));
@@ -402,7 +402,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 message not found");
r = findTableRow(TABLE_PORTAL_ADMIN, portalName, 0) - 1;
clickAndWait(MessageFormat.format(POR_TL_MAIN, r));
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletDefinitionsTestCase.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletDefinitionsTestCase.java 2009-06-24
23:28:48 UTC (rev 13498)
+++
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletDefinitionsTestCase.java 2009-06-25
11:48:06 UTC (rev 13499)
@@ -107,7 +107,7 @@
selenium.type(INPUT_INSTANCE_NAME, XSS_STR1);
selenium.click(SUBMIT_CREATE_INST);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isTextPresent(MSG_INS_NAME_VALID));
+ Assert.assertTrue(selenium.isTextPresent(MSG_INS_NAME_VALID),"validation message
missing or other than expected");
}
/**
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java 2009-06-24
23:28:48 UTC (rev 13498)
+++
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java 2009-06-25
11:48:06 UTC (rev 13499)
@@ -423,7 +423,7 @@
selenium.open("/portal/auth/portal/default/");
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isTextPresent("Greetings !"));
+ Assert.assertTrue(selenium.isTextPresent("Greetings !"),"greetings
message not found");
// then cancel
@@ -442,7 +442,7 @@
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.open("/portal/auth/portal/default/");
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isTextPresent("Greetings !"));
+ Assert.assertTrue(selenium.isTextPresent("Greetings !"),"greetings
message not found");
// then really stop the greetings portlet
goToPI();
@@ -477,8 +477,8 @@
Assert.assertTrue(selenium.isElementPresent(MessageFormat.format(LNK_INSTANCE_BUTTON,
r)), instance_name + " portlet not found.");
clickAndWait(MessageFormat.format(LNK_DEL_BUTTON, r));
- Assert.assertTrue(selenium.isTextPresent("WARNING!"));
- Assert.assertTrue(selenium.isTextPresent("Are you sure you want to delete this
portlet instance ?"));
+ Assert.assertTrue(selenium.isTextPresent("WARNING!"),"warning message
not found");
+ Assert.assertTrue(selenium.isTextPresent("Are you sure you want to delete this
portlet instance ?"),"warning message not found");
selenium.click(SUBMIT_PI_DELETE_CANC);
selenium.waitForPageToLoad(PAGE_LOAD);
@@ -488,8 +488,8 @@
Assert.assertTrue(selenium.isElementPresent(MessageFormat.format(LNK_INSTANCE_BUTTON,
r)), instance_name + " portlet not found.");
clickAndWait(MessageFormat.format(LNK_DEL_BUTTON, r));
- Assert.assertTrue(selenium.isTextPresent("WARNING!"));
- Assert.assertTrue(selenium.isTextPresent("Are you sure you want to delete this
portlet instance ?"));
+ Assert.assertTrue(selenium.isTextPresent("WARNING!"),"warning message
not found");
+ Assert.assertTrue(selenium.isTextPresent("Are you sure you want to delete this
portlet instance ?"),"warning message not found");
selenium.click(SUBMIT_PI_DELETE_CONF);
selenium.waitForPageToLoad(PAGE_LOAD);