From cf2f5f035688f6e861608460ad3a65198dd09768 Mon Sep 17 00:00:00 2001 From: Henri Sara Date: Tue, 8 Jun 2010 06:21:15 +0000 Subject: [PATCH] Merged automated test related changes from 6.3 to 6.4 svn changeset:13614/svn branch:6.4 --- tests/Run selected test (all browsers).launch | 29 ------------------- tests/eclipse-run-selected-test.properties | 27 +++++++++++++++++ tests/scripts/sampler-all-samples.html | 10 +++++++ .../components/caption/LargeCaptionIcon.html | 4 +-- .../components/caption/LargeCaptionIcon.java | 2 +- .../combobox/ComboBoxReapperingOldValue.html | 5 ++++ .../validation/EmptyFieldErrorIndicators.html | 20 ------------- 7 files changed, 45 insertions(+), 52 deletions(-) delete mode 100644 tests/Run selected test (all browsers).launch create mode 100644 tests/eclipse-run-selected-test.properties 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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= + +; Deployment url to use for testing. Context path must be / +com.vaadin.testbench.deployment.url=http://:8888/ + +; Location of the screenshot directory. +; This is the directory that contains the "references" directory +com.vaadin.testbench.screenshot.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 @@ +pause +5000 + + + +waitForVaadin + + + + screenCapture LayoutMargin 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 @@ pause - 500 + 750 @@ -33,7 +33,7 @@ pause - 500 + 750 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 @@ -106,6 +106,11 @@ + + pause + 200 + + screenCapture 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 @@ -86,16 +86,6 @@ - - mouseClick - vaadin=runcomvaadintestsvalidationEmptyFieldErrorIndicators::PID_SvalidatedFieldPart/VVerticalLayout[0]/ChildComponentContainer[0]/VForm[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VNativeSelect[0]/domChild[0] - 63,11 - - - waitForVaadin - - - select vaadin=runcomvaadintestsvalidationEmptyFieldErrorIndicators::PID_SvalidatedFieldPart/VVerticalLayout[0]/ChildComponentContainer[0]/VForm[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VNativeSelect[0]/domChild[0] @@ -186,16 +176,6 @@ - - mouseClick - 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] - 60,13 - - - waitForVaadin - - - select 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] -- 2.39.5