Merged automated test related changes from 6.3 to 6.4

svn changeset:13614/svn branch:6.4

7 files changed, 45 insertions, 52 deletions

diff --git a/tests/Run selected test (all browsers).launch b/tests/Run selected test (all browsers).launch
deleted file mode 100644
index 6bd7c95378..0000000000
--- a/tests/Run selected test (all browsers).launch
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">

-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>

-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;launchConfigurationWorkingSet editPageId=&quot;org.eclipse.ui.resourceWorkingSetPage&quot; factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; id=&quot;1255941973781_71&quot; label=&quot;working set&quot; name=&quot;working set&quot;&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/vaadin/tests/screenshots/errors&quot; type=&quot;2&quot;/&gt;&#13;&#10;&lt;/launchConfigurationWorkingSet&gt;}"/>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">

-<listEntry value="/vaadin/tests/test.xml"/>

-</listAttribute>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">

-<listEntry value="1"/>

-</listAttribute>

-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">

-<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>

-</listAttribute>

-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>

-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0_12"/>

-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.ui.antsupport.InternalAntRunner"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="vaadin"/>

-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>

-<mapAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_PROPERTIES">

-<mapEntry key="browsers" value="winxp-opera10"/>

-<mapEntry key="com.vaadin.testbench.deployment.url" value="http://192.168.2.75:8888/"/>

-<mapEntry key="com.vaadin.testbench.lib.dir" value="c:\temp\tb"/>

-<mapEntry key="com.vaadin.testbench.screenshot.softfail" value="true"/>

-<mapEntry key="testfiles" value="${resource_loc}"/>

-</mapAttribute>

-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/vaadin/tests/test.xml}"/>

-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-v"/>

-<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>

-</launchConfiguration>

diff --git a/tests/eclipse-run-selected-test.properties b/tests/eclipse-run-selected-test.properties
new file mode 100644
index 0000000000..3367d011d0
--- /dev/null
+++ b/tests/eclipse-run-selected-test.properties
@@ -0,0 +1,27 @@
+; Location where vaadin-testbench jar can be found

+com.vaadin.testbench.lib.dir=<enter location of testbench here>

+

+; Deployment url to use for testing. Context path must be /  

+com.vaadin.testbench.deployment.url=http://<enter your ip here>:8888/

+

+; Location of the screenshot directory. 

+; This is the directory that contains the "references" directory

+com.vaadin.testbench.screenshot.directory=<enter the full path to the screenshots directory, parent of "references" directory>

+

+; Run the whole test even if 

+com.vaadin.testbench.screenshot.softfail=true

+

+; Screen capture at the end if the test fails

+com.vaadin.testbench.screenshot.onfail=true

+

+; Enable cursor detection

+com.vaadin.testbench.screenshot.cursor=true

+

+; Run the test case that is focused in Eclipse. Must be set in Eclipse launch configuration and not here. 

+; testfiles=${resource_loc}

+

+; Uncomment to limit to certain browsers or override in launch configuration

+; browsers=winxp-opera10

+

+; Claim that the server has started succesfully. Needed for the tests to run

+server.start.succeeded=1
\ No newline at end of file
diff --git a/tests/scripts/sampler-all-samples.html b/tests/scripts/sampler-all-samples.html
index 3cdc171155..d8b123ddf1 100644
--- a/tests/scripts/sampler-all-samples.html
+++ b/tests/scripts/sampler-all-samples.html
@@ -2772,6 +2772,16 @@
 </tr>
 <!--LayoutMargin-->
 <tr>
+<td>pause</td>
+<td>5000</td>
+<td></td>
+</tr>
+<tr>
+<td>waitForVaadin</td>
+<td></td>
+<td></td>
+</tr>
+<tr>
 <td>screenCapture</td>
 <td></td>
 <td>LayoutMargin</td>
diff --git a/tests/src/com/vaadin/tests/components/caption/LargeCaptionIcon.html b/tests/src/com/vaadin/tests/components/caption/LargeCaptionIcon.html
index d2928cf4c3..7c94821e7f 100644
--- a/tests/src/com/vaadin/tests/components/caption/LargeCaptionIcon.html
+++ b/tests/src/com/vaadin/tests/components/caption/LargeCaptionIcon.html
@@ -18,7 +18,7 @@
 </tr>
 <tr>
 	<td>pause</td>
-	<td>500</td>
+	<td>750</td>
 	<td></td>
 </tr>
 <tr>
@@ -33,7 +33,7 @@
 </tr>
 <tr>
 	<td>pause</td>
-	<td>500</td>
+	<td>750</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/tests/src/com/vaadin/tests/components/caption/LargeCaptionIcon.java b/tests/src/com/vaadin/tests/components/caption/LargeCaptionIcon.java
index 0ff82e9847..603fdf458b 100644
--- a/tests/src/com/vaadin/tests/components/caption/LargeCaptionIcon.java
+++ b/tests/src/com/vaadin/tests/components/caption/LargeCaptionIcon.java
@@ -9,7 +9,7 @@ public class LargeCaptionIcon extends TestBase {
 
     @Override
     protected String getDescription() {
-        return "The icon should be completetly visible on both initial load and after subsequent refreshes.";
+        return "The icon should be completely visible on both initial load and after subsequent refreshes.";
     }
 
     @Override
diff --git a/tests/src/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.html b/tests/src/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.html
index c4980a31e4..e2615952e8 100644
--- a/tests/src/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.html
+++ b/tests/src/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.html
@@ -107,6 +107,11 @@
 	<td></td>
 </tr>
 <tr>
+	<td>pause</td>
+	<td>200</td>
+	<td></td>
+</tr>
+<tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td></td>
diff --git a/tests/src/com/vaadin/tests/validation/EmptyFieldErrorIndicators.html b/tests/src/com/vaadin/tests/validation/EmptyFieldErrorIndicators.html
index 29b92f9d61..c8fcb20411 100644
--- a/tests/src/com/vaadin/tests/validation/EmptyFieldErrorIndicators.html
+++ b/tests/src/com/vaadin/tests/validation/EmptyFieldErrorIndicators.html
@@ -87,16 +87,6 @@
 	<td></td>
 </tr>
 <tr>
-	<td>mouseClick</td>
-	<td>vaadin=runcomvaadintestsvalidationEmptyFieldErrorIndicators::PID_SvalidatedFieldPart/VVerticalLayout[0]/ChildComponentContainer[0]/VForm[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VNativeSelect[0]/domChild[0]</td>
-	<td>63,11</td>
-</tr>
-<tr>
-	<td>waitForVaadin</td>
-	<td></td>
-	<td></td>
-</tr>
-<tr>
 	<td>select</td>
 	<td>vaadin=runcomvaadintestsvalidationEmptyFieldErrorIndicators::PID_SvalidatedFieldPart/VVerticalLayout[0]/ChildComponentContainer[0]/VForm[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VNativeSelect[0]/domChild[0]</td>
 	<td>label=Value 1</td>
@@ -187,16 +177,6 @@
 	<td></td>
 </tr>
 <tr>
-	<td>mouseClick</td>
-	<td>vaadin=runcomvaadintestsvalidationEmptyFieldErrorIndicators::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VPanel[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[1]/VPanel[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VForm[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VNativeSelect[0]/domChild[0]</td>
-	<td>60,13</td>
-</tr>
-<tr>
-	<td>waitForVaadin</td>
-	<td></td>
-	<td></td>
-</tr>
-<tr>
 	<td>select</td>
 	<td>vaadin=runcomvaadintestsvalidationEmptyFieldErrorIndicators::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VPanel[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[1]/VPanel[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VForm[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VNativeSelect[0]/domChild[0]</td>
 	<td>label=Value 1</td>