diff options
| author | Artur Signell <artur@vaadin.com> | 2015-09-04 12:53:03 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2015-09-04 13:01:02 +0300 |
| commit | f03e488f206c92f321e7e79bfb9c86c56077b341 (patch) | |
| tree | 9480f6b48e99bd3a0e4d4d97dd63b94fb90d3778 /uitest/src/com/vaadin/tests/tb3 | |
| parent | 3b4bd95b6e9383949bf8cf61d8b0b2c08b8443aa (diff) | |
| download | vaadin-framework-f03e488f206c92f321e7e79bfb9c86c56077b341.tar.gz vaadin-framework-f03e488f206c92f321e7e79bfb9c86c56077b341.zip | |
Additional fixes related to ParameterizedTB3Runner and Nginx + Wildfly 9 test changes
Change-Id: Ib6740b10fe773c2d54973ea45a1aca0d29afeb49
Diffstat (limited to 'uitest/src/com/vaadin/tests/tb3')
| -rw-r--r-- | uitest/src/com/vaadin/tests/tb3/IncludeIfProperty.java | 11 | ||||
| -rw-r--r-- | uitest/src/com/vaadin/tests/tb3/ScreenshotTB3Test.java | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/uitest/src/com/vaadin/tests/tb3/IncludeIfProperty.java b/uitest/src/com/vaadin/tests/tb3/IncludeIfProperty.java index cb04b4f2e8..789422c0c6 100644 --- a/uitest/src/com/vaadin/tests/tb3/IncludeIfProperty.java +++ b/uitest/src/com/vaadin/tests/tb3/IncludeIfProperty.java @@ -21,6 +21,17 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +/** + * Annotation to control inclusion of a test into a test suite. + * <p> + * The test will be included in the suite only if the given System property + * {@code property} has the given {@code value}. + * <p> + * Used by {@link TB3TestLocator} + * + * @since + * @author Vaadin Ltd + */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) @Inherited diff --git a/uitest/src/com/vaadin/tests/tb3/ScreenshotTB3Test.java b/uitest/src/com/vaadin/tests/tb3/ScreenshotTB3Test.java index 78266e9a9d..1c24720075 100644 --- a/uitest/src/com/vaadin/tests/tb3/ScreenshotTB3Test.java +++ b/uitest/src/com/vaadin/tests/tb3/ScreenshotTB3Test.java @@ -439,7 +439,7 @@ public abstract class ScreenshotTB3Test extends AbstractTB3Test { // Windows_Firefox_24_bufferingdemo_valo if (versionOverride != null) { - // Windows_Firefox_17_-buffering-demo_valo + // Windows_Firefox_17_bufferingdemo_valo parameters = parameters.replaceFirst("_" + getDesiredCapabilities().getVersion(), "_" + versionOverride); |