Test Fixes - properties/managepages

liferay · Nov 21, 2012 · 0aea6bf · 0aea6bf
1 parent fb30a64
commit 0aea6bf
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 26 deletions.
diff --git a/...portal/controlpanel/webcontent/wcwebcontent/addwcwebcontent/TearDownWCWebContentTest.html b/...portal/controlpanel/webcontent/wcwebcontent/addwcwebcontent/TearDownWCWebContentTest.html
@@ -58,6 +58,11 @@
 	<td>!${webContentPresent}</td>
 	<td>WebContentNotPresent</td>
 </tr>
+<tr>
+	<td>assertNotChecked</td>
+	<td>//input[@id='_15_allRowIdsCheckbox']</td>
+	<td>Select All</td>
+</tr>
 <tr>
 	<td>clickAt</td>
 	<td>//input[@id='_15_allRowIdsCheckbox']</td>

diff --git a/...portal/controlpanel/webcontent/wcwebcontent/addwcwebcontent/TearDownWCWebContentTest.java b/...portal/controlpanel/webcontent/wcwebcontent/addwcwebcontent/TearDownWCWebContentTest.java
@@ -54,6 +54,8 @@ public void testTearDownWCWebContent() throws Exception {
 					continue;
 				}
 
+				assertFalse(selenium.isChecked(
+						"//input[@id='_15_allRowIdsCheckbox']"));
 				selenium.clickAt("//input[@id='_15_allRowIdsCheckbox']",
 					RuntimeVariables.replace("Select All"));
 				assertTrue(selenium.isChecked(

diff --git a/...eray/portalweb/properties/managepages/layouttypes/savepagetypewebcontent/AddPageTest.html b/...eray/portalweb/properties/managepages/layouttypes/savepagetypewebcontent/AddPageTest.html
@@ -51,12 +51,17 @@
 <tr>
 	<td>waitForElementPresent</td>
 	<td>//iframe[contains(@id,'manageContentDialog')]</td>
-	<td>Manage Page iFrame</td>
+	<td>Manage Page</td>
 </tr>
 <tr>
 	<td>selectFrame</td>
 	<td>//iframe[contains(@id,'manageContentDialog')]</td>
-	<td>Manage Page iFrame</td>
+	<td>Manage Page</td>
+</tr>
+<tr>
+	<td>waitForElementPresent</td>
+	<td>//script[contains(@src,'/liferay/search_container.js')]</td>
+	<td>Search Container</td>
 </tr>
 <tr>
 	<td>waitForText</td>
@@ -105,22 +110,17 @@
 </tr>
 <tr>
 	<td>waitForVisible</td>
-	<td>//div[@id='_88_layoutSetToolbar']/span/button[1]</td>
+	<td>//div[@id='_88_layoutSetToolbar']/span/button[contains(.,'Add Page')]</td>
 	<td>Add Page</td>
 </tr>
 <tr>
 	<td>assertText</td>
-	<td>//div[@id='_88_layoutSetToolbar']/span/button[1]</td>
+	<td>//div[@id='_88_layoutSetToolbar']/span/button[contains(.,'Add Page')]</td>
 	<td>Add Page</td>
 </tr>
-<tr>
-	<td>pause</td>
-	<td>5000</td>
-	<td></td>
-</tr>
 <tr>
 	<td>clickAt</td>
-	<td>//div[@id='_88_layoutSetToolbar']/span/button[1]</td>
+	<td>//div[@id='_88_layoutSetToolbar']/span/button[contains(.,'Add Page')]</td>
 	<td>Add Page</td>
 </tr>
 <tr>

diff --git a/...eray/portalweb/properties/managepages/layouttypes/savepagetypewebcontent/AddPageTest.java b/...eray/portalweb/properties/managepages/layouttypes/savepagetypewebcontent/AddPageTest.java
@@ -46,6 +46,8 @@ public void testAddPage() throws Exception {
 					"//iframe[contains(@id,'manageContentDialog')]");
 				selenium.selectFrame(
 					"//iframe[contains(@id,'manageContentDialog')]");
+				selenium.waitForElementPresent(
+					"//script[contains(@src,'/liferay/search_container.js')]");
 				selenium.waitForText("//a[@class='layout-tree']", "Public Pages");
 				assertEquals(RuntimeVariables.replace("Public Pages"),
 					selenium.getText("//a[@class='layout-tree']"));
@@ -70,12 +72,11 @@ public void testAddPage() throws Exception {
 				selenium.clickAt("//a[@class='layout-tree']",
 					RuntimeVariables.replace("Public Pages"));
 				selenium.waitForVisible(
-					"//div[@id='_88_layoutSetToolbar']/span/button[1]");
+					"//div[@id='_88_layoutSetToolbar']/span/button[contains(.,'Add Page')]");
 				assertEquals(RuntimeVariables.replace("Add Page"),
 					selenium.getText(
-						"//div[@id='_88_layoutSetToolbar']/span/button[1]"));
-				Thread.sleep(5000);
-				selenium.clickAt("//div[@id='_88_layoutSetToolbar']/span/button[1]",
+						"//div[@id='_88_layoutSetToolbar']/span/button[contains(.,'Add Page')]"));
+				selenium.clickAt("//div[@id='_88_layoutSetToolbar']/span/button[contains(.,'Add Page')]",
 					RuntimeVariables.replace("Add Page"));
 				selenium.waitForVisible(
 					"//input[@id='_88_addLayoutName_en_US']");

diff --git a/...properties/managepages/layouttypes/savepagetypewebcontent/SavePageTypeWebContentTest.html b/...properties/managepages/layouttypes/savepagetypewebcontent/SavePageTypeWebContentTest.html
@@ -53,11 +53,6 @@
 	<td>//button[@title='List View']</td>
 	<td>List View</td>
 </tr>
-<tr>
-	<td>pause</td>
-	<td>5000</td>
-	<td></td>
-</tr>
 <tr>
 	<td>waitForVisible</td>
 	<td>//tr[contains(.,'WC WebContent Title')]/td[2]</td>
@@ -74,9 +69,9 @@
 	<td>Icon View</td>
 </tr>
 <tr>
-	<td>pause</td>
-	<td>5000</td>
-	<td></td>
+	<td>waitForVisible</td>
+	<td>//div[@class='entry-thumbnail']/img</td>
+	<td>Web Content Thumbnail</td>
 </tr>
 <tr>
 	<td>open</td>
@@ -121,12 +116,17 @@
 <tr>
 	<td>waitForElementPresent</td>
 	<td>//iframe[contains(@id,'manageContentDialog')]</td>
-	<td>Manage Page iFrame</td>
+	<td>Manage Page</td>
 </tr>
 <tr>
 	<td>selectFrame</td>
 	<td>//iframe[contains(@id,'manageContentDialog')]</td>
-	<td>Manage Page iFrame</td>
+	<td>Manage Page</td>
+</tr>
+<tr>
+	<td>waitForElementPresent</td>
+	<td>//script[contains(@src,'/liferay/search_container.js')]</td>
+	<td>Search Container</td>
 </tr>
 <tr>
 	<td>waitForText</td>

diff --git a/...properties/managepages/layouttypes/savepagetypewebcontent/SavePageTypeWebContentTest.java b/...properties/managepages/layouttypes/savepagetypewebcontent/SavePageTypeWebContentTest.java
@@ -46,7 +46,6 @@ public void testSavePageTypeWebContent() throws Exception {
 				selenium.waitForPageToLoad("30000");
 				selenium.clickAt("//button[@title='List View']",
 					RuntimeVariables.replace("List View"));
-				Thread.sleep(5000);
 				selenium.waitForVisible(
 					"//tr[contains(.,'WC WebContent Title')]/td[2]");
 
@@ -55,7 +54,7 @@ public void testSavePageTypeWebContent() throws Exception {
 				RuntimeVariables.setValue("articleID", articleID);
 				selenium.clickAt("//button[@title='Icon View']",
 					RuntimeVariables.replace("Icon View"));
-				Thread.sleep(5000);
+				selenium.waitForVisible("//div[@class='entry-thumbnail']/img");
 				selenium.open("/web/guest/home/");
 				selenium.clickAt("//div[@id='dockbar']",
 					RuntimeVariables.replace("Dockbar"));
@@ -73,6 +72,8 @@ public void testSavePageTypeWebContent() throws Exception {
 					"//iframe[contains(@id,'manageContentDialog')]");
 				selenium.selectFrame(
 					"//iframe[contains(@id,'manageContentDialog')]");
+				selenium.waitForElementPresent(
+					"//script[contains(@src,'/liferay/search_container.js')]");
 				selenium.waitForText("//a[@class='layout-tree']", "Public Pages");
 				assertEquals(RuntimeVariables.replace("Public Pages"),
 					selenium.getText("//a[@class='layout-tree']"));