diff options
| author | Henri Sara <henri.sara@itmill.com> | 2011-08-11 12:04:08 +0000 |
|---|---|---|
| committer | Henri Sara <henri.sara@itmill.com> | 2011-08-11 12:04:08 +0000 |
| commit | 39605c944fd22517a661119bde527346e6d573d2 (patch) | |
| tree | bd059ef4a61fc6ae8e7e2d6d2eec15f3b1645228 | |
| parent | 3d96df462af4179e956fb541ce38869d01a41ce1 (diff) | |
| download | vaadin-framework-39605c944fd22517a661119bde527346e6d573d2.tar.gz vaadin-framework-39605c944fd22517a661119bde527346e6d573d2.zip | |
WebLogic portal integration test using a separate test portlet
svn changeset:20299/svn branch:6.7
3 files changed, 60 insertions, 64 deletions
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 deleted file mode 100644 index 802aa87160..0000000000 --- a/tests/integration-testscripts/weblogic-portal/integration-test-WebLogic-Portal-10.3.2-addressbook.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-testscripts/weblogic-portal/integration-test-WebLogic-Portal-10.3.2-portlet2.html b/tests/integration-testscripts/weblogic-portal/integration-test-WebLogic-Portal-10.3.2-portlet2.html new file mode 100644 index 0000000000..f29e30c89a --- /dev/null +++ b/tests/integration-testscripts/weblogic-portal/integration-test-WebLogic-Portal-10.3.2-portlet2.html @@ -0,0 +1,57 @@ +<?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>integration-test-WebLogic-Portal-10.3.2-portlet2</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">integration-test-WebLogic-Portal-10.3.2-portlet2</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/VaadinTest/TestPortal.portal</td> + <td></td> +</tr> +<tr> + <td>closeNotification</td> + <td>//body/div[4]</td> + <td>0,0</td> +</tr> +<tr> + <td>mouseClickAndWait</td> + <td>edit</td> + <td>31,9</td> +</tr> +<tr> + <td>closeNotification</td> + <td>//body/div[4]</td> + <td>0,0</td> +</tr> +<tr> + <td>screenCapture</td> + <td></td> + <td>Edit_mode</td> +</tr> +<tr> + <td>mouseClickAndWait</td> + <td>vaadin=v-JSR286TestPortlet_1::/VVerticalLayout[0]/ChildComponentContainer[2]/VLink[0]/domChild[0]/domChild[0]</td> + <td>44,2</td> +</tr> +<tr> + <td>closeNotification</td> + <td>//body/div[4]</td> + <td>0,0</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 f947059607..a525d5571b 100644 --- a/tests/integration_tests.xml +++ b/tests/integration_tests.xml @@ -278,7 +278,7 @@ </target>
<target name="integration-test-weblogic-portal">
- <fileset dir="integration-testscripts" id="html-test-files" includes="weblogic-portal/integration-test-WebLogic-Portal-10.3.2-addressbook.html" />
+ <fileset dir="integration-testscripts" id="html-test-files" includes="weblogic-portal/integration-test-WebLogic-Portal-10.3.2-portlet2.html" />
<pathconvert pathsep=" " property="test-weblogic" refid="html-test-files" />
<subant target="run-tests" failonerror="false" antfile="test.xml">
@@ -371,7 +371,8 @@ </target>
<target name="integration-test-start-weblogic-portal">
- <sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-weblogic-portal" />
+ <!-- Note the Vaadin 6.7+ target -->
+ <sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-weblogic-portal-67" />
</target>
<target name="integration-test-stop-weblogic-portal">
|