From 7f7dc316e3593bc4823f2cbc8e6f4814f233ce03 Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Mon, 16 Sep 2013 08:50:16 +0300 Subject: Base files for TB3 tests (#12572) * Converted LabelModes to TB3 for validation Change-Id: Ic9e69d46623a16986961bdc8cc050b375622a91d --- uitest/eclipse-run-selected-test.properties | 26 +- .../vaadin/tests/components/label/LabelModes.html | 27 -- .../vaadin/tests/components/label/LabelModes.java | 9 + .../src/com/vaadin/tests/tb3/AbstractTB3Test.java | 516 +++++++++++++++++++++ .../src/com/vaadin/tests/tb3/MultiBrowserTest.java | 81 ++++ .../com/vaadin/tests/tb3/ParallelScheduler.java | 60 +++ .../vaadin/tests/tb3/PrivateTB3Configuration.java | 123 +++++ .../com/vaadin/tests/tb3/ScreenshotTB3Test.java | 392 ++++++++++++++++ .../vaadin/tests/tb3/SimpleMultiBrowserTest.java | 49 ++ uitest/src/com/vaadin/tests/tb3/TB3Runner.java | 167 +++++++ 10 files changed, 1415 insertions(+), 35 deletions(-) delete mode 100644 uitest/src/com/vaadin/tests/components/label/LabelModes.html create mode 100644 uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java create mode 100644 uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java create mode 100644 uitest/src/com/vaadin/tests/tb3/ParallelScheduler.java create mode 100644 uitest/src/com/vaadin/tests/tb3/PrivateTB3Configuration.java create mode 100644 uitest/src/com/vaadin/tests/tb3/ScreenshotTB3Test.java create mode 100644 uitest/src/com/vaadin/tests/tb3/SimpleMultiBrowserTest.java create mode 100644 uitest/src/com/vaadin/tests/tb3/TB3Runner.java diff --git a/uitest/eclipse-run-selected-test.properties b/uitest/eclipse-run-selected-test.properties index f6cb2551e9..cbd1ab1cef 100644 --- a/uitest/eclipse-run-selected-test.properties +++ b/uitest/eclipse-run-selected-test.properties @@ -1,14 +1,23 @@ -; 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/ +; +; For both TestBench 2 and 3 +; ; 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 + +; +; For only TestBench 2 +; + +; Location where TestBench 2 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/ + +; Run the whole test even if a screenshot comparison fails com.vaadin.testbench.screenshot.softfail=true ; Screen capture at the end if the test fails @@ -23,7 +32,8 @@ com.vaadin.testbench.screenshot.cursor=true ; 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 +; Claim that the server has started succesfully. Needed for TB2 tests to be executed server.start.succeeded=1 -test-output-dir=../build/test-output \ No newline at end of file +; Directory where temporary Java classes are created +test-output-dir=../build/test-output diff --git a/uitest/src/com/vaadin/tests/components/label/LabelModes.html b/uitest/src/com/vaadin/tests/components/label/LabelModes.html deleted file mode 100644 index 356688b456..0000000000 --- a/uitest/src/com/vaadin/tests/components/label/LabelModes.html +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - -New Test - - - - - - - - - - - - - - - - - -
New Test
open/run/com.vaadin.tests.components.label.LabelModes?restartApplication
screenCapturelabelmodes
- - diff --git a/uitest/src/com/vaadin/tests/components/label/LabelModes.java b/uitest/src/com/vaadin/tests/components/label/LabelModes.java index e5bc539f36..1959447a4b 100644 --- a/uitest/src/com/vaadin/tests/components/label/LabelModes.java +++ b/uitest/src/com/vaadin/tests/components/label/LabelModes.java @@ -2,10 +2,19 @@ package com.vaadin.tests.components.label; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.components.ComponentTestCase; +import com.vaadin.tests.tb3.SimpleMultiBrowserTest; import com.vaadin.ui.Label; public class LabelModes extends ComponentTestCase