From 206396dd040444620dabe95582b1cc371d8d0775 Mon Sep 17 00:00:00 2001 From: Alexei Barantsev Date: Wed, 10 Feb 2016 11:37:14 +0300 Subject: [PATCH] Java: Moving annotations that manage test execution process to testing package --- .../webdriven/WebDriverBackedSeleniumLargeTest.java | 2 +- java/client/test/org/openqa/selenium/AlertsTest.java | 3 ++- .../test/org/openqa/selenium/ClickScrollingTest.java | 1 + java/client/test/org/openqa/selenium/ClickTest.java | 3 ++- .../test/org/openqa/selenium/CookieImplementationTest.java | 4 +--- .../test/org/openqa/selenium/ElementEqualityTest.java | 2 +- .../test/org/openqa/selenium/ElementFindingTest.java | 2 ++ .../test/org/openqa/selenium/ExecutingJavascriptTest.java | 2 ++ .../test/org/openqa/selenium/FrameSwitchingTest.java | 1 + java/client/test/org/openqa/selenium/I18nTest.java | 1 + .../org/openqa/selenium/JavascriptEnabledDriverTest.java | 1 + java/client/test/org/openqa/selenium/PageLoadingTest.java | 3 +++ .../test/org/openqa/selenium/PositionAndSizeTest.java | 1 + .../test/org/openqa/selenium/TakesScreenshotTest.java | 2 ++ java/client/test/org/openqa/selenium/UploadTest.java | 3 +-- .../test/org/openqa/selenium/WindowSwitchingTest.java | 3 +++ java/client/test/org/openqa/selenium/WindowTest.java | 1 + java/client/test/org/openqa/selenium/build.desc | 3 --- .../org/openqa/selenium/firefox/FirefoxDriverTest.java | 4 ++-- .../org/openqa/selenium/ie/InternetExplorerDriverTest.java | 2 +- .../selenium/interactions/BasicMouseInterfaceTest.java | 6 +++--- .../selenium/interactions/CombinedInputActionsTest.java | 3 +-- .../org/openqa/selenium/interactions/DragAndDropTest.java | 6 +++--- .../openqa/selenium/interactions/touch/TouchFlickTest.java | 3 +-- .../selenium/interactions/touch/TouchScrollTest.java | 3 +-- .../test/org/openqa/selenium/testing/JUnit4TestBase.java | 3 --- .../openqa/selenium/{ => testing}/NeedsFreshDriver.java | 2 +- .../openqa/selenium/{ => testing}/NoDriverAfterTest.java | 2 +- .../selenium/{ => testing}/SwitchToTopAfterTest.java | 2 +- java/client/test/org/openqa/selenium/testing/build.desc | 7 +++++-- 30 files changed, 46 insertions(+), 35 deletions(-) rename java/client/test/org/openqa/selenium/{ => testing}/NeedsFreshDriver.java (96%) rename java/client/test/org/openqa/selenium/{ => testing}/NoDriverAfterTest.java (97%) rename java/client/test/org/openqa/selenium/{ => testing}/SwitchToTopAfterTest.java (96%) diff --git a/java/client/test/com/thoughtworks/selenium/webdriven/WebDriverBackedSeleniumLargeTest.java b/java/client/test/com/thoughtworks/selenium/webdriven/WebDriverBackedSeleniumLargeTest.java index b721e9fb3938e..796a63e3c81b2 100644 --- a/java/client/test/com/thoughtworks/selenium/webdriven/WebDriverBackedSeleniumLargeTest.java +++ b/java/client/test/com/thoughtworks/selenium/webdriven/WebDriverBackedSeleniumLargeTest.java @@ -25,7 +25,7 @@ import org.junit.Before; import org.junit.Test; -import org.openqa.selenium.NoDriverAfterTest; +import org.openqa.selenium.testing.NoDriverAfterTest; import org.openqa.selenium.environment.GlobalTestEnvironment; import org.openqa.selenium.testing.JUnit4TestBase; diff --git a/java/client/test/org/openqa/selenium/AlertsTest.java b/java/client/test/org/openqa/selenium/AlertsTest.java index c605329702af6..a74b428900121 100644 --- a/java/client/test/org/openqa/selenium/AlertsTest.java +++ b/java/client/test/org/openqa/selenium/AlertsTest.java @@ -39,12 +39,13 @@ import org.junit.Before; import org.junit.Test; import org.openqa.selenium.support.ui.ExpectedCondition; -import org.openqa.selenium.support.ui.WebDriverWait; import org.openqa.selenium.testing.Ignore; import org.openqa.selenium.testing.JUnit4TestBase; import org.openqa.selenium.testing.JavascriptEnabled; import org.openqa.selenium.testing.NeedsLocalEnvironment; +import org.openqa.selenium.testing.NoDriverAfterTest; import org.openqa.selenium.testing.NotYetImplemented; +import org.openqa.selenium.testing.SwitchToTopAfterTest; import java.util.Set; diff --git a/java/client/test/org/openqa/selenium/ClickScrollingTest.java b/java/client/test/org/openqa/selenium/ClickScrollingTest.java index f993e652c9a2b..12f57c3ec7d6c 100644 --- a/java/client/test/org/openqa/selenium/ClickScrollingTest.java +++ b/java/client/test/org/openqa/selenium/ClickScrollingTest.java @@ -36,6 +36,7 @@ import org.openqa.selenium.testing.Ignore; import org.openqa.selenium.testing.JUnit4TestBase; import org.openqa.selenium.testing.JavascriptEnabled; +import org.openqa.selenium.testing.SwitchToTopAfterTest; @Ignore(value = {HTMLUNIT}, reason = "HtmlUnit: Scrolling requires rendering") public class ClickScrollingTest extends JUnit4TestBase { diff --git a/java/client/test/org/openqa/selenium/ClickTest.java b/java/client/test/org/openqa/selenium/ClickTest.java index 6118c3c992776..4a29a21a37ae9 100644 --- a/java/client/test/org/openqa/selenium/ClickTest.java +++ b/java/client/test/org/openqa/selenium/ClickTest.java @@ -32,13 +32,14 @@ import static org.openqa.selenium.testing.TestUtilities.getEffectivePlatform; import static org.openqa.selenium.testing.TestUtilities.isChrome; -import org.junit.After; import org.junit.Before; import org.junit.Test; import org.openqa.selenium.interactions.MoveTargetOutOfBoundsException; import org.openqa.selenium.testing.Ignore; import org.openqa.selenium.testing.JUnit4TestBase; import org.openqa.selenium.testing.JavascriptEnabled; +import org.openqa.selenium.testing.NoDriverAfterTest; +import org.openqa.selenium.testing.SwitchToTopAfterTest; import java.util.Set; diff --git a/java/client/test/org/openqa/selenium/CookieImplementationTest.java b/java/client/test/org/openqa/selenium/CookieImplementationTest.java index ca75a3cbaab9b..37a1064ccfbe5 100644 --- a/java/client/test/org/openqa/selenium/CookieImplementationTest.java +++ b/java/client/test/org/openqa/selenium/CookieImplementationTest.java @@ -23,7 +23,7 @@ import org.openqa.selenium.testing.Ignore; import org.openqa.selenium.testing.JUnit4TestBase; import org.openqa.selenium.testing.JavascriptEnabled; -import org.openqa.selenium.testing.NotYetImplemented; +import org.openqa.selenium.testing.SwitchToTopAfterTest; import java.net.URI; import java.util.Date; @@ -43,9 +43,7 @@ import static org.openqa.selenium.testing.Ignore.Driver.ALL; import static org.openqa.selenium.testing.Ignore.Driver.CHROME; import static org.openqa.selenium.testing.Ignore.Driver.FIREFOX; -import static org.openqa.selenium.testing.Ignore.Driver.HTMLUNIT; import static org.openqa.selenium.testing.Ignore.Driver.IE; -import static org.openqa.selenium.testing.Ignore.Driver.MARIONETTE; import static org.openqa.selenium.testing.Ignore.Driver.PHANTOMJS; import static org.openqa.selenium.testing.Ignore.Driver.REMOTE; import static org.openqa.selenium.testing.Ignore.Driver.SAFARI; diff --git a/java/client/test/org/openqa/selenium/ElementEqualityTest.java b/java/client/test/org/openqa/selenium/ElementEqualityTest.java index 4c6ebdc7a948a..a68682b08b831 100644 --- a/java/client/test/org/openqa/selenium/ElementEqualityTest.java +++ b/java/client/test/org/openqa/selenium/ElementEqualityTest.java @@ -20,9 +20,9 @@ import org.junit.Test; import org.openqa.selenium.internal.WrapsElement; import org.openqa.selenium.remote.RemoteWebElement; -import org.openqa.selenium.testing.Ignore; import org.openqa.selenium.testing.JUnit4TestBase; import org.openqa.selenium.testing.JavascriptEnabled; +import org.openqa.selenium.testing.SwitchToTopAfterTest; import java.util.List; diff --git a/java/client/test/org/openqa/selenium/ElementFindingTest.java b/java/client/test/org/openqa/selenium/ElementFindingTest.java index 18007d1e5147c..f088572a4b76b 100644 --- a/java/client/test/org/openqa/selenium/ElementFindingTest.java +++ b/java/client/test/org/openqa/selenium/ElementFindingTest.java @@ -21,7 +21,9 @@ import org.openqa.selenium.testing.Ignore; import org.openqa.selenium.testing.JUnit4TestBase; import org.openqa.selenium.testing.JavascriptEnabled; +import org.openqa.selenium.testing.NeedsFreshDriver; import org.openqa.selenium.testing.NotYetImplemented; +import org.openqa.selenium.testing.SwitchToTopAfterTest; import org.openqa.selenium.testing.TestUtilities; import static org.hamcrest.Matchers.containsString; diff --git a/java/client/test/org/openqa/selenium/ExecutingJavascriptTest.java b/java/client/test/org/openqa/selenium/ExecutingJavascriptTest.java index e1aed1d1d8bd7..90b96f4db6844 100644 --- a/java/client/test/org/openqa/selenium/ExecutingJavascriptTest.java +++ b/java/client/test/org/openqa/selenium/ExecutingJavascriptTest.java @@ -28,6 +28,8 @@ import org.openqa.selenium.testing.InProject; import org.openqa.selenium.testing.JUnit4TestBase; import org.openqa.selenium.testing.JavascriptEnabled; +import org.openqa.selenium.testing.NeedsFreshDriver; +import org.openqa.selenium.testing.NoDriverAfterTest; import org.openqa.selenium.testing.NotYetImplemented; import java.io.File; diff --git a/java/client/test/org/openqa/selenium/FrameSwitchingTest.java b/java/client/test/org/openqa/selenium/FrameSwitchingTest.java index c77ae05373167..ea320097cbf87 100644 --- a/java/client/test/org/openqa/selenium/FrameSwitchingTest.java +++ b/java/client/test/org/openqa/selenium/FrameSwitchingTest.java @@ -43,6 +43,7 @@ import org.openqa.selenium.testing.JUnit4TestBase; import org.openqa.selenium.testing.JavascriptEnabled; import org.openqa.selenium.testing.NeedsLocalEnvironment; +import org.openqa.selenium.testing.NoDriverAfterTest; import java.util.Random; diff --git a/java/client/test/org/openqa/selenium/I18nTest.java b/java/client/test/org/openqa/selenium/I18nTest.java index 8487bfbf22240..ab76716f38f8d 100644 --- a/java/client/test/org/openqa/selenium/I18nTest.java +++ b/java/client/test/org/openqa/selenium/I18nTest.java @@ -32,6 +32,7 @@ import org.openqa.selenium.environment.GlobalTestEnvironment; import org.openqa.selenium.testing.Ignore; import org.openqa.selenium.testing.JUnit4TestBase; +import org.openqa.selenium.testing.NeedsFreshDriver; import org.openqa.selenium.testing.NotYetImplemented; import org.openqa.selenium.testing.TestUtilities; diff --git a/java/client/test/org/openqa/selenium/JavascriptEnabledDriverTest.java b/java/client/test/org/openqa/selenium/JavascriptEnabledDriverTest.java index b0f85d66e7a91..d7a42ab5b1551 100644 --- a/java/client/test/org/openqa/selenium/JavascriptEnabledDriverTest.java +++ b/java/client/test/org/openqa/selenium/JavascriptEnabledDriverTest.java @@ -39,6 +39,7 @@ import org.openqa.selenium.testing.Ignore; import org.openqa.selenium.testing.JUnit4TestBase; import org.openqa.selenium.testing.JavascriptEnabled; +import org.openqa.selenium.testing.NeedsFreshDriver; /** * Test case for browsers that support using Javascript diff --git a/java/client/test/org/openqa/selenium/PageLoadingTest.java b/java/client/test/org/openqa/selenium/PageLoadingTest.java index b48f3b96ca086..194ad27a603d9 100644 --- a/java/client/test/org/openqa/selenium/PageLoadingTest.java +++ b/java/client/test/org/openqa/selenium/PageLoadingTest.java @@ -58,8 +58,11 @@ import org.openqa.selenium.testing.Ignore; import org.openqa.selenium.testing.JUnit4TestBase; import org.openqa.selenium.testing.JavascriptEnabled; +import org.openqa.selenium.testing.NeedsFreshDriver; import org.openqa.selenium.testing.NeedsLocalEnvironment; +import org.openqa.selenium.testing.NoDriverAfterTest; import org.openqa.selenium.testing.NotYetImplemented; +import org.openqa.selenium.testing.SwitchToTopAfterTest; import org.openqa.selenium.testing.drivers.SauceDriver; import org.openqa.selenium.testing.drivers.WebDriverBuilder; diff --git a/java/client/test/org/openqa/selenium/PositionAndSizeTest.java b/java/client/test/org/openqa/selenium/PositionAndSizeTest.java index 8668d333c6c2d..8efdcbf418fed 100644 --- a/java/client/test/org/openqa/selenium/PositionAndSizeTest.java +++ b/java/client/test/org/openqa/selenium/PositionAndSizeTest.java @@ -39,6 +39,7 @@ import org.openqa.selenium.testing.Ignore; import org.openqa.selenium.testing.JUnit4TestBase; import org.openqa.selenium.testing.JavascriptEnabled; +import org.openqa.selenium.testing.SwitchToTopAfterTest; import org.openqa.selenium.testing.TestUtilities; @Ignore(value = {HTMLUNIT}, diff --git a/java/client/test/org/openqa/selenium/TakesScreenshotTest.java b/java/client/test/org/openqa/selenium/TakesScreenshotTest.java index 3aceaf9df3c62..dcba3f723c5fa 100644 --- a/java/client/test/org/openqa/selenium/TakesScreenshotTest.java +++ b/java/client/test/org/openqa/selenium/TakesScreenshotTest.java @@ -42,6 +42,8 @@ import static org.openqa.selenium.testing.TestUtilities.isChrome; import com.google.common.collect.Sets; + +import org.openqa.selenium.testing.SwitchToTopAfterTest; import org.openqa.selenium.testing.drivers.SauceDriver; import java.awt.image.BufferedImage; diff --git a/java/client/test/org/openqa/selenium/UploadTest.java b/java/client/test/org/openqa/selenium/UploadTest.java index 9a164383e48e6..d7ef19e53c7a7 100644 --- a/java/client/test/org/openqa/selenium/UploadTest.java +++ b/java/client/test/org/openqa/selenium/UploadTest.java @@ -24,7 +24,6 @@ import static org.openqa.selenium.support.ui.ExpectedConditions.not; import static org.openqa.selenium.support.ui.ExpectedConditions.visibilityOf; import static org.openqa.selenium.testing.Ignore.Driver.CHROME; -import static org.openqa.selenium.testing.Ignore.Driver.HTMLUNIT; import static org.openqa.selenium.testing.Ignore.Driver.IE; import static org.openqa.selenium.testing.Ignore.Driver.PHANTOMJS; import static org.openqa.selenium.testing.Ignore.Driver.SAFARI; @@ -37,7 +36,7 @@ import org.openqa.selenium.testing.Ignore; import org.openqa.selenium.testing.JUnit4TestBase; import org.openqa.selenium.testing.JavascriptEnabled; -import org.openqa.selenium.testing.NotYetImplemented; +import org.openqa.selenium.testing.SwitchToTopAfterTest; import org.openqa.selenium.testing.TestUtilities; import java.io.File; diff --git a/java/client/test/org/openqa/selenium/WindowSwitchingTest.java b/java/client/test/org/openqa/selenium/WindowSwitchingTest.java index d8d55f39358aa..3164383f4a0ea 100644 --- a/java/client/test/org/openqa/selenium/WindowSwitchingTest.java +++ b/java/client/test/org/openqa/selenium/WindowSwitchingTest.java @@ -41,7 +41,10 @@ import org.openqa.selenium.testing.Ignore; import org.openqa.selenium.testing.JUnit4TestBase; import org.openqa.selenium.testing.JavascriptEnabled; +import org.openqa.selenium.testing.NeedsFreshDriver; +import org.openqa.selenium.testing.NoDriverAfterTest; import org.openqa.selenium.testing.NotYetImplemented; +import org.openqa.selenium.testing.SwitchToTopAfterTest; import org.openqa.selenium.testing.TestUtilities; import org.openqa.selenium.testing.drivers.Browser; diff --git a/java/client/test/org/openqa/selenium/WindowTest.java b/java/client/test/org/openqa/selenium/WindowTest.java index 84bc98993c388..b2ef7ecadc92a 100644 --- a/java/client/test/org/openqa/selenium/WindowTest.java +++ b/java/client/test/org/openqa/selenium/WindowTest.java @@ -31,6 +31,7 @@ import org.openqa.selenium.support.ui.ExpectedCondition; import org.openqa.selenium.testing.Ignore; import org.openqa.selenium.testing.JUnit4TestBase; +import org.openqa.selenium.testing.NoDriverAfterTest; import org.openqa.selenium.testing.TestUtilities; import org.openqa.selenium.testing.drivers.SauceDriver; diff --git a/java/client/test/org/openqa/selenium/build.desc b/java/client/test/org/openqa/selenium/build.desc index 884c006c4c87c..ce571d8b9075e 100644 --- a/java/client/test/org/openqa/selenium/build.desc +++ b/java/client/test/org/openqa/selenium/build.desc @@ -20,12 +20,9 @@ java_library(name = "build", java_library(name = "base", srcs = [ "Messages.java", - "NeedsFreshDriver.java", - "NoDriverAfterTest.java", "Pages.java", "ParallelTestRunner.java", "StubDriver.java", - "SwitchToTopAfterTest.java", "WaitingConditions.java", ], embedded = [ diff --git a/java/client/test/org/openqa/selenium/firefox/FirefoxDriverTest.java b/java/client/test/org/openqa/selenium/firefox/FirefoxDriverTest.java index ecf18647aee46..ed61fe3a3780c 100644 --- a/java/client/test/org/openqa/selenium/firefox/FirefoxDriverTest.java +++ b/java/client/test/org/openqa/selenium/firefox/FirefoxDriverTest.java @@ -39,8 +39,8 @@ import org.openqa.selenium.Capabilities; import org.openqa.selenium.Dimension; import org.openqa.selenium.JavascriptExecutor; -import org.openqa.selenium.NeedsFreshDriver; -import org.openqa.selenium.NoDriverAfterTest; +import org.openqa.selenium.testing.NeedsFreshDriver; +import org.openqa.selenium.testing.NoDriverAfterTest; import org.openqa.selenium.NoSuchElementException; import org.openqa.selenium.ParallelTestRunner; import org.openqa.selenium.ParallelTestRunner.Worker; diff --git a/java/client/test/org/openqa/selenium/ie/InternetExplorerDriverTest.java b/java/client/test/org/openqa/selenium/ie/InternetExplorerDriverTest.java index 7988b3e3d9355..2a69eec256701 100644 --- a/java/client/test/org/openqa/selenium/ie/InternetExplorerDriverTest.java +++ b/java/client/test/org/openqa/selenium/ie/InternetExplorerDriverTest.java @@ -25,7 +25,7 @@ import org.junit.Test; import org.openqa.selenium.By; import org.openqa.selenium.JavascriptExecutor; -import org.openqa.selenium.NoDriverAfterTest; +import org.openqa.selenium.testing.NoDriverAfterTest; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; import org.openqa.selenium.interactions.Actions; diff --git a/java/client/test/org/openqa/selenium/interactions/BasicMouseInterfaceTest.java b/java/client/test/org/openqa/selenium/interactions/BasicMouseInterfaceTest.java index a8ec98b77cf5c..ecefe73c8975d 100644 --- a/java/client/test/org/openqa/selenium/interactions/BasicMouseInterfaceTest.java +++ b/java/client/test/org/openqa/selenium/interactions/BasicMouseInterfaceTest.java @@ -36,11 +36,11 @@ import org.openqa.selenium.By; import org.openqa.selenium.Dimension; import org.openqa.selenium.JavascriptExecutor; -import org.openqa.selenium.NeedsFreshDriver; -import org.openqa.selenium.NoDriverAfterTest; +import org.openqa.selenium.testing.NeedsFreshDriver; +import org.openqa.selenium.testing.NoDriverAfterTest; import org.openqa.selenium.NoSuchElementException; import org.openqa.selenium.Point; -import org.openqa.selenium.SwitchToTopAfterTest; +import org.openqa.selenium.testing.SwitchToTopAfterTest; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.Color; diff --git a/java/client/test/org/openqa/selenium/interactions/CombinedInputActionsTest.java b/java/client/test/org/openqa/selenium/interactions/CombinedInputActionsTest.java index 6c474aa6ef8eb..e0af18f8b9f41 100644 --- a/java/client/test/org/openqa/selenium/interactions/CombinedInputActionsTest.java +++ b/java/client/test/org/openqa/selenium/interactions/CombinedInputActionsTest.java @@ -42,10 +42,9 @@ import org.openqa.selenium.By; import org.openqa.selenium.JavascriptExecutor; import org.openqa.selenium.Keys; -import org.openqa.selenium.NoDriverAfterTest; import org.openqa.selenium.Platform; import org.openqa.selenium.Point; -import org.openqa.selenium.SwitchToTopAfterTest; +import org.openqa.selenium.testing.SwitchToTopAfterTest; import org.openqa.selenium.WaitingConditions; import org.openqa.selenium.WebElement; import org.openqa.selenium.testing.Ignore; diff --git a/java/client/test/org/openqa/selenium/interactions/DragAndDropTest.java b/java/client/test/org/openqa/selenium/interactions/DragAndDropTest.java index 1add6ad873390..7c0a8b7dd8190 100644 --- a/java/client/test/org/openqa/selenium/interactions/DragAndDropTest.java +++ b/java/client/test/org/openqa/selenium/interactions/DragAndDropTest.java @@ -35,11 +35,11 @@ import org.junit.Test; import org.openqa.selenium.By; import org.openqa.selenium.JavascriptExecutor; -import org.openqa.selenium.NeedsFreshDriver; -import org.openqa.selenium.NoDriverAfterTest; +import org.openqa.selenium.testing.NeedsFreshDriver; +import org.openqa.selenium.testing.NoDriverAfterTest; import org.openqa.selenium.Platform; import org.openqa.selenium.Point; -import org.openqa.selenium.SwitchToTopAfterTest; +import org.openqa.selenium.testing.SwitchToTopAfterTest; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.ui.ExpectedConditions; import org.openqa.selenium.testing.Ignore; diff --git a/java/client/test/org/openqa/selenium/interactions/touch/TouchFlickTest.java b/java/client/test/org/openqa/selenium/interactions/touch/TouchFlickTest.java index 9eb27e0698de2..4750d02e53cdf 100644 --- a/java/client/test/org/openqa/selenium/interactions/touch/TouchFlickTest.java +++ b/java/client/test/org/openqa/selenium/interactions/touch/TouchFlickTest.java @@ -19,11 +19,10 @@ import org.junit.Test; import org.openqa.selenium.By; -import org.openqa.selenium.NeedsFreshDriver; +import org.openqa.selenium.testing.NeedsFreshDriver; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; import org.openqa.selenium.interactions.Action; -import org.openqa.selenium.testing.Ignore; import static org.junit.Assert.assertTrue; diff --git a/java/client/test/org/openqa/selenium/interactions/touch/TouchScrollTest.java b/java/client/test/org/openqa/selenium/interactions/touch/TouchScrollTest.java index 4b5bcb443e172..0336d92a86f93 100644 --- a/java/client/test/org/openqa/selenium/interactions/touch/TouchScrollTest.java +++ b/java/client/test/org/openqa/selenium/interactions/touch/TouchScrollTest.java @@ -19,11 +19,10 @@ import org.junit.Test; import org.openqa.selenium.By; -import org.openqa.selenium.NeedsFreshDriver; +import org.openqa.selenium.testing.NeedsFreshDriver; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; import org.openqa.selenium.interactions.Action; -import org.openqa.selenium.testing.Ignore; import static org.junit.Assert.assertTrue; diff --git a/java/client/test/org/openqa/selenium/testing/JUnit4TestBase.java b/java/client/test/org/openqa/selenium/testing/JUnit4TestBase.java index 9449df534b037..365c2a486821e 100644 --- a/java/client/test/org/openqa/selenium/testing/JUnit4TestBase.java +++ b/java/client/test/org/openqa/selenium/testing/JUnit4TestBase.java @@ -34,10 +34,7 @@ import org.junit.runner.Description; import org.junit.runner.RunWith; import org.junit.runners.model.Statement; -import org.openqa.selenium.NeedsFreshDriver; -import org.openqa.selenium.NoDriverAfterTest; import org.openqa.selenium.Pages; -import org.openqa.selenium.SwitchToTopAfterTest; import org.openqa.selenium.WebDriver; import org.openqa.selenium.environment.GlobalTestEnvironment; import org.openqa.selenium.environment.InProcessTestEnvironment; diff --git a/java/client/test/org/openqa/selenium/NeedsFreshDriver.java b/java/client/test/org/openqa/selenium/testing/NeedsFreshDriver.java similarity index 96% rename from java/client/test/org/openqa/selenium/NeedsFreshDriver.java rename to java/client/test/org/openqa/selenium/testing/NeedsFreshDriver.java index eb64de11dd51e..360ba7934bf8e 100644 --- a/java/client/test/org/openqa/selenium/NeedsFreshDriver.java +++ b/java/client/test/org/openqa/selenium/testing/NeedsFreshDriver.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package org.openqa.selenium; +package org.openqa.selenium.testing; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/java/client/test/org/openqa/selenium/NoDriverAfterTest.java b/java/client/test/org/openqa/selenium/testing/NoDriverAfterTest.java similarity index 97% rename from java/client/test/org/openqa/selenium/NoDriverAfterTest.java rename to java/client/test/org/openqa/selenium/testing/NoDriverAfterTest.java index fa8fa52fb3e6b..7633244f66e83 100644 --- a/java/client/test/org/openqa/selenium/NoDriverAfterTest.java +++ b/java/client/test/org/openqa/selenium/testing/NoDriverAfterTest.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package org.openqa.selenium; +package org.openqa.selenium.testing; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/java/client/test/org/openqa/selenium/SwitchToTopAfterTest.java b/java/client/test/org/openqa/selenium/testing/SwitchToTopAfterTest.java similarity index 96% rename from java/client/test/org/openqa/selenium/SwitchToTopAfterTest.java rename to java/client/test/org/openqa/selenium/testing/SwitchToTopAfterTest.java index ab792d9311809..e2fea8ff8b07a 100644 --- a/java/client/test/org/openqa/selenium/SwitchToTopAfterTest.java +++ b/java/client/test/org/openqa/selenium/testing/SwitchToTopAfterTest.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package org.openqa.selenium; +package org.openqa.selenium.testing; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/java/client/test/org/openqa/selenium/testing/build.desc b/java/client/test/org/openqa/selenium/testing/build.desc index 69ffaf133b47d..bd86bad9d9dda 100644 --- a/java/client/test/org/openqa/selenium/testing/build.desc +++ b/java/client/test/org/openqa/selenium/testing/build.desc @@ -14,6 +14,9 @@ java_library(name = "annotations", "JavascriptEnabled.java", "NativeEventsRequired.java", "NeedsLocalEnvironment.java", + "NeedsFreshDriver.java", + "NoDriverAfterTest.java", + "SwitchToTopAfterTest.java", ], deps = [ "//java/client/src/org/openqa/selenium:base", @@ -44,7 +47,7 @@ java_library(name = "junit_4", "//third_party/java/junit", "//third_party/java/mockito", ]) - + java_library(name = "proxy", srcs = [ "ProxyServer.java", @@ -55,5 +58,5 @@ java_library(name = "proxy", "//third_party/java/netty", "//third_party/java/little_proxy", ]) - +