]> source.dussan.org Git - vaadin-framework.git/commitdiff
projects / vaadin-framework.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2d3763b)
#7266 removed dependencies from integration tests to Sampler: Liferay 5; fixed Lifera...
authorHenri Sara <henri.sara@itmill.com>
Wed, 3 Aug 2011 10:45:37 +0000 (10:45 +0000)
committerHenri Sara <henri.sara@itmill.com>
Wed, 3 Aug 2011 10:45:37 +0000 (10:45 +0000)
svn changeset:20096/svn branch:6.7

tests/integration-testscripts/Liferay-5/Add_Sampler_to_Liferay.html [deleted file] patch | blob | history
tests/integration-testscripts/Liferay-5/integration-test-liferay-5.2.3-portlet2.html patch | blob | history
tests/integration-testscripts/Liferay-5/integration-test-liferay-5.2.3-sampler.html [deleted file] patch | blob | history
tests/integration_tests.xml patch | blob | history

diff --git a/tests/integration-testscripts/Liferay-5/Add_Sampler_to_Liferay.html b/tests/integration-testscripts/Liferay-5/Add_Sampler_to_Liferay.html
deleted file mode 100644 (file)
index 1148be0..0000000
--- a/tests/integration-testscripts/Liferay-5/Add_Sampler_to_Liferay.html
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head profile="http://selenium-ide.openqa.org/profiles/test-case">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<link rel="selenium.base" href="" />
-<title>Add_Sampler_to_Liferay</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">Add_Sampler_to_Liferay</td></tr>
-</thead><tbody>
-<tr>
-       <td>open</td>
-       <td>/web/guest</td>
-       <td></td>
-</tr>
-<tr>
-       <td>mouseClickAndWait</td>
-       <td>link=Login as bruno</td>
-       <td>48,8</td>
-</tr>
-<tr>
-       <td>mouseClick</td>
-       <td>//div[@id='add-page']/a/span</td>
-       <td>44,113</td>
-</tr>
-<tr>
-       <td>enterCharacter</td>
-       <td>new_page</td>
-       <td>sampler</td>
-</tr>
-<tr>
-       <td>mouseClick</td>
-       <td>link=Save</td>
-       <td>26,13</td>
-</tr>
-<tr>
-       <td>waitForElementPresent</td>
-       <td>//div[@id='navigation']/ul/li[2]/a/span</td>
-       <td></td>
-</tr>
-<tr>
-       <td>mouseClickAndWait</td>
-       <td>link=sampler</td>
-       <td>39,25</td>
-</tr>
-<tr>
-       <td>mouseClick</td>
-       <td>link=Layout Template</td>
-       <td>122,21</td>
-</tr>
-<tr>
-       <td>waitForElementPresent</td>
-       <td>layoutTemplateId1</td>
-       <td></td>
-</tr>
-<tr>
-       <td>mouseClick</td>
-       <td>layoutTemplateId1</td>
-       <td>65,78</td>
-</tr>
-<tr>
-       <td>mouseClickAndWait</td>
-       <td>document.forms[1].elements[14]</td>
-       <td>23,12</td>
-</tr>
-<tr>
-       <td>mouseClick</td>
-       <td>link=Add Application</td>
-       <td>76,18</td>
-</tr>
-<tr>
-       <td>waitForElementPresent</td>
-       <td>//div[@id='Vaadin-Sampler']/p/a</td>
-       <td></td>
-</tr>
-<tr>
-       <td>mouseClick</td>
-       <td>//div[@id='Vaadin-Sampler']/p/a</td>
-       <td>9,8</td>
-</tr>
-<tr>
-       <td>pause</td>
-       <td>500</td>
-       <td></td>
-</tr>
-<tr>
-       <td>waitForVaadin</td>
-       <td></td>
-       <td></td>
-</tr>
-
-</tbody></table>
-</body>
-</html>
diff --git a/tests/integration-testscripts/Liferay-5/integration-test-liferay-5.2.3-portlet2.html b/tests/integration-testscripts/Liferay-5/integration-test-liferay-5.2.3-portlet2.html
index 349c6fe806d07d75f0669946a16a008cfa7d203d..4a1cb480b660281a75ccd72bedbd3f84ea24e248 100644 (file)
--- a/tests/integration-testscripts/Liferay-5/integration-test-liferay-5.2.3-portlet2.html
+++ b/tests/integration-testscripts/Liferay-5/integration-test-liferay-5.2.3-portlet2.html
@@ -38,12 +38,12 @@
 </tr>
 <tr>
        <td>waitForElementPresent</td>
-       <td>//div[@id='navigation']/ul/li[3]/a/span</td>
+       <td>//div[@id='navigation']/ul/li[2]/a/span</td>
        <td></td>
 </tr>
 <tr>
        <td>mouseClickAndWait</td>
-       <td>//div[@id='navigation']/ul/li[3]/a/span</td>
+       <td>//div[@id='navigation']/ul/li[2]/a/span</td>
        <td>19,8</td>
 </tr>
 <tr>
@@ -93,32 +93,32 @@
 </tr>
 <tr>
        <td>mouseClick</td>
-       <td>vaadin=v-AddressBookPortlet_WAR_demo_LAYOUT_10714::/VVerticalLayout[0]/ChildComponentContainer[1]/VSplitPanelHorizontal[0]/VSplitPanelVertical[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[3]/domChild[0]/domChild[0]</td>
+       <td>vaadin=v-AddressBookPortlet_WAR_demo_LAYOUT_10706::/VVerticalLayout[0]/ChildComponentContainer[1]/VSplitPanelHorizontal[0]/VSplitPanelVertical[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[3]/domChild[0]/domChild[0]</td>
        <td>24,10</td>
 </tr>
 <tr>
        <td>click</td>
-       <td>vaadin=v-AddressBookPortlet_WAR_demo_LAYOUT_10714::/VVerticalLayout[0]/ChildComponentContainer[1]/VSplitPanelHorizontal[0]/VSplitPanelVertical[0]/VForm[0]/VHorizontalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
+       <td>vaadin=v-AddressBookPortlet_WAR_demo_LAYOUT_10706::/VVerticalLayout[0]/ChildComponentContainer[1]/VSplitPanelHorizontal[0]/VSplitPanelVertical[0]/VForm[0]/VHorizontalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
        <td></td>
 </tr>
 <tr>
        <td>mouseClick</td>
-       <td>vaadin=v-AddressBookPortlet_WAR_demo_LAYOUT_10714::/VVerticalLayout[0]/ChildComponentContainer[1]/VSplitPanelHorizontal[0]/VSplitPanelVertical[0]/VForm[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VFilterSelect[0]/domChild[1]</td>
+       <td>vaadin=v-AddressBookPortlet_WAR_demo_LAYOUT_10706::/VVerticalLayout[0]/ChildComponentContainer[1]/VSplitPanelHorizontal[0]/VSplitPanelVertical[0]/VForm[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VFilterSelect[0]/domChild[1]</td>
        <td>9,11</td>
 </tr>
 <tr>
        <td>mouseClick</td>
-       <td>vaadin=v-AddressBookPortlet_WAR_demo_LAYOUT_10714::Root/VFilterSelect$SuggestionPopup[0]/VFilterSelect$SuggestionMenu[0]#item8</td>
+       <td>vaadin=v-AddressBookPortlet_WAR_demo_LAYOUT_10706::Root/VFilterSelect$SuggestionPopup[0]/VFilterSelect$SuggestionMenu[0]#item8</td>
        <td>158,17</td>
 </tr>
 <tr>
        <td>click</td>
-       <td>vaadin=v-AddressBookPortlet_WAR_demo_LAYOUT_10714::/VVerticalLayout[0]/ChildComponentContainer[1]/VSplitPanelHorizontal[0]/VSplitPanelVertical[0]/VForm[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
+       <td>vaadin=v-AddressBookPortlet_WAR_demo_LAYOUT_10706::/VVerticalLayout[0]/ChildComponentContainer[1]/VSplitPanelHorizontal[0]/VSplitPanelVertical[0]/VForm[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
        <td></td>
 </tr>
 <tr>
        <td>assertText</td>
-       <td>vaadin=v-AddressBookPortlet_WAR_demo_LAYOUT_10714::/VVerticalLayout[0]/ChildComponentContainer[1]/VSplitPanelHorizontal[0]/VSplitPanelVertical[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[3]/domChild[6]/domChild[0]</td>
+       <td>vaadin=v-AddressBookPortlet_WAR_demo_LAYOUT_10706::/VVerticalLayout[0]/ChildComponentContainer[1]/VSplitPanelHorizontal[0]/VSplitPanelVertical[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[3]/domChild[6]/domChild[0]</td>
        <td>New York</td>
 </tr>
 
diff --git a/tests/integration-testscripts/Liferay-5/integration-test-liferay-5.2.3-sampler.html b/tests/integration-testscripts/Liferay-5/integration-test-liferay-5.2.3-sampler.html
deleted file mode 100644 (file)
index 889dac5..0000000
--- a/tests/integration-testscripts/Liferay-5/integration-test-liferay-5.2.3-sampler.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head profile="http://selenium-ide.openqa.org/profiles/test-case">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<link rel="selenium.base" href="" />
-<title>sampler_deployment_liferay</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">sampler_deployment_liferay</td></tr>
-</thead><tbody>
-<tr>
-       <td>open</td>
-       <td>/web/guest/sampler</td>
-       <td></td>
-</tr>
-<tr>
-       <td>waitForVaadin</td>
-       <td></td>
-       <td></td>
-</tr>
-<tr>
-       <td>mouseClick</td>
-       <td>vaadin=demosampler::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[5]/VHorizontalLayout[0]/ChildComponentContainer[1]/VNativeButton[0]</td>
-       <td>9,12</td>
-</tr>
-<tr>
-       <td>waitForVaadin</td>
-       <td></td>
-       <td></td>
-</tr>
-<tr>
-       <td>pause</td>
-       <td>500</td>
-       <td></td>
-</tr>
-<tr>
-       <td>mouseClick</td>
-       <td>vaadin=demosampler::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[6]/VHorizontalLayout[0]/ChildComponentContainer[1]/VNativeButton[0]</td>
-       <td>11,12</td>
-</tr>
-<tr>
-       <td>waitForVaadin</td>
-       <td></td>
-       <td></td>
-</tr>
-<tr>
-       <td>pause</td>
-       <td>500</td>
-       <td></td>
-</tr>
-<tr>
-       <td>screenCapture</td>
-       <td></td>
-       <td>tooltips</td>
-</tr>
-<tr>
-       <td>mouseClick</td>
-       <td>vaadin=demosampler::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[6]/VHorizontalLayout[0]/ChildComponentContainer[1]/VNativeButton[0]</td>
-       <td>11,12</td>
-</tr>
-<tr>
-       <td>waitForVaadin</td>
-       <td></td>
-       <td></td>
-</tr>
-<tr>
-       <td>pause</td>
-       <td>500</td>
-       <td></td>
-</tr>
-<tr>
-       <td>screenCapture</td>
-       <td></td>
-       <td>icons</td>
-</tr>
-
-</tbody></table>
-</body>
-</html>
diff --git a/tests/integration_tests.xml b/tests/integration_tests.xml
index 71e8901137d201a62cdd3a7a7fead6eb8f8aeb84..1d6ba4fc9ab94b431e6acfe3c07bd7200da05cce 100644 (file)
--- a/tests/integration_tests.xml
+++ b/tests/integration_tests.xml
@@ -159,45 +159,9 @@
                <sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} stop-glassfish-3" />\r
        </target>\r
                        \r
-       <!-- Test liferay sampler -->\r
-       <target name="integration-test-test-liferay-5">\r
-               <fileset dir="integration-testscripts" id="html-test-files" includes="Liferay-5/integration-test-liferay-5.2.3-sampler.html" />\r
-               <pathconvert pathsep=" " property="test-liferay" refid="html-test-files" />\r
-               \r
-               <subant target="run-tests" failonerror="false" antfile="test.xml">\r
-                       <property name="com.vaadin.testbench.lib.dir" value="${com.vaadin.testbench.lib.dir}" />\r
-                       <property name="com.vaadin.testbench.tester.host" value="${com.vaadin.testbench.tester.host}" />\r
-                       <property name="com.vaadin.testbench.deployment.url" value="${deployment.url}" />\r
-                       <property name="server.start.succeeded" value="1" />\r
-                       <property name="browsers" value="${test_browsers}" />\r
-                       <property name="testfiles" value="${test-liferay}" />\r
-                       <property name="test-output-dir" value="../build/integration-test-output" />\r
-                       \r
-                       <fileset dir="." includes="test.xml" />\r
-               </subant>\r
-       </target>\r
-       \r
-       <!-- "deploy" sampler to liferay -->\r
-       <target name="integration-test-init-liferay-5">\r
-               <fileset dir="integration-testscripts" id="html-test-files" includes="Liferay-5/Add_Sampler_to_Liferay.html" />\r
-               <pathconvert pathsep=" " property="init-liferay" refid="html-test-files" />\r
-               \r
-               <subant target="run-tests" failonerror="false" antfile="test.xml">\r
-                       <property name="com.vaadin.testbench.lib.dir" value="${com.vaadin.testbench.lib.dir}" />\r
-                       <property name="com.vaadin.testbench.tester.host" value="${com.vaadin.testbench.tester.host}" />\r
-                       <property name="com.vaadin.testbench.deployment.url" value="${deployment.url}" />\r
-                       <property name="server.start.succeeded" value="1" />\r
-                       <property name="browsers" value="${test_browsers}" />\r
-                       <property name="testfiles" value="${init-liferay}" />\r
-                       <property name="test-output-dir" value="../build/integration-test-output" />\r
-       \r
-                       <fileset dir="." includes="test.xml" />\r
-               </subant>\r
-       </target>\r
-       \r
        <target name="integration-test-liferay-5-portlet2">\r
                <fileset dir="integration-testscripts" id="html-test-files" includes="Liferay-5/integration-test-liferay-5.2.3-portlet2.html" />\r
-               <pathconvert pathsep=" " property="init-liferay" refid="html-test-files" />\r
+               <pathconvert pathsep=" " property="liferay-portlet2" refid="html-test-files" />\r
                \r
                <subant target="run-tests" failonerror="false" antfile="test.xml">\r
                        <property name="com.vaadin.testbench.lib.dir" value="${com.vaadin.testbench.lib.dir}" />\r
@@ -205,7 +169,7 @@
                        <property name="com.vaadin.testbench.deployment.url" value="${deployment.url}" />\r
                        <property name="server.start.succeeded" value="1" />\r
                        <property name="browsers" value="${test_browsers}" />\r
-                       <property name="testfiles" value="${init-liferay}" />\r
+                       <property name="testfiles" value="${liferay-portlet2}" />\r
                        <property name="test-output-dir" value="../build/integration-test-output" />\r
        \r
                        <fileset dir="." includes="test.xml" />\r
@@ -527,15 +491,6 @@
        \r
        <target name="integration-test-liferay">\r
                <antcall target="integration-test-start-liferay-5" />\r
-               <trycatch property="tried">\r
-                       <try>\r
-                               <antcall target="integration-test-init-liferay-5" />\r
-                               <antcall target="integration-test-test-liferay-5" />\r
-                       </try>\r
-                       <catch>\r
-                               <echo message="Liferay sampler test failed. ${tried}" />\r
-                       </catch>\r
-               </trycatch>\r
                <antcall target="integration-test-liferay-5-portlet2" />\r
                <antcall target="integration-test-stop-liferay-5" />\r
        </target>\r
Vaadin 6, 7, 8 is a Java framework for modern Java web applications: https://github.com/vaadin/framework