diff --git a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ConfigurePage2PortletDLScopeLayoutCurrentPageTest.html b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ConfigurePage2PortletDLScopeLayoutCurrentPageTest.html index 4e726395e6220a..a1a55a923b75dd 100644 --- a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ConfigurePage2PortletDLScopeLayoutCurrentPageTest.html +++ b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ConfigurePage2PortletDLScopeLayoutCurrentPageTest.html @@ -86,17 +86,17 @@ select //select[@id='_86_scopeType'] - Select Layout + Select Page waitForVisible //label[@for='scopeLayoutUuid'] - Scope Layout + Scope Page assertText //label[@for='scopeLayoutUuid'] - Scope Layout + Scope Page select @@ -116,7 +116,7 @@ assertSelectedLabel //select[@id='_86_scopeType'] - Select Layout + Select Page assertSelectedLabel diff --git a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ConfigurePage2PortletDLScopeLayoutCurrentPageTest.java b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ConfigurePage2PortletDLScopeLayoutCurrentPageTest.java index d496f73a4325e5..2fde1126895bd1 100644 --- a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ConfigurePage2PortletDLScopeLayoutCurrentPageTest.java +++ b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ConfigurePage2PortletDLScopeLayoutCurrentPageTest.java @@ -134,7 +134,7 @@ public void testConfigurePage2PortletDLScopeLayoutCurrentPage() assertEquals(RuntimeVariables.replace("Scope"), selenium.getText("//label[@for='scopeType']")); selenium.select("//select[@id='_86_scopeType']", - RuntimeVariables.replace("Select Layout")); + RuntimeVariables.replace("Select Page")); for (int second = 0;; second++) { if (second >= 90) { @@ -152,7 +152,7 @@ public void testConfigurePage2PortletDLScopeLayoutCurrentPage() Thread.sleep(1000); } - assertEquals(RuntimeVariables.replace("Scope Layout"), + assertEquals(RuntimeVariables.replace("Scope Page"), selenium.getText("//label[@for='scopeLayoutUuid']")); selenium.select("//select[@id='_86_scopeLayoutUuid']", RuntimeVariables.replace("Current Page (DL Page2 Name)")); @@ -163,7 +163,7 @@ public void testConfigurePage2PortletDLScopeLayoutCurrentPage() assertEquals(RuntimeVariables.replace( "You have successfully updated the setup."), selenium.getText("//div[@class='portlet-msg-success']")); - assertEquals("Select Layout", + assertEquals("Select Page", selenium.getSelectedLabel("//select[@id='_86_scopeType']")); assertEquals("Current Page (DL Page2 Name)", selenium.getSelectedLabel("//select[@id='_86_scopeLayoutUuid']")); diff --git a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ConfigurePage3PortletDLScopeLayoutPage2Test.html b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ConfigurePage3PortletDLScopeLayoutPage2Test.html index d8f2c756146894..fdb259e9c11b1b 100644 --- a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ConfigurePage3PortletDLScopeLayoutPage2Test.html +++ b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ConfigurePage3PortletDLScopeLayoutPage2Test.html @@ -86,17 +86,17 @@ select //select[@id='_86_scopeType'] - Select Layout + Select Page waitForVisible //label[@for='scopeLayoutUuid'] - Scope Layout + Scope Page assertText //label[@for='scopeLayoutUuid'] - Scope Layout + Scope Page select @@ -116,7 +116,7 @@ assertSelectedLabel //select[@id='_86_scopeType'] - Select Layout + Select Page assertSelectedLabel diff --git a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ConfigurePage3PortletDLScopeLayoutPage2Test.java b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ConfigurePage3PortletDLScopeLayoutPage2Test.java index 61d68fca3abedf..b674e109bf6d53 100644 --- a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ConfigurePage3PortletDLScopeLayoutPage2Test.java +++ b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ConfigurePage3PortletDLScopeLayoutPage2Test.java @@ -133,7 +133,7 @@ public void testConfigurePage3PortletDLScopeLayoutPage2() assertEquals(RuntimeVariables.replace("Scope"), selenium.getText("//label[@for='scopeType']")); selenium.select("//select[@id='_86_scopeType']", - RuntimeVariables.replace("Select Layout")); + RuntimeVariables.replace("Select Page")); for (int second = 0;; second++) { if (second >= 90) { @@ -151,7 +151,7 @@ public void testConfigurePage3PortletDLScopeLayoutPage2() Thread.sleep(1000); } - assertEquals(RuntimeVariables.replace("Scope Layout"), + assertEquals(RuntimeVariables.replace("Scope Page"), selenium.getText("//label[@for='scopeLayoutUuid']")); selenium.select("//select[@id='_86_scopeLayoutUuid']", RuntimeVariables.replace("DL Page2 Name")); @@ -162,7 +162,7 @@ public void testConfigurePage3PortletDLScopeLayoutPage2() assertEquals(RuntimeVariables.replace( "You have successfully updated the setup."), selenium.getText("//div[@class='portlet-msg-success']")); - assertEquals("Select Layout", + assertEquals("Select Page", selenium.getSelectedLabel("//select[@id='_86_scopeType']")); assertEquals("DL Page2 Name", selenium.getSelectedLabel("//select[@id='_86_scopeLayoutUuid']")); diff --git a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/Guest_ViewPage2Folder2Test.html b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/Guest_ViewPage2Folder2Test.html index f3b29fc4e13eae..a7cd8ba858b8bf 100644 --- a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/Guest_ViewPage2Folder2Test.html +++ b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/Guest_ViewPage2Folder2Test.html @@ -35,7 +35,7 @@ assertVisible - //img[@src='/html/themes/classic/images/file_system/large/folder_full_document.png'] + //span[@class='document-thumbnail']/img Folder Image @@ -105,7 +105,7 @@ assertVisible - //img[@src='/html/themes/classic/images/file_system/large/folder_full_document.png'] + //span[@class='document-thumbnail']/img Folder Image diff --git a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/Guest_ViewPage2Folder2Test.java b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/Guest_ViewPage2Folder2Test.java index a623ce3ca7407b..bcdfd3e2539aff 100644 --- a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/Guest_ViewPage2Folder2Test.java +++ b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/Guest_ViewPage2Folder2Test.java @@ -68,8 +68,7 @@ public void testGuest_ViewPage2Folder2() throws Exception { assertEquals(RuntimeVariables.replace( "Documents and Media (DL Page2 Name)"), selenium.getText("//span[@class='portlet-title-text']")); - assertTrue(selenium.isVisible( - "//img[@src='/html/themes/classic/images/file_system/large/folder_full_document.png']")); + assertTrue(selenium.isVisible("//span[@class='document-thumbnail']/img")); assertEquals(RuntimeVariables.replace("DL Folder2 Name"), selenium.getText( "//a[contains(@class,'document-link')]/span[@class='entry-title']")); @@ -153,8 +152,7 @@ public void testGuest_ViewPage2Folder2() throws Exception { assertEquals(RuntimeVariables.replace( "Documents and Media (DL Page2 Name)"), selenium.getText("//span[@class='portlet-title-text']")); - assertTrue(selenium.isVisible( - "//img[@src='/html/themes/classic/images/file_system/large/folder_full_document.png']")); + assertTrue(selenium.isVisible("//span[@class='document-thumbnail']/img")); assertEquals(RuntimeVariables.replace("DL Folder2 Name"), selenium.getText( "//a[contains(@class,'document-link')]/span[@class='entry-title']")); diff --git a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/Guest_ViewPage2Folder3Test.html b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/Guest_ViewPage2Folder3Test.html index e45a4376a3b1cc..06fdd9733c38f0 100644 --- a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/Guest_ViewPage2Folder3Test.html +++ b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/Guest_ViewPage2Folder3Test.html @@ -35,7 +35,7 @@ assertVisible - //img[@src='/html/themes/classic/images/file_system/large/folder_empty.png'] + xPath=(//span[@class='document-thumbnail']/img)[2] Folder Image @@ -105,7 +105,7 @@ assertVisible - //img[@src='/html/themes/classic/images/file_system/large/folder_empty.png'] + xPath=(//span[@class='document-thumbnail']/img)[2] Folder Image diff --git a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/Guest_ViewPage2Folder3Test.java b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/Guest_ViewPage2Folder3Test.java index 20809d0b1c064f..ced5cf3c8f9bb8 100644 --- a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/Guest_ViewPage2Folder3Test.java +++ b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/Guest_ViewPage2Folder3Test.java @@ -69,7 +69,7 @@ public void testGuest_ViewPage2Folder3() throws Exception { "Documents and Media (DL Page2 Name)"), selenium.getText("//span[@class='portlet-title-text']")); assertTrue(selenium.isVisible( - "//img[@src='/html/themes/classic/images/file_system/large/folder_empty.png']")); + "xPath=(//span[@class='document-thumbnail']/img)[2]")); assertEquals(RuntimeVariables.replace("DL Folder3 Name"), selenium.getText( "xPath=(//a[contains(@class,'document-link')]/span[@class='entry-title'])[2]")); @@ -154,7 +154,7 @@ public void testGuest_ViewPage2Folder3() throws Exception { "Documents and Media (DL Page2 Name)"), selenium.getText("//span[@class='portlet-title-text']")); assertTrue(selenium.isVisible( - "//img[@src='/html/themes/classic/images/file_system/large/folder_empty.png']")); + "xPath=(//span[@class='document-thumbnail']/img)[2]")); assertEquals(RuntimeVariables.replace("DL Folder3 Name"), selenium.getText( "xPath=(//a[contains(@class,'document-link')]/span[@class='entry-title'])[2]")); diff --git a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/Guest_ViewPage2Folder4Test.html b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/Guest_ViewPage2Folder4Test.html index 1f3f35d0642e9b..3addbc5f825850 100644 --- a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/Guest_ViewPage2Folder4Test.html +++ b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/Guest_ViewPage2Folder4Test.html @@ -35,7 +35,7 @@ assertVisible - xPath=(//img[@src='/html/themes/classic/images/file_system/large/folder_empty.png'])[2] + xPath=(//span[@class='document-thumbnail']/img)[3] Folder Image @@ -105,7 +105,7 @@ assertVisible - xPath=(//img[@src='/html/themes/classic/images/file_system/large/folder_empty.png'])[2] + xPath=(//span[@class='document-thumbnail']/img)[3] Folder Image diff --git a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/Guest_ViewPage2Folder4Test.java b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/Guest_ViewPage2Folder4Test.java index 6fc89e7444ce43..9fa92891890244 100644 --- a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/Guest_ViewPage2Folder4Test.java +++ b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/Guest_ViewPage2Folder4Test.java @@ -69,7 +69,7 @@ public void testGuest_ViewPage2Folder4() throws Exception { "Documents and Media (DL Page2 Name)"), selenium.getText("//span[@class='portlet-title-text']")); assertTrue(selenium.isVisible( - "xPath=(//img[@src='/html/themes/classic/images/file_system/large/folder_empty.png'])[2]")); + "xPath=(//span[@class='document-thumbnail']/img)[3]")); assertEquals(RuntimeVariables.replace("DL Folder4 Name"), selenium.getText( "xPath=(//a[contains(@class,'document-link')]/span[@class='entry-title'])[3]")); @@ -154,7 +154,7 @@ public void testGuest_ViewPage2Folder4() throws Exception { "Documents and Media (DL Page2 Name)"), selenium.getText("//span[@class='portlet-title-text']")); assertTrue(selenium.isVisible( - "xPath=(//img[@src='/html/themes/classic/images/file_system/large/folder_empty.png'])[2]")); + "xPath=(//span[@class='document-thumbnail']/img)[3]")); assertEquals(RuntimeVariables.replace("DL Folder4 Name"), selenium.getText( "xPath=(//a[contains(@class,'document-link')]/span[@class='entry-title'])[3]")); diff --git a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/Guest_ViewPage2Folder5Test.html b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/Guest_ViewPage2Folder5Test.html index 9cb26c6421b2bf..e54d8a18f8a2ec 100644 --- a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/Guest_ViewPage2Folder5Test.html +++ b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/Guest_ViewPage2Folder5Test.html @@ -35,7 +35,7 @@ assertVisible - xPath=(//img[@src='/html/themes/classic/images/file_system/large/folder_empty.png'])[3] + xPath=(//span[@class='document-thumbnail']/img)[4] Folder Image @@ -105,7 +105,7 @@ assertVisible - xPath=(//img[@src='/html/themes/classic/images/file_system/large/folder_empty.png'])[3] + xPath=(//span[@class='document-thumbnail']/img)[4] Folder Image diff --git a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/Guest_ViewPage2Folder5Test.java b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/Guest_ViewPage2Folder5Test.java index 26ef1943457538..c440f2cb686b1a 100644 --- a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/Guest_ViewPage2Folder5Test.java +++ b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/Guest_ViewPage2Folder5Test.java @@ -69,7 +69,7 @@ public void testGuest_ViewPage2Folder5() throws Exception { "Documents and Media (DL Page2 Name)"), selenium.getText("//span[@class='portlet-title-text']")); assertTrue(selenium.isVisible( - "xPath=(//img[@src='/html/themes/classic/images/file_system/large/folder_empty.png'])[3]")); + "xPath=(//span[@class='document-thumbnail']/img)[4]")); assertEquals(RuntimeVariables.replace("DL Folder5 Name"), selenium.getText( "xPath=(//a[contains(@class,'document-link')]/span[@class='entry-title'])[4]")); @@ -154,7 +154,7 @@ public void testGuest_ViewPage2Folder5() throws Exception { "Documents and Media (DL Page2 Name)"), selenium.getText("//span[@class='portlet-title-text']")); assertTrue(selenium.isVisible( - "xPath=(//img[@src='/html/themes/classic/images/file_system/large/folder_empty.png'])[3]")); + "xPath=(//span[@class='document-thumbnail']/img)[4]")); assertEquals(RuntimeVariables.replace("DL Folder5 Name"), selenium.getText( "xPath=(//a[contains(@class,'document-link')]/span[@class='entry-title'])[4]")); diff --git a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/Guest_ViewPage2Folder6Test.html b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/Guest_ViewPage2Folder6Test.html index f45bf1cd7cf778..ba54d14a581535 100644 --- a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/Guest_ViewPage2Folder6Test.html +++ b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/Guest_ViewPage2Folder6Test.html @@ -35,7 +35,7 @@ assertVisible - xPath=(//img[@src='/html/themes/classic/images/file_system/large/folder_empty.png'])[4] + xPath=(//span[@class='document-thumbnail']/img)[5] Folder Image @@ -105,7 +105,7 @@ assertVisible - xPath=(//img[@src='/html/themes/classic/images/file_system/large/folder_empty.png'])[4] + xPath=(//span[@class='document-thumbnail']/img)[5] Folder Image diff --git a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/Guest_ViewPage2Folder6Test.java b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/Guest_ViewPage2Folder6Test.java index 56d0097e489d59..163c8c67c26232 100644 --- a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/Guest_ViewPage2Folder6Test.java +++ b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/Guest_ViewPage2Folder6Test.java @@ -69,7 +69,7 @@ public void testGuest_ViewPage2Folder6() throws Exception { "Documents and Media (DL Page2 Name)"), selenium.getText("//span[@class='portlet-title-text']")); assertTrue(selenium.isVisible( - "xPath=(//img[@src='/html/themes/classic/images/file_system/large/folder_empty.png'])[4]")); + "xPath=(//span[@class='document-thumbnail']/img)[5]")); assertEquals(RuntimeVariables.replace("DL Folder6 Name"), selenium.getText( "xPath=(//a[contains(@class,'document-link')]/span[@class='entry-title'])[5]")); @@ -154,7 +154,7 @@ public void testGuest_ViewPage2Folder6() throws Exception { "Documents and Media (DL Page2 Name)"), selenium.getText("//span[@class='portlet-title-text']")); assertTrue(selenium.isVisible( - "xPath=(//img[@src='/html/themes/classic/images/file_system/large/folder_empty.png'])[4]")); + "xPath=(//span[@class='document-thumbnail']/img)[5]")); assertEquals(RuntimeVariables.replace("DL Folder6 Name"), selenium.getText( "xPath=(//a[contains(@class,'document-link')]/span[@class='entry-title'])[5]")); diff --git a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/Guest_ViewPage2Folder7Test.html b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/Guest_ViewPage2Folder7Test.html index 69c04ca7c4da55..4179a8cc5fcce0 100644 --- a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/Guest_ViewPage2Folder7Test.html +++ b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/Guest_ViewPage2Folder7Test.html @@ -55,7 +55,7 @@ assertVisible - //img[@src='/html/themes/classic/images/file_system/large/folder_empty.png'] + //span[@class='document-thumbnail']/img Folder Image @@ -125,7 +125,7 @@ assertVisible - xPath=(//img[@src='/html/themes/classic/images/file_system/large/folder_empty.png'])[5] + xPath=(//span[@class='document-thumbnail']/img)[6] Folder Image diff --git a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/Guest_ViewPage2Folder7Test.java b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/Guest_ViewPage2Folder7Test.java index ca84a363eb3138..5c31c51e4d7364 100644 --- a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/Guest_ViewPage2Folder7Test.java +++ b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/Guest_ViewPage2Folder7Test.java @@ -92,8 +92,7 @@ public void testGuest_ViewPage2Folder7() throws Exception { Thread.sleep(1000); } - assertTrue(selenium.isVisible( - "//img[@src='/html/themes/classic/images/file_system/large/folder_empty.png']")); + assertTrue(selenium.isVisible("//span[@class='document-thumbnail']/img")); assertEquals(RuntimeVariables.replace("DL Folder7 Name"), selenium.getText( "//a[contains(@class,'document-link')]/span[@class='entry-title']")); @@ -178,7 +177,7 @@ public void testGuest_ViewPage2Folder7() throws Exception { "Documents and Media (DL Page2 Name)"), selenium.getText("//span[@class='portlet-title-text']")); assertTrue(selenium.isVisible( - "xPath=(//img[@src='/html/themes/classic/images/file_system/large/folder_empty.png'])[5]")); + "xPath=(//span[@class='document-thumbnail']/img)[6]")); assertEquals(RuntimeVariables.replace("DL Folder7 Name"), selenium.getText( "xPath=(//a[contains(@class,'document-link')]/span[@class='entry-title'])[6]")); diff --git a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage1DLFolder1Document1Test.html b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage1DLFolder1Document1Test.html index e1a89d99de3382..110a9cbeaea770 100644 --- a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage1DLFolder1Document1Test.html +++ b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage1DLFolder1Document1Test.html @@ -50,7 +50,7 @@ assertVisible - //img[@src='/html/themes/classic/images/file_system/large/document.png'] + //span[@class='document-thumbnail']/img Document  Image @@ -80,7 +80,7 @@ assertVisible - //img[@src='/html/themes/classic/images/file_system/large/document.png'] + //span[@class='document-thumbnail']/img Document  Image @@ -133,7 +133,6 @@ //tr[3]/td[4] Approved - \ No newline at end of file diff --git a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage1DLFolder1Document1Test.java b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage1DLFolder1Document1Test.java index 4d4da85a6d32de..b2cac9a31cabfc 100644 --- a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage1DLFolder1Document1Test.java +++ b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage1DLFolder1Document1Test.java @@ -90,8 +90,7 @@ public void testViewPage1DLFolder1Document1() throws Exception { Thread.sleep(1000); } - assertTrue(selenium.isVisible( - "//img[@src='/html/themes/classic/images/file_system/large/document.png']")); + assertTrue(selenium.isVisible("//span[@class='document-thumbnail']/img")); assertEquals(RuntimeVariables.replace("DL Folder1 Document1 Title.doc"), selenium.getText( "//a[contains(@class,'document-link')]/span[@class='entry-title']")); @@ -118,8 +117,7 @@ public void testViewPage1DLFolder1Document1() throws Exception { selenium.getText("//h1[@class='header-title']/span")); assertEquals(RuntimeVariables.replace("DL Folder1 Document1 Title.doc"), selenium.getText("//h2[@class='document-title']")); - assertTrue(selenium.isVisible( - "//img[@src='/html/themes/classic/images/file_system/large/document.png']")); + assertTrue(selenium.isVisible("//span[@class='document-thumbnail']/img")); assertTrue(selenium.isPartialText("//span[@class='user-date']", "Uploaded by Joe Bloggs")); assertEquals(RuntimeVariables.replace("Version 1.0"), diff --git a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage1DLFolder1Test.html b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage1DLFolder1Test.html index 5ec1551e21c13a..02301f62c955f4 100644 --- a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage1DLFolder1Test.html +++ b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage1DLFolder1Test.html @@ -35,7 +35,7 @@ assertVisible - //img[@src='/html/themes/classic/images/file_system/large/folder_full_document.png'] + //span[@class='document-thumbnail']/img Folder Image diff --git a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage1DLFolder1Test.java b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage1DLFolder1Test.java index e31fd0f48f632b..1ac0503c27e67f 100644 --- a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage1DLFolder1Test.java +++ b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage1DLFolder1Test.java @@ -66,8 +66,7 @@ public void testViewPage1DLFolder1() throws Exception { assertEquals(RuntimeVariables.replace("Documents and Media"), selenium.getText("//span[@class='portlet-title-text']")); - assertTrue(selenium.isVisible( - "//img[@src='/html/themes/classic/images/file_system/large/folder_full_document.png']")); + assertTrue(selenium.isVisible("//span[@class='document-thumbnail']/img")); assertEquals(RuntimeVariables.replace("DL Folder1 Name"), selenium.getText( "//a[contains(@class,'document-link')]/span[@class='entry-title']")); diff --git a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder2Document2Test.html b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder2Document2Test.html index 12df45606f1256..f704d4c2433a4d 100644 --- a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder2Document2Test.html +++ b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder2Document2Test.html @@ -50,7 +50,7 @@ assertVisible - //img[@src='/html/themes/classic/images/file_system/large/spreadsheet.png'] + //span[@class='document-thumbnail']/img Document  Image @@ -80,7 +80,7 @@ assertVisible - //img[@src='/html/themes/classic/images/file_system/large/spreadsheet.png'] + //span[@class='document-thumbnail']/img Document  Image @@ -175,7 +175,7 @@ assertVisible - //img[@src='/html/themes/classic/images/file_system/large/spreadsheet.png'] + //span[@class='document-thumbnail']/img Document  Image @@ -205,7 +205,7 @@ assertVisible - //img[@src='/html/themes/classic/images/file_system/large/spreadsheet.png'] + //span[@class='document-thumbnail']/img Document  Image @@ -258,7 +258,6 @@ //tr[3]/td[4] Approved - \ No newline at end of file diff --git a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder2Document2Test.java b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder2Document2Test.java index a5c0d7d6383c62..b214bc42e0c2cf 100644 --- a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder2Document2Test.java +++ b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder2Document2Test.java @@ -92,8 +92,7 @@ public void testViewPage2DLFolder2Document2() throws Exception { Thread.sleep(1000); } - assertTrue(selenium.isVisible( - "//img[@src='/html/themes/classic/images/file_system/large/spreadsheet.png']")); + assertTrue(selenium.isVisible("//span[@class='document-thumbnail']/img")); assertEquals(RuntimeVariables.replace("DL Folder2 Document2 Title.xls"), selenium.getText( "//a[contains(@class,'document-link')]/span[@class='entry-title']")); @@ -120,8 +119,7 @@ public void testViewPage2DLFolder2Document2() throws Exception { selenium.getText("//h1[@class='header-title']/span")); assertEquals(RuntimeVariables.replace("DL Folder2 Document2 Title.xls"), selenium.getText("//h2[@class='document-title']")); - assertTrue(selenium.isVisible( - "//img[@src='/html/themes/classic/images/file_system/large/spreadsheet.png']")); + assertTrue(selenium.isVisible("//span[@class='document-thumbnail']/img")); assertTrue(selenium.isPartialText("//span[@class='user-date']", "Uploaded by Joe Bloggs")); assertEquals(RuntimeVariables.replace("Version 1.0"), @@ -213,8 +211,7 @@ public void testViewPage2DLFolder2Document2() throws Exception { Thread.sleep(1000); } - assertTrue(selenium.isVisible( - "//img[@src='/html/themes/classic/images/file_system/large/spreadsheet.png']")); + assertTrue(selenium.isVisible("//span[@class='document-thumbnail']/img")); assertEquals(RuntimeVariables.replace("DL Folder2 Document2 Title.xls"), selenium.getText( "//a[contains(@class,'document-link')]/span[@class='entry-title']")); @@ -241,8 +238,7 @@ public void testViewPage2DLFolder2Document2() throws Exception { selenium.getText("//h1[@class='header-title']/span")); assertEquals(RuntimeVariables.replace("DL Folder2 Document2 Title.xls"), selenium.getText("//h2[@class='document-title']")); - assertTrue(selenium.isVisible( - "//img[@src='/html/themes/classic/images/file_system/large/spreadsheet.png']")); + assertTrue(selenium.isVisible("//span[@class='document-thumbnail']/img")); assertTrue(selenium.isPartialText("//span[@class='user-date']", "Uploaded by Joe Bloggs")); assertEquals(RuntimeVariables.replace("Version 1.0"), diff --git a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder2Document3Test.html b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder2Document3Test.html index 90a8868abb7b00..053d96117ebe48 100644 --- a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder2Document3Test.html +++ b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder2Document3Test.html @@ -50,7 +50,7 @@ assertVisible - //img[@src='/html/themes/classic/images/file_system/large/default.png'] + xPath=(//span[@class='document-thumbnail']/img)[2] Document  Image @@ -80,7 +80,7 @@ assertVisible - //img[@src='/html/themes/classic/images/file_system/large/default.png'] + //span[@class='document-thumbnail']/img Document  Image @@ -175,7 +175,7 @@ assertVisible - //img[@src='/html/themes/classic/images/file_system/large/default.png'] + xPath=(//span[@class='document-thumbnail']/img)[2] Document  Image @@ -205,7 +205,7 @@ assertVisible - //img[@src='/html/themes/classic/images/file_system/large/default.png'] + //span[@class='document-thumbnail']/img Document  Image @@ -258,7 +258,6 @@ //tr[3]/td[5] Approved - \ No newline at end of file diff --git a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder2Document3Test.java b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder2Document3Test.java index 541da9a3810ed6..7e863f703fe8ea 100644 --- a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder2Document3Test.java +++ b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder2Document3Test.java @@ -93,7 +93,7 @@ public void testViewPage2DLFolder2Document3() throws Exception { } assertTrue(selenium.isVisible( - "//img[@src='/html/themes/classic/images/file_system/large/default.png']")); + "xPath=(//span[@class='document-thumbnail']/img)[2]")); assertEquals(RuntimeVariables.replace("DL Folder2 Document3 Title.txt"), selenium.getText( "xPath=(//a[contains(@class,'document-link')]/span[@class='entry-title'])[2]")); @@ -120,8 +120,7 @@ public void testViewPage2DLFolder2Document3() throws Exception { selenium.getText("//h1[@class='header-title']/span")); assertEquals(RuntimeVariables.replace("DL Folder2 Document3 Title.txt"), selenium.getText("//h2[@class='document-title']")); - assertTrue(selenium.isVisible( - "//img[@src='/html/themes/classic/images/file_system/large/default.png']")); + assertTrue(selenium.isVisible("//span[@class='document-thumbnail']/img")); assertTrue(selenium.isPartialText("//span[@class='user-date']", "Uploaded by Joe Bloggs")); assertEquals(RuntimeVariables.replace("Version 1.0"), @@ -213,7 +212,7 @@ public void testViewPage2DLFolder2Document3() throws Exception { } assertTrue(selenium.isVisible( - "//img[@src='/html/themes/classic/images/file_system/large/default.png']")); + "xPath=(//span[@class='document-thumbnail']/img)[2]")); assertEquals(RuntimeVariables.replace("DL Folder2 Document3 Title.txt"), selenium.getText( "xPath=(//a[contains(@class,'document-link')]/span[@class='entry-title'])[2]")); @@ -240,8 +239,7 @@ public void testViewPage2DLFolder2Document3() throws Exception { selenium.getText("//h1[@class='header-title']/span")); assertEquals(RuntimeVariables.replace("DL Folder2 Document3 Title.txt"), selenium.getText("//h2[@class='document-title']")); - assertTrue(selenium.isVisible( - "//img[@src='/html/themes/classic/images/file_system/large/default.png']")); + assertTrue(selenium.isVisible("//span[@class='document-thumbnail']/img")); assertTrue(selenium.isPartialText("//span[@class='user-date']", "Uploaded by Joe Bloggs")); assertEquals(RuntimeVariables.replace("Version 1.0"), diff --git a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder2Test.html b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder2Test.html index 3fef8aa4d77eee..84d145cfe123ca 100644 --- a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder2Test.html +++ b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder2Test.html @@ -65,7 +65,7 @@ assertVisible - //img[@src='/html/themes/classic/images/file_system/large/folder_full_document.png'] + //span[@class='document-thumbnail']/img Folder Image @@ -135,7 +135,7 @@ assertVisible - //img[@src='/html/themes/classic/images/file_system/large/folder_full_document.png'] + //span[@class='document-thumbnail']/img Folder Image diff --git a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder2Test.java b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder2Test.java index 0c414cc9cf3c8d..81164f05d84e7c 100644 --- a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder2Test.java +++ b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder2Test.java @@ -113,8 +113,7 @@ public void testViewPage2DLFolder2() throws Exception { assertEquals(RuntimeVariables.replace( "Documents and Media (DL Page2 Name)"), selenium.getText("//span[@class='portlet-title-text']")); - assertTrue(selenium.isVisible( - "//img[@src='/html/themes/classic/images/file_system/large/folder_full_document.png']")); + assertTrue(selenium.isVisible("//span[@class='document-thumbnail']/img")); assertEquals(RuntimeVariables.replace("DL Folder2 Name"), selenium.getText( "//a[contains(@class,'document-link')]/span[@class='entry-title']")); @@ -198,8 +197,7 @@ public void testViewPage2DLFolder2() throws Exception { assertEquals(RuntimeVariables.replace( "Documents and Media (DL Page2 Name)"), selenium.getText("//span[@class='portlet-title-text']")); - assertTrue(selenium.isVisible( - "//img[@src='/html/themes/classic/images/file_system/large/folder_full_document.png']")); + assertTrue(selenium.isVisible("//span[@class='document-thumbnail']/img")); assertEquals(RuntimeVariables.replace("DL Folder2 Name"), selenium.getText( "//a[contains(@class,'document-link')]/span[@class='entry-title']")); diff --git a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder3Test.html b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder3Test.html index 646c1dbe4d39cf..9ec14b06551e86 100644 --- a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder3Test.html +++ b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder3Test.html @@ -65,7 +65,7 @@ assertVisible - //img[@src='/html/themes/classic/images/file_system/large/folder_empty.png'] + xPath=(//span[@class='document-thumbnail']/img)[2] Folder Image @@ -135,7 +135,7 @@ assertVisible - //img[@src='/html/themes/classic/images/file_system/large/folder_empty.png'] + xPath=(//span[@class='document-thumbnail']/img)[2] Folder Image diff --git a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder3Test.java b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder3Test.java index 53781c48ae03e3..6ecab303cfe149 100644 --- a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder3Test.java +++ b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder3Test.java @@ -114,7 +114,7 @@ public void testViewPage2DLFolder3() throws Exception { "Documents and Media (DL Page2 Name)"), selenium.getText("//span[@class='portlet-title-text']")); assertTrue(selenium.isVisible( - "//img[@src='/html/themes/classic/images/file_system/large/folder_empty.png']")); + "xPath=(//span[@class='document-thumbnail']/img)[2]")); assertEquals(RuntimeVariables.replace("DL Folder3 Name"), selenium.getText( "xPath=(//a[contains(@class,'document-link')]/span[@class='entry-title'])[2]")); @@ -199,7 +199,7 @@ public void testViewPage2DLFolder3() throws Exception { "Documents and Media (DL Page2 Name)"), selenium.getText("//span[@class='portlet-title-text']")); assertTrue(selenium.isVisible( - "//img[@src='/html/themes/classic/images/file_system/large/folder_empty.png']")); + "xPath=(//span[@class='document-thumbnail']/img)[2]")); assertEquals(RuntimeVariables.replace("DL Folder3 Name"), selenium.getText( "xPath=(//a[contains(@class,'document-link')]/span[@class='entry-title'])[2]")); diff --git a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder4Test.html b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder4Test.html index 7ac06ee6cb9ce0..df383025d9cc6f 100644 --- a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder4Test.html +++ b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder4Test.html @@ -65,7 +65,7 @@ assertVisible - xPath=(//img[@src='/html/themes/classic/images/file_system/large/folder_empty.png'])[2] + xPath=(//span[@class='document-thumbnail']/img)[3] Folder Image @@ -135,7 +135,7 @@ assertVisible - xPath=(//img[@src='/html/themes/classic/images/file_system/large/folder_empty.png'])[2] + xPath=(//span[@class='document-thumbnail']/img)[3] Folder Image diff --git a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder4Test.java b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder4Test.java index 3d44ae1aa586d0..d75105b3af6e84 100644 --- a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder4Test.java +++ b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder4Test.java @@ -114,7 +114,7 @@ public void testViewPage2DLFolder4() throws Exception { "Documents and Media (DL Page2 Name)"), selenium.getText("//span[@class='portlet-title-text']")); assertTrue(selenium.isVisible( - "xPath=(//img[@src='/html/themes/classic/images/file_system/large/folder_empty.png'])[2]")); + "xPath=(//span[@class='document-thumbnail']/img)[3]")); assertEquals(RuntimeVariables.replace("DL Folder4 Name"), selenium.getText( "xPath=(//a[contains(@class,'document-link')]/span[@class='entry-title'])[3]")); @@ -199,7 +199,7 @@ public void testViewPage2DLFolder4() throws Exception { "Documents and Media (DL Page2 Name)"), selenium.getText("//span[@class='portlet-title-text']")); assertTrue(selenium.isVisible( - "xPath=(//img[@src='/html/themes/classic/images/file_system/large/folder_empty.png'])[2]")); + "xPath=(//span[@class='document-thumbnail']/img)[3]")); assertEquals(RuntimeVariables.replace("DL Folder4 Name"), selenium.getText( "xPath=(//a[contains(@class,'document-link')]/span[@class='entry-title'])[3]")); diff --git a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder5Test.html b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder5Test.html index 7710fcdaae617d..507f3e5debef71 100644 --- a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder5Test.html +++ b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder5Test.html @@ -65,7 +65,7 @@ assertVisible - xPath=(//img[@src='/html/themes/classic/images/file_system/large/folder_empty.png'])[3] + xPath=(//span[@class='document-thumbnail']/img)[4] Folder Image @@ -135,7 +135,7 @@ assertVisible - xPath=(//img[@src='/html/themes/classic/images/file_system/large/folder_empty.png'])[2] + xPath=(//span[@class='document-thumbnail']/img)[4] Folder Image diff --git a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder5Test.java b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder5Test.java index f247b52e152d03..b1907df085e007 100644 --- a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder5Test.java +++ b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder5Test.java @@ -114,7 +114,7 @@ public void testViewPage2DLFolder5() throws Exception { "Documents and Media (DL Page2 Name)"), selenium.getText("//span[@class='portlet-title-text']")); assertTrue(selenium.isVisible( - "xPath=(//img[@src='/html/themes/classic/images/file_system/large/folder_empty.png'])[3]")); + "xPath=(//span[@class='document-thumbnail']/img)[4]")); assertEquals(RuntimeVariables.replace("DL Folder5 Name"), selenium.getText( "xPath=(//a[contains(@class,'document-link')]/span[@class='entry-title'])[4]")); @@ -199,7 +199,7 @@ public void testViewPage2DLFolder5() throws Exception { "Documents and Media (DL Page2 Name)"), selenium.getText("//span[@class='portlet-title-text']")); assertTrue(selenium.isVisible( - "xPath=(//img[@src='/html/themes/classic/images/file_system/large/folder_empty.png'])[2]")); + "xPath=(//span[@class='document-thumbnail']/img)[4]")); assertEquals(RuntimeVariables.replace("DL Folder5 Name"), selenium.getText( "xPath=(//a[contains(@class,'document-link')]/span[@class='entry-title'])[4]")); diff --git a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder6Test.html b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder6Test.html index c8a64d1075ca9e..02de6568edeab3 100644 --- a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder6Test.html +++ b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder6Test.html @@ -65,7 +65,7 @@ assertVisible - xPath=(//img[@src='/html/themes/classic/images/file_system/large/folder_empty.png'])[4] + xPath=(//span[@class='document-thumbnail']/img)[5] Folder Image @@ -135,7 +135,7 @@ assertVisible - xPath=(//img[@src='/html/themes/classic/images/file_system/large/folder_empty.png'])[4] + xPath=(//span[@class='document-thumbnail']/img)[5] Folder Image diff --git a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder6Test.java b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder6Test.java index bdbb9069d10f38..280fb765efeec9 100644 --- a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder6Test.java +++ b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder6Test.java @@ -114,7 +114,7 @@ public void testViewPage2DLFolder6() throws Exception { "Documents and Media (DL Page2 Name)"), selenium.getText("//span[@class='portlet-title-text']")); assertTrue(selenium.isVisible( - "xPath=(//img[@src='/html/themes/classic/images/file_system/large/folder_empty.png'])[4]")); + "xPath=(//span[@class='document-thumbnail']/img)[5]")); assertEquals(RuntimeVariables.replace("DL Folder6 Name"), selenium.getText( "xPath=(//a[contains(@class,'document-link')]/span[@class='entry-title'])[5]")); @@ -199,7 +199,7 @@ public void testViewPage2DLFolder6() throws Exception { "Documents and Media (DL Page2 Name)"), selenium.getText("//span[@class='portlet-title-text']")); assertTrue(selenium.isVisible( - "xPath=(//img[@src='/html/themes/classic/images/file_system/large/folder_empty.png'])[4]")); + "xPath=(//span[@class='document-thumbnail']/img)[5]")); assertEquals(RuntimeVariables.replace("DL Folder6 Name"), selenium.getText( "xPath=(//a[contains(@class,'document-link')]/span[@class='entry-title'])[5]")); diff --git a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder7Test.html b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder7Test.html index 3e679141479b37..813cf23b8d180e 100644 --- a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder7Test.html +++ b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder7Test.html @@ -85,7 +85,7 @@ assertVisible - //img[@src='/html/themes/classic/images/file_system/large/folder_empty.png'] + //span[@class='document-thumbnail']/img Folder Image @@ -155,7 +155,7 @@ assertVisible - xPath=(//img[@src='/html/themes/classic/images/file_system/large/folder_empty.png'])[5] + xPath=(//span[@class='document-thumbnail']/img)[6] Folder Image diff --git a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder7Test.java b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder7Test.java index 77a8eb4ecc1393..14c3dea0d217bf 100644 --- a/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder7Test.java +++ b/portal-web/test/com/liferay/portalweb/portal/dbupgrade/sampledatalatest/documentlibrary/pagescope/ViewPage2DLFolder7Test.java @@ -137,8 +137,7 @@ public void testViewPage2DLFolder7() throws Exception { Thread.sleep(1000); } - assertTrue(selenium.isVisible( - "//img[@src='/html/themes/classic/images/file_system/large/folder_empty.png']")); + assertTrue(selenium.isVisible("//span[@class='document-thumbnail']/img")); assertEquals(RuntimeVariables.replace("DL Folder7 Name"), selenium.getText( "//a[contains(@class,'document-link')]/span[@class='entry-title']")); @@ -223,7 +222,7 @@ public void testViewPage2DLFolder7() throws Exception { "Documents and Media (DL Page2 Name)"), selenium.getText("//span[@class='portlet-title-text']")); assertTrue(selenium.isVisible( - "xPath=(//img[@src='/html/themes/classic/images/file_system/large/folder_empty.png'])[5]")); + "xPath=(//span[@class='document-thumbnail']/img)[6]")); assertEquals(RuntimeVariables.replace("DL Folder7 Name"), selenium.getText( "xPath=(//a[contains(@class,'document-link')]/span[@class='entry-title'])[6]"));