]> 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: fa5a4f5)
Merged integration test renames from 6.5
authorArtur Signell <artur.signell@itmill.com>
Tue, 26 Apr 2011 10:46:05 +0000 (10:46 +0000)
committerArtur Signell <artur.signell@itmill.com>
Tue, 26 Apr 2011 10:46:05 +0000 (10:46 +0000)
svn changeset:18460/svn branch:6.6

tests/integration-testscripts/eXo-3/eXo-integration.html [deleted file] patch | blob | history
tests/integration-testscripts/eXo-3/integration-test-eXo-3.0.3-addressbook.html [new file with mode: 0644] patch | blob
tests/integration-testscripts/weblogic-portal/integration-test-WebLogic-Portal-10.3.2-addressbook.html [new file with mode: 0644] patch | blob
tests/integration-testscripts/weblogic-portal/weblogic-portal-integration.html [deleted file] patch | blob | history
tests/integration_tests.xml patch | blob | history

diff --git a/tests/integration-testscripts/eXo-3/eXo-integration.html b/tests/integration-testscripts/eXo-3/eXo-integration.html
deleted file mode 100644 (file)
index 10bd1e2..0000000
--- a/tests/integration-testscripts/eXo-3/eXo-integration.html
+++ /dev/null
@@ -1,182 +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="http://vaadin-integration-tests.intra.itmill.com:8080/" />
-<title>eXo-integration</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">eXo-integration</td></tr>
-</thead><tbody>
-<tr>
-       <td>open</td>
-       <td>/portal/public/default/</td>
-       <td></td>
-</tr>
-<tr>
-       <td>mouseClick</td>
-       <td>link=Visit the Acme Social Intranet</td>
-       <td>121,7</td>
-</tr>
-<tr>
-       <td>setTimeout</td>
-       <td>60000</td>
-       <td></td>
-</tr>
-<tr>
-       <td>waitForElementPresent</td>
-       <td>link=Login as John</td>
-       <td></td>
-</tr>
-<tr>
-       <td>mouseClick</td>
-       <td>link=Login as John</td>
-       <td>37,4</td>
-</tr>
-<tr>
-       <td>setTimeout</td>
-       <td>60000</td>
-       <td></td>
-</tr>
-<tr>
-       <td>waitForElementPresent</td>
-       <td>link=Applications Registry</td>
-       <td></td>
-</tr>
-<tr>
-       <td>mouseClickAndWait</td>
-       <td>link=Applications Registry</td>
-       <td>138,17</td>
-</tr>
-<tr>
-       <td>expectDialog</td>
-       <td>//div[@onclick=&quot;javascript:if(confirm('This action will automatically create categories and import all the gadgets and portlets on it.'))ajaxGet('/portal/private/intranet/administration/registry?portal:componentId=09e0ea8b-7d6e-410d-9ed0-871e3e7bc17f&amp;portal:type=action&amp;uicomponent=UIApplicationOrganizer&amp;op=ImportAllApplications&amp;ajaxRequest=true')&quot;]</td>
-       <td>36,15</td>
-</tr>
-<tr>
-       <td>getConfirmation</td>
-       <td></td>
-       <td></td>
-</tr>
-<tr>
-       <td>waitForElementPresent</td>
-       <td>link=demo</td>
-       <td></td>
-</tr>
-<tr>
-       <td>mouseClick</td>
-       <td>link=Add New Page</td>
-       <td>64,16</td>
-</tr>
-<tr>
-       <td>waitForElementPresent</td>
-       <td>//form[@id='UIWizardPageSetInfo']/div[2]/div[2]/div/div[2]/div[1]</td>
-       <td></td>
-</tr>
-<tr>
-       <td>mouseClick</td>
-       <td>pageName</td>
-       <td>98,10</td>
-</tr>
-<tr>
-       <td>enterCharacter</td>
-       <td>pageName</td>
-       <td>Application_test</td>
-</tr>
-<tr>
-       <td>enterCharacter</td>
-       <td>pageDisplayName</td>
-       <td>Vaadin test</td>
-</tr>
-<tr>
-       <td>mouseClick</td>
-       <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td>
-       <td>24,16</td>
-</tr>
-<tr>
-       <td>waitForElementPresent</td>
-       <td>//form[@id='UIWizardPageSelectLayoutForm']/div[2]/div/div[1]/div[2]/div[1]/div[1]/div/div</td>
-       <td></td>
-</tr>
-<tr>
-       <td>mouseClick</td>
-       <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td>
-       <td>20,12</td>
-</tr>
-<tr>
-       <td>waitForElementPresent</td>
-       <td>link=demo</td>
-       <td></td>
-</tr>
-<tr>
-       <td>mouseClick</td>
-       <td>link=demo</td>
-       <td>24,7</td>
-</tr>
-<tr>
-       <td>waitForElementPresent</td>
-       <td>//div[@id='demo/AddressBookPortlet']/div/div/div[1]/div[1]</td>
-       <td></td>
-</tr>
-<tr>
-       <td>drag</td>
-       <td>//div[@id='demo/AddressBookPortlet']/div/div/div[1]/div[2]</td>
-       <td>147,6</td>
-</tr>
-<tr>
-       <td>mouseMoveAt</td>
-       <td>//div[2]/div/div/div[1]/div/div[2]/div/div/div/div</td>
-       <td>20,20</td>
-</tr>
-<tr>
-       <td>drop</td>
-       <td>//div[@id='UIPortalApplication']/div[4]</td>
-       <td>760,138</td>
-</tr>
-<tr>
-       <td>mouseClick</td>
-       <td>//a[@onclick='eXo.core.DOMUtil.disableOnClick(this);']</td>
-       <td>10,7</td>
-</tr>
-<tr>
-       <td>setTimeout</td>
-       <td>60000</td>
-       <td></td>
-</tr>
-<tr>
-       <td>waitForElementPresent</td>
-       <td>//tr[3]/td[1]/div</td>
-       <td></td>
-</tr>
-<tr>
-       <td>pause</td>
-       <td>500</td>
-       <td></td>
-</tr>
-<tr>
-       <td>mouseClick</td>
-       <td>//tr[3]/td[1]/div</td>
-       <td>64,15</td>
-</tr>
-<tr>
-       <td>screenCapture</td>
-       <td></td>
-       <td>Marge_selected</td>
-</tr>
-<tr>
-       <td>click</td>
-       <td>//div[4]/div/div/div[3]/div/div/span</td>
-       <td></td>
-</tr>
-<tr>
-       <td>screenCapture</td>
-       <td></td>
-       <td>Marge_in_edit_mode</td>
-</tr>
-
-</tbody></table>
-</body>
-</html>
diff --git a/tests/integration-testscripts/eXo-3/integration-test-eXo-3.0.3-addressbook.html b/tests/integration-testscripts/eXo-3/integration-test-eXo-3.0.3-addressbook.html
new file mode 100644 (file)
index 0000000..10bd1e2
--- /dev/null
+++ b/tests/integration-testscripts/eXo-3/integration-test-eXo-3.0.3-addressbook.html
@@ -0,0 +1,182 @@
+<?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="http://vaadin-integration-tests.intra.itmill.com:8080/" />
+<title>eXo-integration</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">eXo-integration</td></tr>
+</thead><tbody>
+<tr>
+       <td>open</td>
+       <td>/portal/public/default/</td>
+       <td></td>
+</tr>
+<tr>
+       <td>mouseClick</td>
+       <td>link=Visit the Acme Social Intranet</td>
+       <td>121,7</td>
+</tr>
+<tr>
+       <td>setTimeout</td>
+       <td>60000</td>
+       <td></td>
+</tr>
+<tr>
+       <td>waitForElementPresent</td>
+       <td>link=Login as John</td>
+       <td></td>
+</tr>
+<tr>
+       <td>mouseClick</td>
+       <td>link=Login as John</td>
+       <td>37,4</td>
+</tr>
+<tr>
+       <td>setTimeout</td>
+       <td>60000</td>
+       <td></td>
+</tr>
+<tr>
+       <td>waitForElementPresent</td>
+       <td>link=Applications Registry</td>
+       <td></td>
+</tr>
+<tr>
+       <td>mouseClickAndWait</td>
+       <td>link=Applications Registry</td>
+       <td>138,17</td>
+</tr>
+<tr>
+       <td>expectDialog</td>
+       <td>//div[@onclick=&quot;javascript:if(confirm('This action will automatically create categories and import all the gadgets and portlets on it.'))ajaxGet('/portal/private/intranet/administration/registry?portal:componentId=09e0ea8b-7d6e-410d-9ed0-871e3e7bc17f&amp;portal:type=action&amp;uicomponent=UIApplicationOrganizer&amp;op=ImportAllApplications&amp;ajaxRequest=true')&quot;]</td>
+       <td>36,15</td>
+</tr>
+<tr>
+       <td>getConfirmation</td>
+       <td></td>
+       <td></td>
+</tr>
+<tr>
+       <td>waitForElementPresent</td>
+       <td>link=demo</td>
+       <td></td>
+</tr>
+<tr>
+       <td>mouseClick</td>
+       <td>link=Add New Page</td>
+       <td>64,16</td>
+</tr>
+<tr>
+       <td>waitForElementPresent</td>
+       <td>//form[@id='UIWizardPageSetInfo']/div[2]/div[2]/div/div[2]/div[1]</td>
+       <td></td>
+</tr>
+<tr>
+       <td>mouseClick</td>
+       <td>pageName</td>
+       <td>98,10</td>
+</tr>
+<tr>
+       <td>enterCharacter</td>
+       <td>pageName</td>
+       <td>Application_test</td>
+</tr>
+<tr>
+       <td>enterCharacter</td>
+       <td>pageDisplayName</td>
+       <td>Vaadin test</td>
+</tr>
+<tr>
+       <td>mouseClick</td>
+       <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td>
+       <td>24,16</td>
+</tr>
+<tr>
+       <td>waitForElementPresent</td>
+       <td>//form[@id='UIWizardPageSelectLayoutForm']/div[2]/div/div[1]/div[2]/div[1]/div[1]/div/div</td>
+       <td></td>
+</tr>
+<tr>
+       <td>mouseClick</td>
+       <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td>
+       <td>20,12</td>
+</tr>
+<tr>
+       <td>waitForElementPresent</td>
+       <td>link=demo</td>
+       <td></td>
+</tr>
+<tr>
+       <td>mouseClick</td>
+       <td>link=demo</td>
+       <td>24,7</td>
+</tr>
+<tr>
+       <td>waitForElementPresent</td>
+       <td>//div[@id='demo/AddressBookPortlet']/div/div/div[1]/div[1]</td>
+       <td></td>
+</tr>
+<tr>
+       <td>drag</td>
+       <td>//div[@id='demo/AddressBookPortlet']/div/div/div[1]/div[2]</td>
+       <td>147,6</td>
+</tr>
+<tr>
+       <td>mouseMoveAt</td>
+       <td>//div[2]/div/div/div[1]/div/div[2]/div/div/div/div</td>
+       <td>20,20</td>
+</tr>
+<tr>
+       <td>drop</td>
+       <td>//div[@id='UIPortalApplication']/div[4]</td>
+       <td>760,138</td>
+</tr>
+<tr>
+       <td>mouseClick</td>
+       <td>//a[@onclick='eXo.core.DOMUtil.disableOnClick(this);']</td>
+       <td>10,7</td>
+</tr>
+<tr>
+       <td>setTimeout</td>
+       <td>60000</td>
+       <td></td>
+</tr>
+<tr>
+       <td>waitForElementPresent</td>
+       <td>//tr[3]/td[1]/div</td>
+       <td></td>
+</tr>
+<tr>
+       <td>pause</td>
+       <td>500</td>
+       <td></td>
+</tr>
+<tr>
+       <td>mouseClick</td>
+       <td>//tr[3]/td[1]/div</td>
+       <td>64,15</td>
+</tr>
+<tr>
+       <td>screenCapture</td>
+       <td></td>
+       <td>Marge_selected</td>
+</tr>
+<tr>
+       <td>click</td>
+       <td>//div[4]/div/div/div[3]/div/div/span</td>
+       <td></td>
+</tr>
+<tr>
+       <td>screenCapture</td>
+       <td></td>
+       <td>Marge_in_edit_mode</td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/tests/integration-testscripts/weblogic-portal/integration-test-WebLogic-Portal-10.3.2-addressbook.html b/tests/integration-testscripts/weblogic-portal/integration-test-WebLogic-Portal-10.3.2-addressbook.html
new file mode 100644 (file)
index 0000000..802aa87
--- /dev/null
+++ b/tests/integration-testscripts/weblogic-portal/integration-test-WebLogic-Portal-10.3.2-addressbook.html
@@ -0,0 +1,62 @@
+<?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="http://vaadin-integration-tests.intra.itmill.com:7001/" />
+<title>weblogic-portal-integration</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">weblogic-portal-integration</td></tr>
+</thead><tbody>
+<tr>
+       <td>open</td>
+       <td>/AddrPortal/TestPortal.portal</td>
+       <td></td>
+</tr>
+<tr>
+       <td>mouseClick</td>
+       <td>vaadin=v-AddressBook_1::/VVerticalLayout[0]/ChildComponentContainer[1]/VSplitPanelHorizontal[0]/VSplitPanelVertical[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0]/domChild[0]</td>
+       <td>52,14</td>
+</tr>
+<tr>
+       <td>screenCapture</td>
+       <td></td>
+       <td>Marge_selected</td>
+</tr>
+<tr>
+       <td>click</td>
+       <td>vaadin=v-AddressBook_1::/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>screenCapture</td>
+       <td></td>
+       <td>Marge_in_edit_mode</td>
+</tr>
+<tr>
+       <td>mouseClick</td>
+       <td>vaadin=v-AddressBook_1::/VVerticalLayout[0]/ChildComponentContainer[1]/VSplitPanelHorizontal[0]/VSplitPanelVertical[0]/VForm[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]</td>
+       <td>52,13</td>
+</tr>
+<tr>
+       <td>enterCharacter</td>
+       <td>vaadin=v-AddressBook_1::/VVerticalLayout[0]/ChildComponentContainer[1]/VSplitPanelHorizontal[0]/VSplitPanelVertical[0]/VForm[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]</td>
+       <td>Margery</td>
+</tr>
+<tr>
+       <td>click</td>
+       <td>vaadin=v-AddressBook_1::/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>screenCapture</td>
+       <td></td>
+       <td>Margery_Simmons</td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/tests/integration-testscripts/weblogic-portal/weblogic-portal-integration.html b/tests/integration-testscripts/weblogic-portal/weblogic-portal-integration.html
deleted file mode 100644 (file)
index 802aa87..0000000
--- a/tests/integration-testscripts/weblogic-portal/weblogic-portal-integration.html
+++ /dev/null
@@ -1,62 +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="http://vaadin-integration-tests.intra.itmill.com:7001/" />
-<title>weblogic-portal-integration</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">weblogic-portal-integration</td></tr>
-</thead><tbody>
-<tr>
-       <td>open</td>
-       <td>/AddrPortal/TestPortal.portal</td>
-       <td></td>
-</tr>
-<tr>
-       <td>mouseClick</td>
-       <td>vaadin=v-AddressBook_1::/VVerticalLayout[0]/ChildComponentContainer[1]/VSplitPanelHorizontal[0]/VSplitPanelVertical[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0]/domChild[0]</td>
-       <td>52,14</td>
-</tr>
-<tr>
-       <td>screenCapture</td>
-       <td></td>
-       <td>Marge_selected</td>
-</tr>
-<tr>
-       <td>click</td>
-       <td>vaadin=v-AddressBook_1::/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>screenCapture</td>
-       <td></td>
-       <td>Marge_in_edit_mode</td>
-</tr>
-<tr>
-       <td>mouseClick</td>
-       <td>vaadin=v-AddressBook_1::/VVerticalLayout[0]/ChildComponentContainer[1]/VSplitPanelHorizontal[0]/VSplitPanelVertical[0]/VForm[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]</td>
-       <td>52,13</td>
-</tr>
-<tr>
-       <td>enterCharacter</td>
-       <td>vaadin=v-AddressBook_1::/VVerticalLayout[0]/ChildComponentContainer[1]/VSplitPanelHorizontal[0]/VSplitPanelVertical[0]/VForm[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]</td>
-       <td>Margery</td>
-</tr>
-<tr>
-       <td>click</td>
-       <td>vaadin=v-AddressBook_1::/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>screenCapture</td>
-       <td></td>
-       <td>Margery_Simmons</td>
-</tr>
-
-</tbody></table>
-</body>
-</html>
diff --git a/tests/integration_tests.xml b/tests/integration_tests.xml
index 9f9ef318652a27e2c5ec4814fbd8a5386429f8fa..6b315392f1f13b900625d2f08635147de771c840 100644 (file)
--- a/tests/integration_tests.xml
+++ b/tests/integration_tests.xml
@@ -295,7 +295,7 @@
        </target>\r
        \r
        <target name="integration-test-eXo-3">\r
-               <fileset dir="integration-testscripts" id="html-test-files" includes="eXo-3/eXo-integration.html" />\r
+               <fileset dir="integration-testscripts" id="html-test-files" includes="eXo-3/integration-test-eXo-3.0.3-addressbook.html" />\r
                <pathconvert pathsep=" " property="test-exo" refid="html-test-files" />\r
                \r
                <subant target="run-tests" failonerror="false" antfile="test.xml">\r
@@ -312,7 +312,7 @@
        </target>\r
        \r
        <target name="integration-test-weblogic-portal">\r
-               <fileset dir="integration-testscripts" id="html-test-files" includes="weblogic-portal/weblogic-portal-integration.html" />\r
+               <fileset dir="integration-testscripts" id="html-test-files" includes="weblogic-portal/integration-test-WebLogic-Portal-10.3.2-addressbook.html" />\r
                <pathconvert pathsep=" " property="test-weblogic" refid="html-test-files" />\r
                \r
                <subant target="run-tests" failonerror="false" antfile="test.xml">\r
Vaadin 6, 7, 8 is a Java framework for modern Java web applications: https://github.com/vaadin/framework