Skip to content

Commit 630b6a1

Browse files
barancevbarancev
committed
Java: Moving Driver enum from Ignore to the top level to be able to use it in other annotations too.
1 parent 206396d commit 630b6a1

File tree

62 files changed

+273
-262
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+273
-262
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@
2626
import static org.openqa.selenium.support.ui.ExpectedConditions.alertIsPresent;
2727
import static org.openqa.selenium.support.ui.ExpectedConditions.presenceOfElementLocated;
2828
import static org.openqa.selenium.support.ui.ExpectedConditions.titleIs;
29-
import static org.openqa.selenium.testing.Ignore.Driver.CHROME;
30-
import static org.openqa.selenium.testing.Ignore.Driver.FIREFOX;
31-
import static org.openqa.selenium.testing.Ignore.Driver.HTMLUNIT;
32-
import static org.openqa.selenium.testing.Ignore.Driver.IE;
33-
import static org.openqa.selenium.testing.Ignore.Driver.MARIONETTE;
34-
import static org.openqa.selenium.testing.Ignore.Driver.PHANTOMJS;
35-
import static org.openqa.selenium.testing.Ignore.Driver.SAFARI;
29+
import static org.openqa.selenium.testing.Driver.CHROME;
30+
import static org.openqa.selenium.testing.Driver.FIREFOX;
31+
import static org.openqa.selenium.testing.Driver.HTMLUNIT;
32+
import static org.openqa.selenium.testing.Driver.IE;
33+
import static org.openqa.selenium.testing.Driver.MARIONETTE;
34+
import static org.openqa.selenium.testing.Driver.PHANTOMJS;
35+
import static org.openqa.selenium.testing.Driver.SAFARI;
3636
import static org.openqa.selenium.testing.TestUtilities.getFirefoxVersion;
3737
import static org.openqa.selenium.testing.TestUtilities.isFirefox;
3838

‎java/client/test/org/openqa/selenium/AtomsInjectionTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import org.openqa.selenium.testing.NotYetImplemented;
2424

2525
import static org.junit.Assert.assertEquals;
26-
import static org.openqa.selenium.testing.Ignore.Driver.MARIONETTE;
26+
import static org.openqa.selenium.testing.Driver.MARIONETTE;
2727

2828
public class AtomsInjectionTest extends JUnit4TestBase {
2929

‎java/client/test/org/openqa/selenium/AuthenticatedPageLoadingTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
import static org.junit.Assert.assertEquals;
2121
import static org.openqa.selenium.support.ui.ExpectedConditions.alertIsPresent;
2222
import static org.openqa.selenium.support.ui.ExpectedConditions.presenceOfElementLocated;
23-
import static org.openqa.selenium.testing.Ignore.Driver.CHROME;
24-
import static org.openqa.selenium.testing.Ignore.Driver.FIREFOX;
25-
import static org.openqa.selenium.testing.Ignore.Driver.HTMLUNIT;
26-
import static org.openqa.selenium.testing.Ignore.Driver.MARIONETTE;
27-
import static org.openqa.selenium.testing.Ignore.Driver.PHANTOMJS;
28-
import static org.openqa.selenium.testing.Ignore.Driver.SAFARI;
23+
import static org.openqa.selenium.testing.Driver.CHROME;
24+
import static org.openqa.selenium.testing.Driver.FIREFOX;
25+
import static org.openqa.selenium.testing.Driver.HTMLUNIT;
26+
import static org.openqa.selenium.testing.Driver.MARIONETTE;
27+
import static org.openqa.selenium.testing.Driver.PHANTOMJS;
28+
import static org.openqa.selenium.testing.Driver.SAFARI;
2929

3030
import org.junit.Test;
3131
import org.openqa.selenium.security.Credentials;

‎java/client/test/org/openqa/selenium/ChildrenFindingTest.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import org.junit.Test;
2121
import org.openqa.selenium.testing.Ignore;
2222
import org.openqa.selenium.testing.JUnit4TestBase;
23-
import org.openqa.selenium.testing.JavascriptEnabled;
2423
import org.openqa.selenium.testing.NotYetImplemented;
2524

2625
import java.util.List;
@@ -31,8 +30,8 @@
3130
import static org.junit.Assert.assertNotNull;
3231
import static org.junit.Assert.assertThat;
3332
import static org.junit.Assert.fail;
34-
import static org.openqa.selenium.testing.Ignore.Driver.MARIONETTE;
35-
import static org.openqa.selenium.testing.Ignore.Driver.REMOTE;
33+
import static org.openqa.selenium.testing.Driver.MARIONETTE;
34+
import static org.openqa.selenium.testing.Driver.REMOTE;
3635

3736

3837
public class ChildrenFindingTest extends JUnit4TestBase {

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424
import static org.junit.Assert.assertTrue;
2525
import static org.junit.Assert.fail;
2626
import static org.openqa.selenium.support.ui.ExpectedConditions.titleIs;
27-
import static org.openqa.selenium.testing.Ignore.Driver.CHROME;
28-
import static org.openqa.selenium.testing.Ignore.Driver.HTMLUNIT;
29-
import static org.openqa.selenium.testing.Ignore.Driver.IE;
30-
import static org.openqa.selenium.testing.Ignore.Driver.MARIONETTE;
31-
import static org.openqa.selenium.testing.Ignore.Driver.PHANTOMJS;
32-
import static org.openqa.selenium.testing.Ignore.Driver.SAFARI;
27+
import static org.openqa.selenium.testing.Driver.CHROME;
28+
import static org.openqa.selenium.testing.Driver.HTMLUNIT;
29+
import static org.openqa.selenium.testing.Driver.IE;
30+
import static org.openqa.selenium.testing.Driver.MARIONETTE;
31+
import static org.openqa.selenium.testing.Driver.PHANTOMJS;
32+
import static org.openqa.selenium.testing.Driver.SAFARI;
3333

3434
import org.junit.Test;
3535
import org.openqa.selenium.interactions.MoveTargetOutOfBoundsException;

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
import static org.openqa.selenium.WaitingConditions.newWindowIsOpened;
2626
import static org.openqa.selenium.WaitingConditions.pageSourceToContain;
2727
import static org.openqa.selenium.support.ui.ExpectedConditions.titleIs;
28-
import static org.openqa.selenium.testing.Ignore.Driver.CHROME;
29-
import static org.openqa.selenium.testing.Ignore.Driver.IE;
30-
import static org.openqa.selenium.testing.Ignore.Driver.MARIONETTE;
31-
import static org.openqa.selenium.testing.Ignore.Driver.SAFARI;
28+
import static org.openqa.selenium.testing.Driver.CHROME;
29+
import static org.openqa.selenium.testing.Driver.IE;
30+
import static org.openqa.selenium.testing.Driver.MARIONETTE;
31+
import static org.openqa.selenium.testing.Driver.SAFARI;
3232
import static org.openqa.selenium.testing.TestUtilities.getEffectivePlatform;
3333
import static org.openqa.selenium.testing.TestUtilities.isChrome;
3434

‎java/client/test/org/openqa/selenium/ContentEditableTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
import static org.junit.Assert.assertEquals;
2323
import static org.junit.Assert.assertThat;
2424
import static org.junit.Assume.assumeFalse;
25-
import static org.openqa.selenium.testing.Ignore.Driver.CHROME;
26-
import static org.openqa.selenium.testing.Ignore.Driver.HTMLUNIT;
27-
import static org.openqa.selenium.testing.Ignore.Driver.IE;
28-
import static org.openqa.selenium.testing.Ignore.Driver.MARIONETTE;
29-
import static org.openqa.selenium.testing.Ignore.Driver.SAFARI;
25+
import static org.openqa.selenium.testing.Driver.CHROME;
26+
import static org.openqa.selenium.testing.Driver.HTMLUNIT;
27+
import static org.openqa.selenium.testing.Driver.IE;
28+
import static org.openqa.selenium.testing.Driver.MARIONETTE;
29+
import static org.openqa.selenium.testing.Driver.SAFARI;
3030
import static org.openqa.selenium.testing.TestUtilities.getEffectivePlatform;
3131
import static org.openqa.selenium.testing.TestUtilities.isFirefox;
3232

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@
4040
import static org.junit.Assert.assertThat;
4141
import static org.junit.Assert.assertTrue;
4242
import static org.junit.Assume.assumeTrue;
43-
import static org.openqa.selenium.testing.Ignore.Driver.ALL;
44-
import static org.openqa.selenium.testing.Ignore.Driver.CHROME;
45-
import static org.openqa.selenium.testing.Ignore.Driver.FIREFOX;
46-
import static org.openqa.selenium.testing.Ignore.Driver.IE;
47-
import static org.openqa.selenium.testing.Ignore.Driver.PHANTOMJS;
48-
import static org.openqa.selenium.testing.Ignore.Driver.REMOTE;
49-
import static org.openqa.selenium.testing.Ignore.Driver.SAFARI;
43+
import static org.openqa.selenium.testing.Driver.ALL;
44+
import static org.openqa.selenium.testing.Driver.CHROME;
45+
import static org.openqa.selenium.testing.Driver.FIREFOX;
46+
import static org.openqa.selenium.testing.Driver.IE;
47+
import static org.openqa.selenium.testing.Driver.PHANTOMJS;
48+
import static org.openqa.selenium.testing.Driver.REMOTE;
49+
import static org.openqa.selenium.testing.Driver.SAFARI;
5050

5151
public class CookieImplementationTest extends JUnit4TestBase {
5252

‎java/client/test/org/openqa/selenium/CorrectEventFiringTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@
3131
import static org.openqa.selenium.WaitingConditions.elementTextToEqual;
3232
import static org.openqa.selenium.WaitingConditions.elementValueToEqual;
3333
import static org.openqa.selenium.support.ui.ExpectedConditions.visibilityOfElementLocated;
34-
import static org.openqa.selenium.testing.Ignore.Driver.CHROME;
35-
import static org.openqa.selenium.testing.Ignore.Driver.FIREFOX;
36-
import static org.openqa.selenium.testing.Ignore.Driver.HTMLUNIT;
37-
import static org.openqa.selenium.testing.Ignore.Driver.IE;
38-
import static org.openqa.selenium.testing.Ignore.Driver.MARIONETTE;
39-
import static org.openqa.selenium.testing.Ignore.Driver.SAFARI;
34+
import static org.openqa.selenium.testing.Driver.CHROME;
35+
import static org.openqa.selenium.testing.Driver.FIREFOX;
36+
import static org.openqa.selenium.testing.Driver.HTMLUNIT;
37+
import static org.openqa.selenium.testing.Driver.IE;
38+
import static org.openqa.selenium.testing.Driver.MARIONETTE;
39+
import static org.openqa.selenium.testing.Driver.SAFARI;
4040
import static org.openqa.selenium.testing.TestUtilities.isOldIe;
4141

4242
import org.junit.Test;

‎java/client/test/org/openqa/selenium/CssValueTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import static org.hamcrest.Matchers.equalTo;
2222
import static org.junit.Assert.assertEquals;
2323
import static org.junit.Assert.assertThat;
24-
import static org.openqa.selenium.testing.Ignore.Driver.MARIONETTE;
24+
import static org.openqa.selenium.testing.Driver.MARIONETTE;
2525

2626
import org.junit.Test;
2727
import org.openqa.selenium.testing.Ignore;

0 commit comments

Comments
 (0)