]> 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: 3d96df4)
WebLogic portal integration test using a separate test portlet
authorHenri Sara <henri.sara@itmill.com>
Thu, 11 Aug 2011 12:04:08 +0000 (12:04 +0000)
committerHenri Sara <henri.sara@itmill.com>
Thu, 11 Aug 2011 12:04:08 +0000 (12:04 +0000)
svn changeset:20299/svn branch:6.7

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

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 (file)
index 802aa87..0000000
--- 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 (file)
index 0000000..f29e30c
--- /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 f94705960792ff6f75045d9eca804b4b0d025c58..a525d5571b1370c245b723ce7535d576e5e164c3 100644 (file)
--- a/tests/integration_tests.xml
+++ b/tests/integration_tests.xml
@@ -278,7 +278,7 @@
        </target>\r
        \r
        <target name="integration-test-weblogic-portal">\r
-               <fileset dir="integration-testscripts" id="html-test-files" includes="weblogic-portal/integration-test-WebLogic-Portal-10.3.2-addressbook.html" />\r
+               <fileset dir="integration-testscripts" id="html-test-files" includes="weblogic-portal/integration-test-WebLogic-Portal-10.3.2-portlet2.html" />\r
                <pathconvert pathsep=" " property="test-weblogic" refid="html-test-files" />\r
                \r
                <subant target="run-tests" failonerror="false" antfile="test.xml">\r
@@ -371,7 +371,8 @@
        </target>\r
 \r
        <target name="integration-test-start-weblogic-portal">\r
-               <sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-weblogic-portal" />\r
+               <!-- Note the Vaadin 6.7+ target -->\r
+               <sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-weblogic-portal-67" />\r
        </target>\r
 \r
        <target name="integration-test-stop-weblogic-portal">\r
Vaadin 6, 7, 8 is a Java framework for modern Java web applications: https://github.com/vaadin/framework