Test Fixes

abdonpijpelink · Nov 16, 2011 · e2cee82 · e2cee82
1 parent 3dc9b60
commit e2cee82
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 7 deletions.
diff --git a/...s/kaleo/webcontent/wcwebcontent/addwebcontentscopepage/ConfigurePortletScopePageTest.html b/...s/kaleo/webcontent/wcwebcontent/addwebcontentscopepage/ConfigurePortletScopePageTest.html
@@ -33,6 +33,11 @@
 	<td>//strong/a</td>
 	<td>Options</td>
 </tr>
+<tr>
+	<td>clickAt</td>
+	<td>//strong/a</td>
+	<td>Options</td>
+</tr>
 <tr>
 	<td>waitForVisible</td>
 	<td>//div[@class='lfr-component lfr-menu-list']/ul/li[2]/a</td>

diff --git a/...s/kaleo/webcontent/wcwebcontent/addwebcontentscopepage/ConfigurePortletScopePageTest.java b/...s/kaleo/webcontent/wcwebcontent/addwebcontentscopepage/ConfigurePortletScopePageTest.java
@@ -46,6 +46,7 @@ public void testConfigurePortletScopePage() throws Exception {
 		Thread.sleep(5000);
 		assertEquals(RuntimeVariables.replace("Options"),
 			selenium.getText("//strong/a"));
+		selenium.clickAt("//strong/a", RuntimeVariables.replace("Options"));
 
 		for (int second = 0;; second++) {
 			if (second >= 90) {

diff --git a/.../organizationaddress/addorganizationaddresszipnull/AddOrganizationAddressZipNullTest.html b/.../organizationaddress/addorganizationaddresszipnull/AddOrganizationAddressZipNullTest.html
@@ -141,7 +141,7 @@
 <tr>
 	<td>assertText</td>
 	<td>xPath=(//div[@class='portlet-msg-error'])[2]</td>
-	<td>Please enter a valid zip.</td>
+	<td>Please enter a valid postal code.</td>
 </tr>
 
 </tbody></table>

diff --git a/.../organizationaddress/addorganizationaddresszipnull/AddOrganizationAddressZipNullTest.java b/.../organizationaddress/addorganizationaddresszipnull/AddOrganizationAddressZipNullTest.java
@@ -175,7 +175,8 @@ public void testAddOrganizationAddressZipNull() throws Exception {
 		assertEquals(RuntimeVariables.replace(
 				"Your request failed to complete."),
 			selenium.getText("xPath=(//div[@class='portlet-msg-error'])[1]"));
-		assertEquals(RuntimeVariables.replace("Please enter a valid zip."),
+		assertEquals(RuntimeVariables.replace(
+				"Please enter a valid postal code."),
 			selenium.getText("xPath=(//div[@class='portlet-msg-error'])[2]"));
 	}
 }
diff --git a/...nel/settings/settingsaddress/addsettingsaddresszipnull/AddSettingsAddressZipNullTest.html b/...nel/settings/settingsaddress/addsettingsaddresszipnull/AddSettingsAddressZipNullTest.html
@@ -86,7 +86,7 @@
 <tr>
 	<td>assertText</td>
 	<td>xPath=(//div[@class='portlet-msg-error'])[2]</td>
-	<td>Please enter a valid zip.</td>
+	<td>Please enter a valid postal code.</td>
 </tr>
 
 </tbody></table>

diff --git a/...nel/settings/settingsaddress/addsettingsaddresszipnull/AddSettingsAddressZipNullTest.java b/...nel/settings/settingsaddress/addsettingsaddresszipnull/AddSettingsAddressZipNullTest.java
@@ -102,7 +102,8 @@ public void testAddSettingsAddressZipNull() throws Exception {
 		assertEquals(RuntimeVariables.replace(
 				"Your request failed to complete."),
 			selenium.getText("xPath=(//div[@class='portlet-msg-error'])[1]"));
-		assertEquals(RuntimeVariables.replace("Please enter a valid zip."),
+		assertEquals(RuntimeVariables.replace(
+				"Please enter a valid postal code."),
 			selenium.getText("xPath=(//div[@class='portlet-msg-error'])[2]"));
 	}
 }
diff --git a/...ortal/controlpanel/users/useraddress/adduseraddresszipnull/AddUserAddressZipNullTest.html b/...ortal/controlpanel/users/useraddress/adduseraddresszipnull/AddUserAddressZipNullTest.html
@@ -96,7 +96,7 @@
 <tr>
 	<td>assertText</td>
 	<td>xPath=(//div[@class='portlet-msg-error'])[2]</td>
-	<td>Please enter a valid zip.</td>
+	<td>Please enter a valid postal code.</td>
 </tr>
 
 </tbody></table>

diff --git a/...ortal/controlpanel/users/useraddress/adduseraddresszipnull/AddUserAddressZipNullTest.java b/...ortal/controlpanel/users/useraddress/adduseraddresszipnull/AddUserAddressZipNullTest.java
@@ -104,7 +104,8 @@ public void testAddUserAddressZipNull() throws Exception {
 		assertEquals(RuntimeVariables.replace(
 				"Your request failed to complete."),
 			selenium.getText("xPath=(//div[@class='portlet-msg-error'])[1]"));
-		assertEquals(RuntimeVariables.replace("Please enter a valid zip."),
+		assertEquals(RuntimeVariables.replace(
+				"Please enter a valid postal code."),
 			selenium.getText("xPath=(//div[@class='portlet-msg-error'])[2]"));
 	}
 }
diff --git a/...rtalweb/portal/controlpanel/users/useraddress/adduseraddresszipnull/TearDownUserTest.html b/...rtalweb/portal/controlpanel/users/useraddress/adduseraddresszipnull/TearDownUserTest.html
@@ -54,7 +54,7 @@
 	<td>Select All</td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>clickAtAndWait</td>
 	<td>//input[@value='Deactivate']</td>
 	<td>Deactivate</td>
 </tr>

diff --git a/...rtalweb/portal/controlpanel/users/useraddress/adduseraddresszipnull/TearDownUserTest.java b/...rtalweb/portal/controlpanel/users/useraddress/adduseraddresszipnull/TearDownUserTest.java
@@ -69,6 +69,7 @@ public void testTearDownUser() throws Exception {
 						"xPath=(//input[@name='_125_allRowIds'])[2]"));
 				selenium.clickAt("//input[@value='Deactivate']",
 					RuntimeVariables.replace("Deactivate"));
+				selenium.waitForPageToLoad("30000");
 				assertTrue(selenium.getConfirmation()
 								   .matches("^Are you sure you want to deactivate the selected users[\\s\\S]$"));