Skip to content

Commit 206396d

Browse files
committed
Java: Moving annotations that manage test execution process to testing package
1 parent aba9a5f commit 206396d

30 files changed

+46
-35
lines changed

java/client/test/com/thoughtworks/selenium/webdriven/WebDriverBackedSeleniumLargeTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
import org.junit.Before;
2727
import org.junit.Test;
28-
import org.openqa.selenium.NoDriverAfterTest;
28+
import org.openqa.selenium.testing.NoDriverAfterTest;
2929
import org.openqa.selenium.environment.GlobalTestEnvironment;
3030
import org.openqa.selenium.testing.JUnit4TestBase;
3131

java/client/test/org/openqa/selenium/AlertsTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,13 @@
3939
import org.junit.Before;
4040
import org.junit.Test;
4141
import org.openqa.selenium.support.ui.ExpectedCondition;
42-
import org.openqa.selenium.support.ui.WebDriverWait;
4342
import org.openqa.selenium.testing.Ignore;
4443
import org.openqa.selenium.testing.JUnit4TestBase;
4544
import org.openqa.selenium.testing.JavascriptEnabled;
4645
import org.openqa.selenium.testing.NeedsLocalEnvironment;
46+
import org.openqa.selenium.testing.NoDriverAfterTest;
4747
import org.openqa.selenium.testing.NotYetImplemented;
48+
import org.openqa.selenium.testing.SwitchToTopAfterTest;
4849

4950
import java.util.Set;
5051

java/client/test/org/openqa/selenium/ClickScrollingTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import org.openqa.selenium.testing.Ignore;
3737
import org.openqa.selenium.testing.JUnit4TestBase;
3838
import org.openqa.selenium.testing.JavascriptEnabled;
39+
import org.openqa.selenium.testing.SwitchToTopAfterTest;
3940

4041
@Ignore(value = {HTMLUNIT}, reason = "HtmlUnit: Scrolling requires rendering")
4142
public class ClickScrollingTest extends JUnit4TestBase {

java/client/test/org/openqa/selenium/ClickTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,14 @@
3232
import static org.openqa.selenium.testing.TestUtilities.getEffectivePlatform;
3333
import static org.openqa.selenium.testing.TestUtilities.isChrome;
3434

35-
import org.junit.After;
3635
import org.junit.Before;
3736
import org.junit.Test;
3837
import org.openqa.selenium.interactions.MoveTargetOutOfBoundsException;
3938
import org.openqa.selenium.testing.Ignore;
4039
import org.openqa.selenium.testing.JUnit4TestBase;
4140
import org.openqa.selenium.testing.JavascriptEnabled;
41+
import org.openqa.selenium.testing.NoDriverAfterTest;
42+
import org.openqa.selenium.testing.SwitchToTopAfterTest;
4243

4344
import java.util.Set;
4445

java/client/test/org/openqa/selenium/CookieImplementationTest.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import org.openqa.selenium.testing.Ignore;
2424
import org.openqa.selenium.testing.JUnit4TestBase;
2525
import org.openqa.selenium.testing.JavascriptEnabled;
26-
import org.openqa.selenium.testing.NotYetImplemented;
26+
import org.openqa.selenium.testing.SwitchToTopAfterTest;
2727

2828
import java.net.URI;
2929
import java.util.Date;
@@ -43,9 +43,7 @@
4343
import static org.openqa.selenium.testing.Ignore.Driver.ALL;
4444
import static org.openqa.selenium.testing.Ignore.Driver.CHROME;
4545
import static org.openqa.selenium.testing.Ignore.Driver.FIREFOX;
46-
import static org.openqa.selenium.testing.Ignore.Driver.HTMLUNIT;
4746
import static org.openqa.selenium.testing.Ignore.Driver.IE;
48-
import static org.openqa.selenium.testing.Ignore.Driver.MARIONETTE;
4947
import static org.openqa.selenium.testing.Ignore.Driver.PHANTOMJS;
5048
import static org.openqa.selenium.testing.Ignore.Driver.REMOTE;
5149
import static org.openqa.selenium.testing.Ignore.Driver.SAFARI;

java/client/test/org/openqa/selenium/ElementEqualityTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
import org.junit.Test;
2121
import org.openqa.selenium.internal.WrapsElement;
2222
import org.openqa.selenium.remote.RemoteWebElement;
23-
import org.openqa.selenium.testing.Ignore;
2423
import org.openqa.selenium.testing.JUnit4TestBase;
2524
import org.openqa.selenium.testing.JavascriptEnabled;
25+
import org.openqa.selenium.testing.SwitchToTopAfterTest;
2626

2727
import java.util.List;
2828

java/client/test/org/openqa/selenium/ElementFindingTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@
2121
import org.openqa.selenium.testing.Ignore;
2222
import org.openqa.selenium.testing.JUnit4TestBase;
2323
import org.openqa.selenium.testing.JavascriptEnabled;
24+
import org.openqa.selenium.testing.NeedsFreshDriver;
2425
import org.openqa.selenium.testing.NotYetImplemented;
26+
import org.openqa.selenium.testing.SwitchToTopAfterTest;
2527
import org.openqa.selenium.testing.TestUtilities;
2628

2729
import static org.hamcrest.Matchers.containsString;

java/client/test/org/openqa/selenium/ExecutingJavascriptTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
import org.openqa.selenium.testing.InProject;
2929
import org.openqa.selenium.testing.JUnit4TestBase;
3030
import org.openqa.selenium.testing.JavascriptEnabled;
31+
import org.openqa.selenium.testing.NeedsFreshDriver;
32+
import org.openqa.selenium.testing.NoDriverAfterTest;
3133
import org.openqa.selenium.testing.NotYetImplemented;
3234

3335
import java.io.File;

java/client/test/org/openqa/selenium/FrameSwitchingTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
import org.openqa.selenium.testing.JUnit4TestBase;
4444
import org.openqa.selenium.testing.JavascriptEnabled;
4545
import org.openqa.selenium.testing.NeedsLocalEnvironment;
46+
import org.openqa.selenium.testing.NoDriverAfterTest;
4647

4748
import java.util.Random;
4849

java/client/test/org/openqa/selenium/I18nTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import org.openqa.selenium.environment.GlobalTestEnvironment;
3333
import org.openqa.selenium.testing.Ignore;
3434
import org.openqa.selenium.testing.JUnit4TestBase;
35+
import org.openqa.selenium.testing.NeedsFreshDriver;
3536
import org.openqa.selenium.testing.NotYetImplemented;
3637
import org.openqa.selenium.testing.TestUtilities;
3738

0 commit comments

Comments
 (0)