aboutsummaryrefslogtreecommitdiffstats
path: root/uitest-common
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2016-08-18 09:31:40 +0300
committerArtur Signell <artur@vaadin.com>2016-08-18 09:31:40 +0300
commiteeffa805a212ebb25c4af18db1e927b23a3ad66a (patch)
tree3bfdb4ef4b8e9b6e9e45c77c90b4f31eba1af94e /uitest-common
parent6d54d78944f6c3278eed3bb5e7ee19687ee5714e (diff)
downloadvaadin-framework-eeffa805a212ebb25c4af18db1e927b23a3ad66a.tar.gz
vaadin-framework-eeffa805a212ebb25c4af18db1e927b23a3ad66a.zip
Remove trailing whitespace from code and javadoc
Change-Id: I4c852b7f9928e190572876690d5bef1234494a5d
Diffstat (limited to 'uitest-common')
-rw-r--r--uitest-common/src/main/java/com/vaadin/tests/tb3/AbstractTB3Test.java114
-rw-r--r--uitest-common/src/main/java/com/vaadin/tests/tb3/CustomTestBenchCommandExecutor.java16
-rw-r--r--uitest-common/src/main/java/com/vaadin/tests/tb3/ExcludeFromSuite.java8
-rw-r--r--uitest-common/src/main/java/com/vaadin/tests/tb3/IncludeIfProperty.java8
-rw-r--r--uitest-common/src/main/java/com/vaadin/tests/tb3/MultiBrowserTest.java12
-rw-r--r--uitest-common/src/main/java/com/vaadin/tests/tb3/ParallelScheduler.java10
-rw-r--r--uitest-common/src/main/java/com/vaadin/tests/tb3/ParameterizedTB3Runner.java8
-rw-r--r--uitest-common/src/main/java/com/vaadin/tests/tb3/PrivateTB3Configuration.java10
-rw-r--r--uitest-common/src/main/java/com/vaadin/tests/tb3/RetryOnFail.java6
-rw-r--r--uitest-common/src/main/java/com/vaadin/tests/tb3/ScreenshotTB3Test.java24
-rw-r--r--uitest-common/src/main/java/com/vaadin/tests/tb3/TB3Runner.java2
-rw-r--r--uitest-common/src/main/java/com/vaadin/tests/tb3/TB3TestLocator.java16
-rw-r--r--uitest-common/src/main/java/com/vaadin/tests/tb3/TB3TestSuite.java8
13 files changed, 121 insertions, 121 deletions
diff --git a/uitest-common/src/main/java/com/vaadin/tests/tb3/AbstractTB3Test.java b/uitest-common/src/main/java/com/vaadin/tests/tb3/AbstractTB3Test.java
index c2a0bc8793..83bf84ea2f 100644
--- a/uitest-common/src/main/java/com/vaadin/tests/tb3/AbstractTB3Test.java
+++ b/uitest-common/src/main/java/com/vaadin/tests/tb3/AbstractTB3Test.java
@@ -1,12 +1,12 @@
/*
* Copyright 2000-2014 Vaadin Ltd.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -80,7 +80,7 @@ import elemental.json.impl.JsonUtil;
/**
* Base class for TestBench 3+ tests. All TB3+ tests in the project should
* extend this class.
- *
+ *
* Provides:
* <ul>
* <li>Helpers for browser selection</li>
@@ -91,7 +91,7 @@ import elemental.json.impl.JsonUtil;
* {@link #isPush()}</li>
* <li>Generic helpers for creating TB3+ tests</li>
* </ul>
- *
+ *
* @author Vaadin Ltd
*/
@RunWith(TB3Runner.class)
@@ -139,7 +139,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
/**
* Connect to the hub using a remote web driver, set the canvas size and
* opens the initial URL as specified by {@link #getTestUrl()}
- *
+ *
* @throws Exception
*/
@Override
@@ -288,7 +288,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
/**
* Returns the full URL to be used for the test
- *
+ *
* @return the full URL for the test
*/
protected String getTestUrl() {
@@ -297,7 +297,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
/**
* Returns the full URL to be used for the test for the provided UI class.
- *
+ *
* @return the full URL for the test
*/
protected String getTestURL(Class<?> uiClass) {
@@ -307,14 +307,14 @@ public abstract class AbstractTB3Test extends ParallelTest {
/**
* Used to determine what URL to initially open for the test
- *
+ *
* @return the host name of development server
*/
protected abstract String getDeploymentHostname();
/**
* Used to determine what port the test is running on
- *
+ *
* @return The port teh test is running on, by default 8888
*/
protected abstract int getDeploymentPort();
@@ -326,10 +326,10 @@ public abstract class AbstractTB3Test extends ParallelTest {
* ran and before running that,
* {@link #setDesiredCapabilities(DesiredCapabilities)} is invoked with the
* value returned by this method.
- *
+ *
* This method is not static to allow overriding it in sub classes. By
* default runs the test only on Firefox
- *
+ *
* @return The browsers to run the test on
*/
@BrowserConfiguration
@@ -342,7 +342,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
* Finds an element based on the part of a TB2 style locator following the
* :: (e.g. vaadin=runLabelModes::PID_Scheckboxaction-Enabled/domChild[0] ->
* PID_Scheckboxaction-Enabled/domChild[0]).
- *
+ *
* @param vaadinLocator
* The part following :: of the vaadin locator string
* @return
@@ -353,7 +353,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
/**
* Uses JavaScript to determine the currently focused element.
- *
+ *
* @return Focused element or null
*/
protected WebElement getFocusedElement() {
@@ -367,7 +367,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
/**
* Executes the given Javascript
- *
+ *
* @param script
* the script to execute
* @return whatever
@@ -380,7 +380,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
/**
* Find a Vaadin element based on its id given using Component.setId
- *
+ *
* @param id
* The id to locate
* @return
@@ -394,7 +394,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
* following the :: (e.g.
* vaadin=runLabelModes::PID_Scheckboxaction-Enabled/domChild[0] ->
* PID_Scheckboxaction-Enabled/domChild[0]).
- *
+ *
* @param vaadinLocator
* The part following :: of the vaadin locator string
* @return
@@ -408,7 +408,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
/**
* Constructs a {@link By} locator for the id given using Component.setId
- *
+ *
* @param id
* The id to locate
* @return a locator for the given id
@@ -420,7 +420,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
/**
* Waits up to 10s for the given condition to become true. Use e.g. as
* {@link #waitUntil(ExpectedConditions.textToBePresentInElement(by, text))}
- *
+ *
* @param condition
* the condition to wait for to become true
*/
@@ -432,7 +432,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
* Waits the given number of seconds for the given condition to become true.
* Use e.g. as
* {@link #waitUntil(ExpectedConditions.textToBePresentInElement(by, text))}
- *
+ *
* @param condition
* the condition to wait for to become true
*/
@@ -445,7 +445,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
* Waits up to 10s for the given condition to become false. Use e.g. as
* {@link #waitUntilNot(ExpectedConditions.textToBePresentInElement(by,
* text))}
- *
+ *
* @param condition
* the condition to wait for to become false
*/
@@ -458,7 +458,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
* false. Use e.g. as
* {@link #waitUntilNot(ExpectedConditions.textToBePresentInElement(by,
* text))}
- *
+ *
* @param condition
* the condition to wait for to become false
*/
@@ -486,10 +486,10 @@ public abstract class AbstractTB3Test extends ParallelTest {
/**
* Checks if the given element has the given class name.
- *
+ *
* Matches only full class names, i.e. has ("foo") does not match
* class="foobar"
- *
+ *
* @param element
* @param className
* @return
@@ -512,7 +512,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
/**
* For tests extending AbstractTestUIWithLog, returns the element for the
* Nth log row
- *
+ *
* @param rowNr
* The log row to retrieve
* @return the Nth log row
@@ -524,7 +524,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
/**
* For tests extending AbstractTestUIWithLog, returns the text in the Nth
* log row
- *
+ *
* @param rowNr
* The log row to retrieve text for
* @return the text in the log row
@@ -535,7 +535,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
/**
* Asserts that {@literal a} is &gt;= {@literal b}
- *
+ *
* @param message
* The message to include in the {@link AssertionError}
* @param a
@@ -554,7 +554,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
/**
* Asserts that {@literal a} is &gt; {@literal b}
- *
+ *
* @param message
* The message to include in the {@link AssertionError}
* @param a
@@ -572,7 +572,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
/**
* Asserts that {@literal a} is &lt;= {@literal b}
- *
+ *
* @param message
* The message to include in the {@link AssertionError}
* @param a
@@ -591,7 +591,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
/**
* Asserts that {@literal a} is &lt; {@literal b}
- *
+ *
* @param message
* The message to include in the {@link AssertionError}
* @param a
@@ -616,12 +616,12 @@ public abstract class AbstractTB3Test extends ParallelTest {
/**
* Returns the path that should be used for the test. The path contains the
* full path (appended to hostname+port) and must start with a slash.
- *
+ *
* @param push
* true if "?debug" should be added
* @param debug
* true if /run-push should be used instead of /run
- *
+ *
* @return The URL path to the UI class to test
*/
protected String getDeploymentPath() {
@@ -638,13 +638,13 @@ public abstract class AbstractTB3Test extends ParallelTest {
* Returns the UI class the current test is connected to (or in special
* cases UIProvider or LegacyApplication). Uses the enclosing class if the
* test class is a static inner class to a UI class.
- *
+ *
* Test which are not enclosed by a UI class must implement this method and
* return the UI class they want to test.
- *
+ *
* Note that this method will update the test name to the enclosing class to
* be compatible with TB2 screenshot naming
- *
+ *
* @return the UI class the current test is connected to
*/
protected Class<?> getUIClass() {
@@ -682,7 +682,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
/**
* Returns whether to run the test in debug mode (with the debug console
* open) or not
- *
+ *
* @return true to run with the debug window open, false by default
*/
protected final boolean isDebug() {
@@ -692,7 +692,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
/**
* Sets whether to run the test in debug mode (with the debug console open)
* or not.
- *
+ *
* @param debug
* true to open debug window, false otherwise
*/
@@ -704,7 +704,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
* Returns whether to run the test with push enabled (using /run-push) or
* not. Note that push tests can and should typically be created using @Push
* on the UI instead of overriding this method
- *
+ *
* @return true if /run-push is used, false otherwise
*/
protected final boolean isPush() {
@@ -715,7 +715,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
* Sets whether to run the test with push enabled (using /run-push) or not.
* Note that push tests can and should typically be created using @Push on
* the UI instead of overriding this method
- *
+ *
* @param push
* true to use /run-push in the test, false otherwise
*/
@@ -727,10 +727,10 @@ public abstract class AbstractTB3Test extends ParallelTest {
* Returns the path for the given UI class when deployed on the test server.
* The path contains the full path (appended to hostname+port) and must
* start with a slash.
- *
+ *
* This method takes into account {@link #isPush()} and {@link #isDebug()}
* when the path is generated.
- *
+ *
* @param uiClass
* @param push
* true if "?debug" should be added
@@ -757,7 +757,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
/**
* Used to determine what URL to initially open for the test
- *
+ *
* @return The base URL for the test. Does not include a trailing slash.
*/
protected String getBaseURL() {
@@ -767,7 +767,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
/**
* Generates the application id based on the URL in a way compatible with
* VaadinServletService.
- *
+ *
* @param pathWithQueryParameters
* The path part of the URL, possibly still containing query
* parameters
@@ -788,7 +788,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
/**
* Sleeps for the given number of ms but ensures that the browser connection
* does not time out.
- *
+ *
* @param timeoutMillis
* Number of ms to wait
* @throws InterruptedException
@@ -807,7 +807,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
/**
* Called by the test runner whenever there is an exception in the test that
* will cause termination of the test
- *
+ *
* @param t
* the throwable which caused the termination
*/
@@ -818,7 +818,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
/**
* Returns the mouse object for doing mouse commands
- *
+ *
* @return Returns the mouse
*/
public Mouse getMouse() {
@@ -827,7 +827,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
/**
* Returns the keyboard object for controlling keyboard events
- *
+ *
* @return Return the keyboard
*/
public Keyboard getKeyboard() {
@@ -881,7 +881,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
* RequireWindowFocus makes tests more stable but seems to be broken with
* certain commands such as sendKeys. Therefore it is not enabled by default
* for all tests
- *
+ *
* @return true, to use the "require window focus" feature, false otherwise
*/
protected boolean requireWindowFocusForIE() {
@@ -890,7 +890,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
/**
* Should the "enable persistent hover" be enabled for Internet Explorer.
- *
+ *
* Persistent hovering causes continuous firing of mouse over events at the
* last location the mouse cursor has been moved to. This is to avoid
* problems where the real mouse cursor is inside the browser window and
@@ -898,7 +898,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
* (http://
* jimevansmusic.blogspot.fi/2012/06/whats-wrong-with-internet-explorer
* .html)
- *
+ *
* @return true, to use the "persistent hover" feature, false otherwise
*/
protected boolean usePersistentHoverForIE() {
@@ -910,7 +910,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
* <p>
* Native events sometimes cause failure in clicking on buttons/checkboxes
* but are possibly needed for some operations.
- *
+ *
* @return true, to use "native events", false to use generated Javascript
* events
*/
@@ -1032,7 +1032,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
/**
* Selects a menu item. By default, this will click on the menu item.
- *
+ *
* @param menuCaption
* caption of the menu item
*/
@@ -1042,7 +1042,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
/**
* Selects a menu item.
- *
+ *
* @param menuCaption
* caption of the menu item
* @param click
@@ -1062,7 +1062,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
/**
* Finds the menu item from the DOM based on menu item caption.
- *
+ *
* @param menuCaption
* caption of the menu item
* @return the found menu item
@@ -1078,7 +1078,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
/**
* Selects a submenu described by a path of menus from the first MenuBar in
* the UI.
- *
+ *
* @param menuCaptions
* array of menu captions
*/
@@ -1100,7 +1100,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
/**
* Asserts that an element is present
- *
+ *
* @param by
* the locatore for the element
*/
@@ -1110,7 +1110,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
/**
* Asserts that an element is not present
- *
+ *
* @param by
* the locatore for the element
*/
diff --git a/uitest-common/src/main/java/com/vaadin/tests/tb3/CustomTestBenchCommandExecutor.java b/uitest-common/src/main/java/com/vaadin/tests/tb3/CustomTestBenchCommandExecutor.java
index 5c9830c769..291d0bbadc 100644
--- a/uitest-common/src/main/java/com/vaadin/tests/tb3/CustomTestBenchCommandExecutor.java
+++ b/uitest-common/src/main/java/com/vaadin/tests/tb3/CustomTestBenchCommandExecutor.java
@@ -1,12 +1,12 @@
/*
* Copyright 2000-2014 Vaadin Ltd.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -37,10 +37,10 @@ import com.vaadin.testbench.screenshot.ImageFileUtil;
/**
* Internal hack to support capturing screenshots for elements.
- *
+ *
* Most parts are from TestBenchCommandExecutor and the feature should be
* integrated into TB4.
- *
+ *
* @author Vaadin Ltd
*/
public class CustomTestBenchCommandExecutor {
@@ -54,7 +54,7 @@ public class CustomTestBenchCommandExecutor {
/**
* Compares the screenshot of the given element with the reference.
- *
+ *
* Copied from TestBenchCommandExecutor
*/
public boolean compareScreen(WebElement element, File reference,
@@ -71,7 +71,7 @@ public class CustomTestBenchCommandExecutor {
/**
* Compares the screenshot of the given element with the reference.
- *
+ *
* Copied from TestBenchCommandExecutor and added cropToElement
*/
public boolean compareScreen(WebElement element, BufferedImage reference,
@@ -107,7 +107,7 @@ public class CustomTestBenchCommandExecutor {
/**
* Crops the image to show only the element. If the element is partly off
* screen, crops to show the part of the element which is in the screenshot
- *
+ *
* @param element
* the element to retain in the screenshot
* @param fullScreen
diff --git a/uitest-common/src/main/java/com/vaadin/tests/tb3/ExcludeFromSuite.java b/uitest-common/src/main/java/com/vaadin/tests/tb3/ExcludeFromSuite.java
index dd061646be..8b92496433 100644
--- a/uitest-common/src/main/java/com/vaadin/tests/tb3/ExcludeFromSuite.java
+++ b/uitest-common/src/main/java/com/vaadin/tests/tb3/ExcludeFromSuite.java
@@ -1,12 +1,12 @@
/*
* Copyright 2000-2014 Vaadin Ltd.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -25,7 +25,7 @@ import java.lang.annotation.Target;
* Marker interface for a TB3+ test class which will exclude the test from any
* test suite which automatically scans for test classes. Mostly useful for long
* tests which should not be run in every build.
- *
+ *
* @since 7.1.10
* @author Vaadin Ltd
*/
diff --git a/uitest-common/src/main/java/com/vaadin/tests/tb3/IncludeIfProperty.java b/uitest-common/src/main/java/com/vaadin/tests/tb3/IncludeIfProperty.java
index 789422c0c6..f058fc2d61 100644
--- a/uitest-common/src/main/java/com/vaadin/tests/tb3/IncludeIfProperty.java
+++ b/uitest-common/src/main/java/com/vaadin/tests/tb3/IncludeIfProperty.java
@@ -1,12 +1,12 @@
/*
* Copyright 2000-2014 Vaadin Ltd.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -28,7 +28,7 @@ import java.lang.annotation.Target;
* {@code property} has the given {@code value}.
* <p>
* Used by {@link TB3TestLocator}
- *
+ *
* @since
* @author Vaadin Ltd
*/
diff --git a/uitest-common/src/main/java/com/vaadin/tests/tb3/MultiBrowserTest.java b/uitest-common/src/main/java/com/vaadin/tests/tb3/MultiBrowserTest.java
index ec40510d96..daa5149084 100644
--- a/uitest-common/src/main/java/com/vaadin/tests/tb3/MultiBrowserTest.java
+++ b/uitest-common/src/main/java/com/vaadin/tests/tb3/MultiBrowserTest.java
@@ -1,12 +1,12 @@
/*
* Copyright 2000-2014 Vaadin Ltd.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -27,16 +27,16 @@ import com.vaadin.testbench.parallel.Browser;
* Base class for tests which should be run on all supported browsers. The test
* is automatically launched for multiple browsers in parallel by the test
* runner.
- *
+ *
* Sub classes can, but typically should not, restrict the browsers used by
* implementing a
- *
+ *
* <pre>
* &#064;Parameters
* public static Collection&lt;DesiredCapabilities&gt; getBrowsersForTest() {
* }
* </pre>
- *
+ *
* @author Vaadin Ltd
*/
public abstract class MultiBrowserTest extends PrivateTB3Configuration {
diff --git a/uitest-common/src/main/java/com/vaadin/tests/tb3/ParallelScheduler.java b/uitest-common/src/main/java/com/vaadin/tests/tb3/ParallelScheduler.java
index ef9ee382d0..daea6138f3 100644
--- a/uitest-common/src/main/java/com/vaadin/tests/tb3/ParallelScheduler.java
+++ b/uitest-common/src/main/java/com/vaadin/tests/tb3/ParallelScheduler.java
@@ -1,12 +1,12 @@
/*
* Copyright 2000-2014 Vaadin Ltd.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -27,7 +27,7 @@ import org.junit.runners.model.RunnerScheduler;
/**
* JUnit scheduler capable of running multiple tets in parallel. Each test is
* run in its own thread. Uses an {@link ExecutorService} to manage the threads.
- *
+ *
* @author Vaadin Ltd
*/
public class ParallelScheduler implements RunnerScheduler {
@@ -37,7 +37,7 @@ public class ParallelScheduler implements RunnerScheduler {
/**
* Creates a parallel scheduler which will use the given executor service
* when submitting test jobs.
- *
+ *
* @param service
* The service to use for tests
*/
diff --git a/uitest-common/src/main/java/com/vaadin/tests/tb3/ParameterizedTB3Runner.java b/uitest-common/src/main/java/com/vaadin/tests/tb3/ParameterizedTB3Runner.java
index 695f2a404a..9658ccfcaa 100644
--- a/uitest-common/src/main/java/com/vaadin/tests/tb3/ParameterizedTB3Runner.java
+++ b/uitest-common/src/main/java/com/vaadin/tests/tb3/ParameterizedTB3Runner.java
@@ -1,12 +1,12 @@
/*
* Copyright 2000-2014 Vaadin Ltd.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -35,7 +35,7 @@ import org.junit.runners.model.InitializationError;
* permutation for each value returned by {@code getThemes()}. The value is
* automatically assigned to the test instance using {@code setTheme(String)}
* before invoking the test method
- *
+ *
* @author Vaadin Ltd
*/
public class ParameterizedTB3Runner extends TB3Runner {
diff --git a/uitest-common/src/main/java/com/vaadin/tests/tb3/PrivateTB3Configuration.java b/uitest-common/src/main/java/com/vaadin/tests/tb3/PrivateTB3Configuration.java
index b44f3582ec..abee2c1c2c 100644
--- a/uitest-common/src/main/java/com/vaadin/tests/tb3/PrivateTB3Configuration.java
+++ b/uitest-common/src/main/java/com/vaadin/tests/tb3/PrivateTB3Configuration.java
@@ -40,14 +40,14 @@ import com.vaadin.testbench.parallel.BrowserUtil;
* Provides values for parameters which depend on where the test is run.
* Parameters should be configured in work/eclipse-run-selected-test.properties.
* A template is available in uitest/.
- *
+ *
* @author Vaadin Ltd
*/
@RunOnHub("tb3-hub.intra.itmill.com")
@BrowserFactory(VaadinBrowserFactory.class)
public abstract class PrivateTB3Configuration extends ScreenshotTB3Test {
/**
- *
+ *
*/
public static final String SCREENSHOT_DIRECTORY = "com.vaadin.testbench.screenshot.directory";
private static final String HOSTNAME_PROPERTY = "com.vaadin.testbench.deployment.hostname";
@@ -205,7 +205,7 @@ public abstract class PrivateTB3Configuration extends ScreenshotTB3Test {
/**
* Gets the hostname that tests are configured to use.
- *
+ *
* @return the host name configuration value
*/
public static String getConfiguredDeploymentHostname() {
@@ -225,7 +225,7 @@ public abstract class PrivateTB3Configuration extends ScreenshotTB3Test {
/**
* Gets the port that tests are configured to use.
- *
+ *
* @return the port configuration value
*/
public static int getConfiguredDeploymentPort() {
@@ -242,7 +242,7 @@ public abstract class PrivateTB3Configuration extends ScreenshotTB3Test {
/**
* Tries to automatically determine the IP address of the machine the test
* is running on.
- *
+ *
* @return An IP address of one of the network interfaces in the machine.
* @throws RuntimeException
* if there was an error or no IP was found
diff --git a/uitest-common/src/main/java/com/vaadin/tests/tb3/RetryOnFail.java b/uitest-common/src/main/java/com/vaadin/tests/tb3/RetryOnFail.java
index 78ae12043c..66a1b7d46f 100644
--- a/uitest-common/src/main/java/com/vaadin/tests/tb3/RetryOnFail.java
+++ b/uitest-common/src/main/java/com/vaadin/tests/tb3/RetryOnFail.java
@@ -1,12 +1,12 @@
/*
* Copyright 2000-2014 Vaadin Ltd.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
diff --git a/uitest-common/src/main/java/com/vaadin/tests/tb3/ScreenshotTB3Test.java b/uitest-common/src/main/java/com/vaadin/tests/tb3/ScreenshotTB3Test.java
index 1ced470637..285a9622a0 100644
--- a/uitest-common/src/main/java/com/vaadin/tests/tb3/ScreenshotTB3Test.java
+++ b/uitest-common/src/main/java/com/vaadin/tests/tb3/ScreenshotTB3Test.java
@@ -1,12 +1,12 @@
/*
* Copyright 2000-2014 Vaadin Ltd.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -42,7 +42,7 @@ import com.vaadin.testbench.screenshot.ImageFileUtil;
/**
* Base class which provides functionality for tests which use the automatic
* screenshot comparison function.
- *
+ *
* @author Vaadin Ltd
*/
public abstract class ScreenshotTB3Test extends AbstractTB3Test {
@@ -110,13 +110,13 @@ public abstract class ScreenshotTB3Test extends AbstractTB3Test {
* Grabs a screenshot and compares with the reference image with the given
* identifier. Supports alternative references and will succeed if the
* screenshot matches at least one of the references.
- *
+ *
* In case of a failed comparison this method stores the grabbed screenshots
* in the error directory as defined by
* {@link #getScreenshotErrorDirectory()}. It will also generate a html file
* in the same directory, comparing the screenshot with the first found
* reference.
- *
+ *
* @param identifier
* @throws IOException
*/
@@ -234,7 +234,7 @@ public abstract class ScreenshotTB3Test extends AbstractTB3Test {
/**
* Returns a new File which points to a .html file instead of the given .png
* file
- *
+ *
* @param png
* @return
*/
@@ -244,7 +244,7 @@ public abstract class ScreenshotTB3Test extends AbstractTB3Test {
}
/**
- *
+ *
* @param referenceFile
* The reference image file (in the directory defined by
* {@link #getScreenshotReferenceDirectory()})
@@ -271,7 +271,7 @@ public abstract class ScreenshotTB3Test extends AbstractTB3Test {
/**
* Finds alternative references for the given files
- *
+ *
* @param reference
* @return all references which should be considered when comparing with the
* given files, including the given reference
@@ -366,7 +366,7 @@ public abstract class ScreenshotTB3Test extends AbstractTB3Test {
/**
* Checks if any screenshot comparisons failures occurred during the test
* and combines all comparison errors into one exception
- *
+ *
* @throws IOException
* If there were failures during the test
*/
@@ -400,7 +400,7 @@ public abstract class ScreenshotTB3Test extends AbstractTB3Test {
/**
* Returns the name of the reference file based on the given parameters.
- *
+ *
* @param testName
* @param capabilities
* @param identifier
@@ -414,7 +414,7 @@ public abstract class ScreenshotTB3Test extends AbstractTB3Test {
* Returns the name of the reference file based on the given parameters. The
* version given in {@literal capabilities} is used unless it is overridden
* by the {@literal versionOverride} parameter.
- *
+ *
* @param testName
* @param capabilities
* @param identifier
diff --git a/uitest-common/src/main/java/com/vaadin/tests/tb3/TB3Runner.java b/uitest-common/src/main/java/com/vaadin/tests/tb3/TB3Runner.java
index 9437bab3df..d3d4397644 100644
--- a/uitest-common/src/main/java/com/vaadin/tests/tb3/TB3Runner.java
+++ b/uitest-common/src/main/java/com/vaadin/tests/tb3/TB3Runner.java
@@ -32,7 +32,7 @@ import com.vaadin.testbench.parallel.ParallelRunner;
* (http://tedyoung.me/2011/01/23/junit-runtime-tests-custom-runners/). The
* generated test names give information about the parameters used (unlike
* {@link Parameterized}).
- *
+ *
* @since 7.1
*/
public class TB3Runner extends ParallelRunner {
diff --git a/uitest-common/src/main/java/com/vaadin/tests/tb3/TB3TestLocator.java b/uitest-common/src/main/java/com/vaadin/tests/tb3/TB3TestLocator.java
index f48ea59e4d..c8e3ea9646 100644
--- a/uitest-common/src/main/java/com/vaadin/tests/tb3/TB3TestLocator.java
+++ b/uitest-common/src/main/java/com/vaadin/tests/tb3/TB3TestLocator.java
@@ -1,12 +1,12 @@
/*
* Copyright 2000-2014 Vaadin Ltd.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -35,7 +35,7 @@ public class TB3TestLocator {
* specified by 'basePackage'. Collects all classes inside the location
* which can be assigned to 'baseClass' except for classes inside packages
* listed in 'ignoredPackages'.
- *
+ *
* @param baseClass
* @param basePackage
* @param ignorePackages
@@ -58,7 +58,7 @@ public class TB3TestLocator {
* specified by 'basePackage'. Collects all classes inside the location
* which can be assigned to 'baseClass' except for classes inside packages
* listed in 'ignoredPackages'.
- *
+ *
* @param baseClass
* @param basePackage
* @param ignoredPackages
@@ -103,7 +103,7 @@ public class TB3TestLocator {
* Traverses the given directory and collects all classes which are inside
* the given 'javaPackage' and can be assigned to the given 'baseClass'. The
* found classes are added to 'result'.
- *
+ *
* @param parent
* The directory to traverse
* @param javaPackage
@@ -141,7 +141,7 @@ public class TB3TestLocator {
* Traverses a Jar file using the given connection and collects all classes
* which are inside the given 'javaPackage' and can be assigned to the given
* 'baseClass'. The found classes are added to 'result'.
- *
+ *
* @param javaPackage
* The java package containing the classes (classes may be in a
* sub package)
@@ -171,7 +171,7 @@ public class TB3TestLocator {
* Verifies that the class represented by 'fullyQualifiedClassName' can be
* loaded, assigned to 'baseClass' and is not an abstract or anonymous
* class.
- *
+ *
* @param result
* The collection to add to
* @param fullyQualifiedClassName
diff --git a/uitest-common/src/main/java/com/vaadin/tests/tb3/TB3TestSuite.java b/uitest-common/src/main/java/com/vaadin/tests/tb3/TB3TestSuite.java
index 385e5bc4f8..d0a475528f 100644
--- a/uitest-common/src/main/java/com/vaadin/tests/tb3/TB3TestSuite.java
+++ b/uitest-common/src/main/java/com/vaadin/tests/tb3/TB3TestSuite.java
@@ -1,12 +1,12 @@
/*
* Copyright 2000-2014 Vaadin Ltd.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -25,7 +25,7 @@ import com.vaadin.testbench.parallel.ParallelTestSuite;
/**
* Test suite which consists of all the TB3 tests passed in the constructor.
* Runs the tests in parallel using a {@link ParallelScheduler}
- *
+ *
* @author Vaadin Ltd
*/
public class TB3TestSuite extends ParallelTestSuite {