diff options
| -rw-r--r-- | tests/integration-testscripts/GateIn-3/integration-test-GateIn-3.1.0-portlet2.html (renamed from tests/integration-testscripts/GateIn-3/integration-test-GateIn-3.1.0-addressbook.html) | 34 | ||||
| -rw-r--r-- | tests/integration_tests.xml | 7 |
2 files changed, 27 insertions, 14 deletions
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-portlet2.html index 0bc1c1abbf..de07fccc3e 100644 --- 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-portlet2.html @@ -4,12 +4,12 @@ <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> +<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-addressbook</td></tr> +<tr><td rowspan="1" colspan="3">integration-test-GateIn-3.1.0-portlet2</td></tr> </thead><tbody> <tr> <td>open</td> @@ -69,7 +69,7 @@ <tr> <td>enterCharacter</td> <td>pageName</td> - <td>AddressBook</td> + <td>Portlet2</td> </tr> <tr> <td>mouseClick</td> @@ -103,7 +103,7 @@ </tr> <tr> <td>drag</td> - <td>//div[@id='demo/AddressBookPortlet']/div/div/div[1]/div[2]</td> + <td>//div[@id='demo/JSR286TestPortlet']/div/div/div[1]/div[2]</td> <td></td> </tr> <tr> @@ -117,9 +117,14 @@ <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> + <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> @@ -129,12 +134,17 @@ <tr> <td>screenCapture</td> <td></td> - <td>Marge_selected</td> + <td>Edit_mode</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> + <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> @@ -144,7 +154,7 @@ <tr> <td>screenCapture</td> <td></td> - <td>Marge_in_edit_mode</td> + <td>done</td> </tr> </tbody></table> diff --git a/tests/integration_tests.xml b/tests/integration_tests.xml index 1d6ba4fc9a..7eb1e5bacb 100644 --- a/tests/integration_tests.xml +++ b/tests/integration_tests.xml @@ -243,7 +243,7 @@ </target>
<target name="integration-test-gatein-3">
- <fileset dir="integration-testscripts" id="html-test-files" includes="GateIn-3/integration-test-GateIn-3.1.0-addressbook.html" />
+ <fileset dir="integration-testscripts" id="html-test-files" includes="GateIn-3/integration-test-GateIn-3.1.0-portlet2.html" />
<pathconvert pathsep=" " property="test-gatein" refid="html-test-files" />
<subant target="run-tests" failonerror="false" antfile="test.xml">
@@ -641,7 +641,10 @@ <antcall target="integration-test-${target-server}" />
</try>
<catch>
- <concat>##teamcity[testFailed name='${target-server}' flowId='${target-server}' message='Integration test for ${target-server} failed.' details='${tried}']"</concat>
+ <!-- Should also perform other escaping - see http://confluence.jetbrains.net/display/TCD65/Build+Script+Interaction+with+TeamCity -->
+ <!-- Also, the first escaped message may override any later ones (Ant properties are immutable) -->
+ <propertyregex property="tried-escaped" input="${tried}" regexp="\\n" replace="|n" global="true" />
+ <concat>##teamcity[testFailed name='${target-server}' flowId='${target-server}' message='Integration test for ${target-server} failed.' details='${tried-escaped}']"</concat>
</catch>
</trycatch>
<concat>##teamcity[testFinished name='${target-server}' flowId='${target-server}']"</concat>
|