]> 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: 63793c0)
#4497 GateIn Portlet2 test
authorHenri Sara <henri.sara@itmill.com>
Thu, 11 Aug 2011 06:40:55 +0000 (06:40 +0000)
committerHenri Sara <henri.sara@itmill.com>
Thu, 11 Aug 2011 06:40:55 +0000 (06:40 +0000)
svn changeset:20283/svn branch:6.7

tests/integration-testscripts/GateIn-3/integration-test-GateIn-3.1.0-addressbook.html [deleted file] patch | blob | history
tests/integration-testscripts/GateIn-3/integration-test-GateIn-3.1.0-portlet2.html [new file with mode: 0644] patch | blob
tests/integration_tests.xml patch | blob | history

diff --git a/tests/integration-testscripts/GateIn-3/integration-test-GateIn-3.1.0-addressbook.html b/tests/integration-testscripts/GateIn-3/integration-test-GateIn-3.1.0-addressbook.html
deleted file mode 100644 (file)
index 0bc1c1a..0000000
--- a/tests/integration-testscripts/GateIn-3/integration-test-GateIn-3.1.0-addressbook.html
+++ /dev/null
@@ -1,152 +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>integration-test-GateIn-3.1.0-addressbook</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">integration-test-GateIn-3.1.0-addressbook</td></tr>
-</thead><tbody>
-<tr>
-       <td>open</td>
-       <td>/portal/public/classic/</td>
-       <td></td>
-</tr>
-<tr>
-       <td>setSpeed</td>
-       <td>100</td>
-       <td>100</td>
-</tr>
-<tr>
-       <td>mouseClickAndWait</td>
-       <td>link=Administrator</td>
-       <td>27,7</td>
-</tr>
-<tr>
-       <td>mouseClickAndWait</td>
-       <td>link=Application Registry</td>
-       <td>93,13</td>
-</tr>
-<tr>
-       <td>expectDialog</td>
-       <td>//div[2]/div[2]/div[1]/div[1]/div[2]</td>
-       <td>73,18</td>
-</tr>
-<tr>
-       <td>assertConfirmation</td>
-       <td>This action will automatically create categories and import all the gadgets and portlets on it.</td>
-       <td></td>
-</tr>
-<tr>
-       <td>waitForElementPresent</td>
-       <td>link=demo</td>
-       <td></td>
-</tr>
-<tr>
-       <td>mouseClickAndWait</td>
-       <td>link=Home</td>
-       <td>65,18</td>
-</tr>
-<tr>
-       <td>mouseClick</td>
-       <td>link=Add New Page</td>
-       <td>55,11</td>
-</tr>
-<tr>
-       <td>waitForElementPresent</td>
-       <td>pageName</td>
-       <td></td>
-</tr>
-<tr>
-       <td>mouseClick</td>
-       <td>pageName</td>
-       <td>33,16</td>
-</tr>
-<tr>
-       <td>enterCharacter</td>
-       <td>pageName</td>
-       <td>AddressBook</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>36,12</td>
-</tr>
-<tr>
-       <td>waitForElementPresent</td>
-       <td>//div[@id='UIDropDownPageTemp']/div[1]/div/div/div/div/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>21,13</td>
-</tr>
-<tr>
-       <td>waitForElementPresent</td>
-       <td>//div[@id='UIPageEditor']/div[1]/div/div/div/div[2]</td>
-       <td></td>
-</tr>
-<tr>
-       <td>mouseClick</td>
-       <td>//div[3]/div</td>
-       <td>51,11</td>
-</tr>
-<tr>
-       <td>pause</td>
-       <td>300</td>
-       <td></td>
-</tr>
-<tr>
-       <td>drag</td>
-       <td>//div[@id='demo/AddressBookPortlet']/div/div/div[1]/div[2]</td>
-       <td></td>
-</tr>
-<tr>
-       <td>drop</td>
-       <td>//div[2]/div/div/div[1]/div/div[2]/div/div/div/div</td>
-       <td>113,9</td>
-</tr>
-<tr>
-       <td>mouseClickAndWait</td>
-       <td>//a[@onclick='eXo.core.DOMUtil.disableOnClick(this);']</td>
-       <td>13,5</td>
-</tr>
-<tr>
-       <td>mouseClick</td>
-       <td>//div[@id='UIPage']/div/div/div[2]/div/div/div/div/div/div/div[2]/div/div[2]/div/div/div/div[1]/div/div/div[2]/div/div[2]/div[1]/table/tbody/tr[3]/td[1]/div</td>
-       <td>62,13</td>
-</tr>
-<tr>
-       <td>pause</td>
-       <td>500</td>
-       <td></td>
-</tr>
-<tr>
-       <td>screenCapture</td>
-       <td></td>
-       <td>Marge_selected</td>
-</tr>
-<tr>
-       <td>click</td>
-       <td>//div[@id='UIPage']/div/div/div[2]/div/div/div/div/div/div/div[2]/div/div[2]/div/div/div/div[1]/div/div/div[1]/div/fieldset/div[4]/div/div/div[3]/div/div/span/span</td>
-       <td></td>
-</tr>
-<tr>
-       <td>pause</td>
-       <td>500</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/GateIn-3/integration-test-GateIn-3.1.0-portlet2.html b/tests/integration-testscripts/GateIn-3/integration-test-GateIn-3.1.0-portlet2.html
new file mode 100644 (file)
index 0000000..de07fcc
--- /dev/null
+++ b/tests/integration-testscripts/GateIn-3/integration-test-GateIn-3.1.0-portlet2.html
@@ -0,0 +1,162 @@
+<?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>integration-test-GateIn-3.1.0-portlet2</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">integration-test-GateIn-3.1.0-portlet2</td></tr>
+</thead><tbody>
+<tr>
+       <td>open</td>
+       <td>/portal/public/classic/</td>
+       <td></td>
+</tr>
+<tr>
+       <td>setSpeed</td>
+       <td>100</td>
+       <td>100</td>
+</tr>
+<tr>
+       <td>mouseClickAndWait</td>
+       <td>link=Administrator</td>
+       <td>27,7</td>
+</tr>
+<tr>
+       <td>mouseClickAndWait</td>
+       <td>link=Application Registry</td>
+       <td>93,13</td>
+</tr>
+<tr>
+       <td>expectDialog</td>
+       <td>//div[2]/div[2]/div[1]/div[1]/div[2]</td>
+       <td>73,18</td>
+</tr>
+<tr>
+       <td>assertConfirmation</td>
+       <td>This action will automatically create categories and import all the gadgets and portlets on it.</td>
+       <td></td>
+</tr>
+<tr>
+       <td>waitForElementPresent</td>
+       <td>link=demo</td>
+       <td></td>
+</tr>
+<tr>
+       <td>mouseClickAndWait</td>
+       <td>link=Home</td>
+       <td>65,18</td>
+</tr>
+<tr>
+       <td>mouseClick</td>
+       <td>link=Add New Page</td>
+       <td>55,11</td>
+</tr>
+<tr>
+       <td>waitForElementPresent</td>
+       <td>pageName</td>
+       <td></td>
+</tr>
+<tr>
+       <td>mouseClick</td>
+       <td>pageName</td>
+       <td>33,16</td>
+</tr>
+<tr>
+       <td>enterCharacter</td>
+       <td>pageName</td>
+       <td>Portlet2</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>36,12</td>
+</tr>
+<tr>
+       <td>waitForElementPresent</td>
+       <td>//div[@id='UIDropDownPageTemp']/div[1]/div/div/div/div/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>21,13</td>
+</tr>
+<tr>
+       <td>waitForElementPresent</td>
+       <td>//div[@id='UIPageEditor']/div[1]/div/div/div/div[2]</td>
+       <td></td>
+</tr>
+<tr>
+       <td>mouseClick</td>
+       <td>//div[3]/div</td>
+       <td>51,11</td>
+</tr>
+<tr>
+       <td>pause</td>
+       <td>300</td>
+       <td></td>
+</tr>
+<tr>
+       <td>drag</td>
+       <td>//div[@id='demo/JSR286TestPortlet']/div/div/div[1]/div[2]</td>
+       <td></td>
+</tr>
+<tr>
+       <td>drop</td>
+       <td>//div[2]/div/div/div[1]/div/div[2]/div/div/div/div</td>
+       <td>113,9</td>
+</tr>
+<tr>
+       <td>mouseClickAndWait</td>
+       <td>//a[@onclick='eXo.core.DOMUtil.disableOnClick(this);']</td>
+       <td>13,5</td>
+</tr>
+<tr>
+       <td>mouseClickAndWait</td>
+       <td>//div[@id='UIPage']/div/div/div[2]/div/div/div/div/div/div/div[2]/div/div[3]/div/div/a</td>
+       <td>10,10</td>
+</tr>
+<tr>
+       <td>closeNotification</td>
+       <td>//body/div[2]</td>
+       <td>0,0</td>
+</tr>
+<tr>
+       <td>pause</td>
+       <td>500</td>
+       <td></td>
+</tr>
+<tr>
+       <td>screenCapture</td>
+       <td></td>
+       <td>Edit_mode</td>
+</tr>
+<tr>
+       <td>mouseClickAndWait</td>
+       <td>//div[@id='UIPage']/div/div/div[2]/div/div/div/div/div/div/div[2]/div/div[3]/div/div/a</td>
+       <td>15,8</td>
+</tr>
+<tr>
+       <td>closeNotification</td>
+       <td>//body/div[2]</td>
+       <td>0,0</td>
+</tr>
+<tr>
+       <td>pause</td>
+       <td>500</td>
+       <td></td>
+</tr>
+<tr>
+       <td>screenCapture</td>
+       <td></td>
+       <td>done</td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/tests/integration_tests.xml b/tests/integration_tests.xml
index 1d6ba4fc9ab94b431e6acfe3c07bd7200da05cce..7eb1e5bacb73253fa85fb14f47f6c728e0ede1d9 100644 (file)
--- a/tests/integration_tests.xml
+++ b/tests/integration_tests.xml
@@ -243,7 +243,7 @@
                </target>       \r
        \r
        <target name="integration-test-gatein-3">\r
-               <fileset dir="integration-testscripts" id="html-test-files" includes="GateIn-3/integration-test-GateIn-3.1.0-addressbook.html" />\r
+               <fileset dir="integration-testscripts" id="html-test-files" includes="GateIn-3/integration-test-GateIn-3.1.0-portlet2.html" />\r
                <pathconvert pathsep=" " property="test-gatein" refid="html-test-files" />\r
                \r
                <subant target="run-tests" failonerror="false" antfile="test.xml">\r
@@ -641,7 +641,10 @@
                                <antcall target="integration-test-${target-server}" />\r
                        </try>\r
                        <catch>\r
-                               <concat>##teamcity[testFailed name='${target-server}' flowId='${target-server}' message='Integration test for ${target-server} failed.' details='${tried}']"</concat>\r
+                               <!-- Should also perform other escaping - see http://confluence.jetbrains.net/display/TCD65/Build+Script+Interaction+with+TeamCity -->\r
+                               <!-- Also, the first escaped message may override any later ones (Ant properties are immutable) -->\r
+                               <propertyregex property="tried-escaped" input="${tried}" regexp="\\n" replace="|n" global="true" />\r
+                               <concat>##teamcity[testFailed name='${target-server}' flowId='${target-server}' message='Integration test for ${target-server} failed.' details='${tried-escaped}']"</concat>\r
                        </catch>\r
                </trycatch>\r
                <concat>##teamcity[testFinished name='${target-server}' flowId='${target-server}']"</concat>\r
Vaadin 6, 7, 8 is a Java framework for modern Java web applications: https://github.com/vaadin/framework