diff --git a/.idea/libraries/commons_jxpath.xml b/.idea/libraries/commons_jxpath.xml deleted file mode 100644 index 27a64e27365a2..0000000000000 --- a/.idea/libraries/commons_jxpath.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/google_protobuffers.xml b/.idea/libraries/google_protobuffers.xml deleted file mode 100644 index 0369163a41dbb..0000000000000 --- a/.idea/libraries/google_protobuffers.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/operadriver.xml b/.idea/libraries/operadriver.xml deleted file mode 100644 index f2b995d848f2b..0000000000000 --- a/.idea/libraries/operadriver.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/Rakefile b/Rakefile index c393e39085072..91b6a95cd4d15 100644 --- a/Rakefile +++ b/Rakefile @@ -158,8 +158,6 @@ if (!mac?) task :test_firefox => [ "//java/client/test/org/openqa/selenium/firefox:test_native:run" ] end task :test_opera => [ "//java/client/test/org/openqa/selenium/opera:test_blink:run" ] -task :test_operapresto => [ "//java/client/test/org/openqa/selenium/opera:test_presto:run" ] -task :test_opera_mobile => [ "//java/client/test/org/openqa/selenium/opera/mobile:test:run" ] task :test_remote_server => [ '//java/server/test/org/openqa/selenium/remote/server:test:run' ] task :test_remote => [ '//java/client/test/org/openqa/selenium/remote:common-tests:run', diff --git a/java/client/.classpath b/java/client/.classpath index c5b51ed319156..b3776752dcce8 100644 --- a/java/client/.classpath +++ b/java/client/.classpath @@ -16,7 +16,6 @@ - @@ -35,8 +34,6 @@ - - diff --git a/java/client/client.iml b/java/client/client.iml index 1a63e47fe025d..b47d7fb888da6 100644 --- a/java/client/client.iml +++ b/java/client/client.iml @@ -18,12 +18,10 @@ - - diff --git a/java/client/src/org/openqa/selenium/build.desc b/java/client/src/org/openqa/selenium/build.desc index 2e2b35c59b01d..6c5034f1a4cd1 100644 --- a/java/client/src/org/openqa/selenium/build.desc +++ b/java/client/src/org/openqa/selenium/build.desc @@ -97,7 +97,6 @@ java_library(name = "client-combined", "//java/client/src/org/openqa/selenium/safari", "//java/client/src/org/openqa/selenium/support", "//java/client/src/org/openqa/selenium/remote:augmenter", - "//third_party/java/opera-driver", "//third_party/java/phantomjs-driver" ]) diff --git a/java/client/test/com/thoughtworks/selenium/InternalSelenseTestBase.java b/java/client/test/com/thoughtworks/selenium/InternalSelenseTestBase.java index 7d2ff98496bcd..cb23a430e123e 100644 --- a/java/client/test/com/thoughtworks/selenium/InternalSelenseTestBase.java +++ b/java/client/test/com/thoughtworks/selenium/InternalSelenseTestBase.java @@ -1,6 +1,6 @@ /* +Copyright 2012-2015 Software Freedom Conservancy Copyright 2012 Selenium committers -Copyright 2012 Software Freedom Conservancy Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -236,15 +236,8 @@ protected void before() throws Throwable { return; } - try { - selenium.selectWindow(""); - selenium.windowFocus(); - } catch (SeleniumException e) { - // TODO(simon): Window switching in Opera is picky. - if (Browser.detect() != Browser.opera) { - throw e; - } - } + selenium.selectWindow(""); + selenium.windowFocus(); } }; diff --git a/java/client/test/com/thoughtworks/selenium/build.desc b/java/client/test/com/thoughtworks/selenium/build.desc index 4f11c96ced660..8de65aa150791 100644 --- a/java/client/test/com/thoughtworks/selenium/build.desc +++ b/java/client/test/com/thoughtworks/selenium/build.desc @@ -67,18 +67,6 @@ java_test(name = "ie-emulation-test", "//cpp/iedriverserver:win32", ]) -java_test(name = "opera-emulation-test", - test_suite = "com.thoughtworks.selenium.WebDriverSeleniumTestSuite", - deps = [ - ":rc-tests", - ], - sysproperties = [ - { "selenium.browser" : "opera" }, - ], - deps = [ - ":rc-tests", - ]) - java_test(name = "chrome-rc-test", test_suite = "com.thoughtworks.selenium.SeleniumRcTestSuite", sysproperties = [ diff --git a/java/client/test/com/thoughtworks/selenium/corebased/TestGet.java b/java/client/test/com/thoughtworks/selenium/corebased/TestGet.java index 806b28ef7b1a4..2ec0f3b31a8bd 100644 --- a/java/client/test/com/thoughtworks/selenium/corebased/TestGet.java +++ b/java/client/test/com/thoughtworks/selenium/corebased/TestGet.java @@ -30,9 +30,9 @@ public class TestGet extends InternalSelenseTestBase { public void testGet() throws Exception { // test API getters selenium.open("../tests/html/test_get.html"); - // IE uppercases the property names of the style. Both Opera and Firefox - // lowercase the property names of the style. Both IE and Opera omit the - // trailing semi-colon. + // IE uppercases the property names of the style. + // Firefox lowercases the property names of the style. + // IE omits the trailing semi-colon. verifyTrue(Pattern.compile("(width|WIDTH): 644px; (height|HEIGHT): 41px(;?)") .matcher(selenium.getAttribute("//img[@alt='banner']@style")).find()); // This asserts on the current behavior of selArrayToString(). Commas and diff --git a/java/client/test/org/openqa/selenium/AlertsTest.java b/java/client/test/org/openqa/selenium/AlertsTest.java index 46394568ec739..11288203bcf99 100644 --- a/java/client/test/org/openqa/selenium/AlertsTest.java +++ b/java/client/test/org/openqa/selenium/AlertsTest.java @@ -1,5 +1,5 @@ /* -Copyright 2012 Software Freedom Conservancy +Copyright 2012-2015 Software Freedom Conservancy Copyright 2007-2012 Selenium committers Licensed under the Apache License, Version 2.0 (the "License"); @@ -32,14 +32,12 @@ 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.OPERA; import static org.openqa.selenium.testing.Ignore.Driver.PHANTOMJS; import static org.openqa.selenium.testing.Ignore.Driver.SAFARI; -import static org.openqa.selenium.testing.Ignore.Driver.OPERA_MOBILE; -import static org.openqa.selenium.testing.TestUtilities.isFirefox; -import static org.openqa.selenium.testing.TestUtilities.isNativeEventsEnabled; import static org.openqa.selenium.testing.TestUtilities.getEffectivePlatform; import static org.openqa.selenium.testing.TestUtilities.getFirefoxVersion; +import static org.openqa.selenium.testing.TestUtilities.isFirefox; +import static org.openqa.selenium.testing.TestUtilities.isNativeEventsEnabled; import org.openqa.selenium.support.ui.ExpectedCondition; import org.openqa.selenium.support.ui.WebDriverWait; @@ -53,7 +51,7 @@ import java.util.Set; -@Ignore({HTMLUNIT, OPERA, PHANTOMJS, SAFARI, OPERA_MOBILE, MARIONETTE}) +@Ignore({HTMLUNIT, PHANTOMJS, SAFARI, MARIONETTE}) public class AlertsTest extends JUnit4TestBase { private WebDriverWait wait; @@ -460,7 +458,7 @@ public void testShouldHandleAlertOnWindowClose() { } @JavascriptEnabled - @Ignore(value = {CHROME, HTMLUNIT, OPERA}) + @Ignore(value = {CHROME, HTMLUNIT}) @Test public void testIncludesAlertTextInUnhandledAlertException() { driver.findElement(By.id("alert")).click(); diff --git a/java/client/test/org/openqa/selenium/ClearTest.java b/java/client/test/org/openqa/selenium/ClearTest.java index ed9a1a1e09fdf..15da23d546cb2 100644 --- a/java/client/test/org/openqa/selenium/ClearTest.java +++ b/java/client/test/org/openqa/selenium/ClearTest.java @@ -1,4 +1,5 @@ /* +Copyright 2015 Software Freedom Conservancy Copyright 2012 Selenium committers Licensed under the Apache License, Version 2.0 (the "License"); @@ -22,8 +23,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; -import static org.openqa.selenium.testing.Ignore.Driver.OPERA; -import static org.openqa.selenium.testing.Ignore.Driver.OPERA_MOBILE; public class ClearTest extends JUnit4TestBase { @@ -49,7 +48,6 @@ public void testTextInputShouldNotClearWhenDisabled() { } @Test - @Ignore({OPERA, OPERA_MOBILE}) public void testTextInputShouldNotClearWhenReadOnly() { try { driver.get(pages.readOnlyPage); @@ -82,7 +80,6 @@ public void testTextAreaShouldNotClearWhenDisabled() { } @Test - @Ignore({OPERA, OPERA_MOBILE}) public void testTextAreaShouldNotClearWhenReadOnly() { try { driver.get(pages.readOnlyPage); @@ -94,7 +91,6 @@ public void testTextAreaShouldNotClearWhenReadOnly() { } } - @Ignore({OPERA_MOBILE}) @Test public void testContentEditableAreaShouldClear() { driver.get(pages.readOnlyPage); @@ -102,5 +98,4 @@ public void testContentEditableAreaShouldClear() { element.clear(); assertEquals("", element.getText()); } - } diff --git a/java/client/test/org/openqa/selenium/ClickScrollingTest.java b/java/client/test/org/openqa/selenium/ClickScrollingTest.java index 286a8792219af..24e00406f8bc5 100644 --- a/java/client/test/org/openqa/selenium/ClickScrollingTest.java +++ b/java/client/test/org/openqa/selenium/ClickScrollingTest.java @@ -1,6 +1,6 @@ /* Copyright 2012 Selenium committers -Copyright 2012 Software Freedom Conservancy +Copyright 2012-2015 Software Freedom Conservancy Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -15,7 +15,6 @@ limitations under the License. */ - package org.openqa.selenium; import static org.hamcrest.Matchers.greaterThan; @@ -29,7 +28,6 @@ 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.OPERA; import static org.openqa.selenium.testing.Ignore.Driver.PHANTOMJS; import static org.openqa.selenium.testing.Ignore.Driver.SAFARI; @@ -110,7 +108,6 @@ public void testShouldBeAbleToClickOnAnElementHiddenByYOverflow() { } @JavascriptEnabled - @Ignore({OPERA}) @Test public void testShouldNotScrollOverflowElementsWhichAreVisible() { driver.get(appServer.whereIs("scroll2.html")); @@ -152,8 +149,7 @@ public void testShouldScrollOverflowElementsIfClickPointIsOutOfViewButElementIsI } @Test - @Ignore(value = {OPERA, SAFARI, MARIONETTE}, - reason = "Opera: fails, others: not tested") + @Ignore(value = {SAFARI, MARIONETTE}, reason = "others: not tested") public void testShouldBeAbleToClickElementInAFrameThatIsOutOfView() { try { driver.get(appServer.whereIs("scrolling_tests/page_with_frame_out_of_view.html")); @@ -167,8 +163,7 @@ public void testShouldBeAbleToClickElementInAFrameThatIsOutOfView() { } @Test - @Ignore(value = {OPERA, SAFARI, MARIONETTE}, - reason = "Opera: fails, others: not tested") + @Ignore(value = {SAFARI, MARIONETTE}, reason = "not tested") public void testShouldBeAbleToClickElementThatIsOutOfViewInAFrame() { try { driver.get(appServer.whereIs("scrolling_tests/page_with_scrolling_frame.html")); @@ -195,8 +190,7 @@ public void testShouldNotBeAbleToClickElementThatIsOutOfViewInANonScrollableFram } @Test - @Ignore(value = {OPERA, SAFARI, MARIONETTE}, - reason = "Opera: fails, others: not tested") + @Ignore(value = {SAFARI, MARIONETTE}, reason = "not tested") public void testShouldBeAbleToClickElementThatIsOutOfViewInAFrameThatIsOutOfView() { try { driver.get(appServer.whereIs("scrolling_tests/page_with_scrolling_frame_out_of_view.html")); @@ -210,8 +204,7 @@ public void testShouldBeAbleToClickElementThatIsOutOfViewInAFrameThatIsOutOfView } @Test - @Ignore(value = {OPERA, SAFARI, MARIONETTE}, - reason = "Opera: fails, others: not tested") + @Ignore(value = {SAFARI, MARIONETTE}, reason = "not tested") public void testShouldBeAbleToClickElementThatIsOutOfViewInANestedFrame() { try { driver.get(appServer.whereIs("scrolling_tests/page_with_nested_scrolling_frames.html")); @@ -226,8 +219,7 @@ public void testShouldBeAbleToClickElementThatIsOutOfViewInANestedFrame() { } @Test - @Ignore(value = {OPERA, SAFARI, MARIONETTE}, - reason = "Opera: fails, others: not tested") + @Ignore(value = {SAFARI, MARIONETTE}, reason = "not tested") public void testShouldBeAbleToClickElementThatIsOutOfViewInANestedFrameThatIsOutOfView() { try { driver.get(appServer.whereIs("scrolling_tests/page_with_nested_scrolling_frames_out_of_view.html")); @@ -255,8 +247,7 @@ private long getScrollTop() { } @Test - @Ignore(value = {OPERA, SAFARI, MARIONETTE}, - reason = "Not tested") + @Ignore(value = {SAFARI, MARIONETTE}, reason = "Not tested") public void testShouldBeAbleToClickElementInATallFrame() { try { driver.get(appServer.whereIs("scrolling_tests/page_with_tall_frame.html")); diff --git a/java/client/test/org/openqa/selenium/ClickTest.java b/java/client/test/org/openqa/selenium/ClickTest.java index 4b0fcab5a166f..b4216099bb313 100644 --- a/java/client/test/org/openqa/selenium/ClickTest.java +++ b/java/client/test/org/openqa/selenium/ClickTest.java @@ -1,5 +1,5 @@ /* -Copyright 2012 Software Freedom Conservancy +Copyright 2012-2015 Software Freedom Conservancy Copyright 2011-2012 Selenium committers Licensed under the Apache License, Version 2.0 (the "License"); @@ -28,8 +28,6 @@ import static org.openqa.selenium.testing.Ignore.Driver.CHROME; 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.OPERA; -import static org.openqa.selenium.testing.Ignore.Driver.OPERA_MOBILE; import static org.openqa.selenium.testing.Ignore.Driver.SAFARI; import static org.openqa.selenium.testing.TestUtilities.isChrome; import static org.openqa.selenium.testing.TestUtilities.getEffectivePlatform; @@ -65,7 +63,7 @@ public void testCanClickOnALinkAndFollowIt() { wait.until(titleIs("XHTML Test Page")); } - @Ignore(value = {OPERA, MARIONETTE}, reason = "Not tested.") + @Ignore(value = {MARIONETTE}, reason = "Not tested.") @Test public void testCanClickOnALinkThatOverflowsAndFollowIt() { driver.findElement(By.id("overflowLink")).click(); @@ -87,8 +85,7 @@ public void testCanClickOnAnAnchorAndNotReloadThePage() { assertEquals("Latch was reset", Boolean.TRUE, samePage); } - @Ignore(value = {OPERA, OPERA_MOBILE, MARIONETTE}, - reason = "Opera: Incorrect runtime retrieved") + @Ignore(value = {MARIONETTE}) @Test public void testCanClickOnALinkThatUpdatesAnotherFrame() { driver.switchTo().frame("source"); @@ -100,8 +97,7 @@ public void testCanClickOnALinkThatUpdatesAnotherFrame() { } @JavascriptEnabled - @Ignore(value = {OPERA, OPERA_MOBILE, MARIONETTE}, - reason = "Opera: Incorrect runtime retrieved") + @Ignore(value = {MARIONETTE}) @Test public void testElementsFoundByJsCanLoadUpdatesInAnotherFrame() { driver.switchTo().frame("source"); @@ -116,8 +112,7 @@ public void testElementsFoundByJsCanLoadUpdatesInAnotherFrame() { } @JavascriptEnabled - @Ignore(value = {OPERA, OPERA_MOBILE, MARIONETTE}, reason = - "Opera: Incorrect runtime retrieved") + @Ignore(value = {MARIONETTE}) @Test public void testJsLocatedElementsCanUpdateFramesIfFoundSomehowElse() { driver.switchTo().frame("source"); @@ -148,7 +143,7 @@ public void testCanClickOnAnElementWithTopSetToANegativeNumber() { assertEquals("click", log); } - @Ignore(value = {CHROME, SAFARI, OPERA_MOBILE}, reason = "Not tested") + @Ignore(value = {CHROME, SAFARI}, reason = "Not tested") @Test public void testShouldClickOnFirstBoundingClientRectWithNonZeroSize() { driver.findElement(By.id("twoClientRects")).click(); @@ -156,7 +151,7 @@ public void testShouldClickOnFirstBoundingClientRectWithNonZeroSize() { } @JavascriptEnabled - @Ignore(value = {CHROME, OPERA, MARIONETTE}, reason = "Not implemented") + @Ignore(value = {CHROME, MARIONETTE}, reason = "Not implemented") @Test public void testShouldSetRelatedTargetForMouseOver() { driver.get(pages.javascriptPage); @@ -177,8 +172,7 @@ public void testShouldSetRelatedTargetForMouseOver() { @JavascriptEnabled @NoDriverAfterTest - @Ignore(value = {OPERA, SAFARI, OPERA_MOBILE}, - reason = "Doesn't support multiple windows; Safari: issue 3693") + @Ignore(value = {SAFARI}, reason = "issue 3693") @Test public void testShouldOnlyFollowHrefOnce() { driver.get(pages.clicksPage); @@ -272,8 +266,7 @@ public void testClicksASurroundingStrongTag() { } @Test - @Ignore(value = {IE, OPERA, OPERA_MOBILE, MARIONETTE}, reason - = "Opera, IE: failed, others: not tested") + @Ignore(value = {IE, MARIONETTE}, reason = "IE: failed, others: not tested") public void testCanClickAnImageMapArea() { driver.get(appServer.whereIs("click_tests/google_map.html")); driver.findElement(By.id("rectG")).click(); @@ -289,8 +282,7 @@ public void testCanClickAnImageMapArea() { } @Test - @Ignore(value = {OPERA, OPERA_MOBILE, MARIONETTE}, reason - = "Not tested against these browsers") + @Ignore(value = {MARIONETTE}) public void testShouldBeAbleToClickOnAnElementGreaterThanTwoViewports() { String url = appServer.whereIs("click_too_big.html"); driver.get(url); @@ -303,8 +295,8 @@ public void testShouldBeAbleToClickOnAnElementGreaterThanTwoViewports() { } @Test - @Ignore(value = {CHROME, OPERA, OPERA_MOBILE, MARIONETTE}, reason - = "Chrome: failed, Firefox: failed with native events, others: not tested") + @Ignore(value = {CHROME, MARIONETTE}, + reason = "Chrome: failed, Firefox: failed with native event") public void testShouldBeAbleToClickOnAnElementInFrameGreaterThanTwoViewports() { assumeFalse(isFirefox(driver) && isNativeEventsEnabled(driver)); @@ -321,7 +313,6 @@ public void testShouldBeAbleToClickOnAnElementInFrameGreaterThanTwoViewports() { } @Test - @Ignore(value = {OPERA, OPERA_MOBILE}, reason = "Opera: failed") public void testShouldBeAbleToClickOnRTLLanguageLink() { String url = appServer.whereIs("click_rtl.html"); driver.get(url); @@ -333,7 +324,6 @@ public void testShouldBeAbleToClickOnRTLLanguageLink() { } @Test - @Ignore(value = {OPERA, OPERA_MOBILE}, reason = "not tested") public void testShouldBeAbleToClickOnLinkInAbsolutelyPositionedFooter() { String url = appServer.whereIs("fixedFooterNoScroll.html"); driver.get(url); @@ -345,7 +335,6 @@ public void testShouldBeAbleToClickOnLinkInAbsolutelyPositionedFooter() { } @Test - @Ignore(value = {OPERA, OPERA_MOBILE}, reason = "not tested") public void testShouldBeAbleToClickOnLinkInAbsolutelyPositionedFooterInQuirksMode() { String url = appServer.whereIs("fixedFooterNoScrollQuirksMode.html"); driver.get(url); @@ -369,8 +358,7 @@ public void testShouldBeAbleToClickOnLinksWithNoHrefAttribute() { @JavascriptEnabled @Test - @Ignore(value = {OPERA, OPERA_MOBILE, MARIONETTE}, - reason = "Opera: fails, others: not tested") + @Ignore(value = {MARIONETTE}) public void testShouldBeAbleToClickOnALinkThatWrapsToTheNextLine() { driver.get(appServer.whereIs("click_tests/link_that_wraps.html")); @@ -381,8 +369,7 @@ public void testShouldBeAbleToClickOnALinkThatWrapsToTheNextLine() { @JavascriptEnabled @Test - @Ignore(value = {OPERA, OPERA_MOBILE, MARIONETTE}, - reason = "Opera: fails, others: not tested") + @Ignore(value = {MARIONETTE}) public void testShouldBeAbleToClickOnASpanThatWrapsToTheNextLine() { assumeFalse(isFirefox(driver) && isNativeEventsEnabled(driver)); driver.get(appServer.whereIs("click_tests/span_that_wraps.html")); @@ -391,5 +378,4 @@ public void testShouldBeAbleToClickOnASpanThatWrapsToTheNextLine() { wait.until(titleIs("Submitted Successfully!")); } - } diff --git a/java/client/test/org/openqa/selenium/CookieImplementationTest.java b/java/client/test/org/openqa/selenium/CookieImplementationTest.java index 30bbab3bbdb1e..784c173d1d1d1 100644 --- a/java/client/test/org/openqa/selenium/CookieImplementationTest.java +++ b/java/client/test/org/openqa/selenium/CookieImplementationTest.java @@ -1,4 +1,5 @@ /* +Copyright 2015 Software Freedom Conservancy Copyright 2007-2009 Selenium committers Licensed under the Apache License, Version 2.0 (the "License"); @@ -13,6 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ + package org.openqa.selenium; import org.junit.Before; @@ -42,8 +44,6 @@ 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.OPERA; -import static org.openqa.selenium.testing.Ignore.Driver.OPERA_MOBILE; 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; @@ -189,7 +189,6 @@ public void testShouldNotDeleteCookiesWithASimilarName() { assertTrue(cookies.toString(), cookies.contains(cookie2)); } - @Ignore(OPERA) @Test public void testAddCookiesWithDifferentPathsThatAreRelatedToOurs() { driver.get(domainHelper.getUrlForFirstValidHostname("/common/animals")); @@ -208,7 +207,7 @@ public void testAddCookiesWithDifferentPathsThatAreRelatedToOurs() { assertCookieIsNotPresentWithName(cookie1.getName()); } - @Ignore(value = {CHROME, OPERA, OPERA_MOBILE, PHANTOMJS, SAFARI}) + @Ignore(value = {CHROME, PHANTOMJS, SAFARI}) @Test public void testGetCookiesInAFrame() { driver.get(domainHelper.getUrlForFirstValidHostname("/common/animals")); @@ -222,7 +221,7 @@ public void testGetCookiesInAFrame() { assertCookieIsPresentWithName(cookie1.getName()); } - @Ignore({CHROME, OPERA}) + @Ignore({CHROME}) @Test public void testCannotGetCookiesWithPathDifferingOnlyInCase() { String cookieName = "fish"; @@ -246,8 +245,7 @@ public void testShouldNotGetCookieOnDifferentDomain() { assertCookieIsNotPresentWithName(cookieName); } - @Ignore(value = {CHROME, HTMLUNIT, IE, OPERA}, - reason = "Untested browsers.") + @Ignore(value = {CHROME, HTMLUNIT, IE}, reason = "Untested browsers.") @Test public void testShouldBeAbleToAddToADomainWhichIsRelatedToTheCurrentDomain() { String cookieName = "name"; @@ -343,7 +341,6 @@ public void testShouldIgnoreThePortNumberOfTheHostWhenSettingTheCookie() throws assertCookieIsPresentWithName(cookieName); } - @Ignore(OPERA) @Test public void testCookieEqualityAfterSetAndGet() { driver.get(domainHelper.getUrlForFirstValidHostname("animals")); @@ -371,9 +368,8 @@ public void testCookieEqualityAfterSetAndGet() { assertEquals(addedCookie, retrievedCookie); } - @Ignore(value = {IE, OPERA}, reason = - "Selenium, which use JavaScript to retrieve cookies, cannot return expiry info; " + - "Other suppressed browsers have not been tested.") + @Ignore(value = {IE}, reason = + "Selenium, which use JavaScript to retrieve cookies, cannot return expiry info") @Test public void testRetainsCookieExpiry() { Cookie addedCookie = @@ -388,7 +384,7 @@ public void testRetainsCookieExpiry() { assertEquals(addedCookie.getExpiry(), retrieved.getExpiry()); } - @Ignore(value = {IE, OPERA, OPERA_MOBILE, PHANTOMJS, SAFARI}) + @Ignore(value = {IE, PHANTOMJS, SAFARI}) @Test public void testRetainsCookieSecure() { driver.get(domainHelper.getSecureUrlForFirstValidHostname("animals")); @@ -407,7 +403,7 @@ public void testRetainsCookieSecure() { assertTrue(retrieved.isSecure()); } - @Ignore(value = {CHROME, FIREFOX, HTMLUNIT, IE, OPERA, OPERA_MOBILE, PHANTOMJS, SAFARI}) + @Ignore(value = {CHROME, FIREFOX, HTMLUNIT, IE, PHANTOMJS, SAFARI}) @Test public void testRetainsHttpOnlyFlag() { Cookie addedCookie = @@ -454,7 +450,7 @@ public void testDeleteNotExistedCookie() { driver.manage().deleteCookieNamed(key); } - @Ignore(value = {CHROME, FIREFOX, IE, OPERA, OPERA_MOBILE, PHANTOMJS, SAFARI}) + @Ignore(value = {CHROME, FIREFOX, IE, PHANTOMJS, SAFARI}) @Test public void testShouldDeleteOneOfTheCookiesWithTheSameName() { driver.get(domainHelper.getUrlForFirstValidHostname("/common/animals")); diff --git a/java/client/test/org/openqa/selenium/CorrectEventFiringTest.java b/java/client/test/org/openqa/selenium/CorrectEventFiringTest.java index 99a28279f6fe9..36a82312d28bc 100644 --- a/java/client/test/org/openqa/selenium/CorrectEventFiringTest.java +++ b/java/client/test/org/openqa/selenium/CorrectEventFiringTest.java @@ -1,4 +1,5 @@ /* +Copyright 2015 Software Freedom Conservancy Copyright 2007-2009 Selenium committers Licensed under the Apache License, Version 2.0 (the "License"); @@ -32,8 +33,6 @@ 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.OPERA; -import static org.openqa.selenium.testing.Ignore.Driver.OPERA_MOBILE; import static org.openqa.selenium.testing.Ignore.Driver.SAFARI; import org.junit.Test; @@ -366,8 +365,8 @@ public void testSubmittingFormFromFormInputTextElementShouldFireOnSubmitForThatF } @JavascriptEnabled - @Ignore(value = {OPERA, SAFARI, OPERA_MOBILE, MARIONETTE}, - reason = "Does not yet support file uploads", issues = { 4220 }) + @Ignore(value = {SAFARI, MARIONETTE}, + reason = "Does not yet support file uploads", issues = {4220}) @Test public void testUploadingFileShouldFireOnChangeEvent() throws IOException { driver.get(pages.formPage); diff --git a/java/client/test/org/openqa/selenium/CssValueTest.java b/java/client/test/org/openqa/selenium/CssValueTest.java index f81187fc01ef4..21aa15302ed03 100644 --- a/java/client/test/org/openqa/selenium/CssValueTest.java +++ b/java/client/test/org/openqa/selenium/CssValueTest.java @@ -1,4 +1,5 @@ /* +Copyright 2015 Software Freedom Conservancy Copyright 2007-2009 Selenium committers Licensed under the Apache License, Version 2.0 (the "License"); @@ -13,6 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ + package org.openqa.selenium; import org.junit.Test; @@ -26,12 +28,11 @@ import static org.junit.Assert.assertThat; import static org.openqa.selenium.testing.Ignore.Driver.HTMLUNIT; import static org.openqa.selenium.testing.Ignore.Driver.MARIONETTE; -import static org.openqa.selenium.testing.Ignore.Driver.OPERA; public class CssValueTest extends JUnit4TestBase { @JavascriptEnabled - @Ignore({HTMLUNIT, OPERA, MARIONETTE}) + @Ignore({HTMLUNIT, MARIONETTE}) @Test public void testShouldPickUpStyleOfAnElement() { driver.get(pages.javascriptPage); @@ -48,7 +49,7 @@ public void testShouldPickUpStyleOfAnElement() { } @JavascriptEnabled - @Ignore({HTMLUNIT, OPERA, MARIONETTE}) + @Ignore({HTMLUNIT, MARIONETTE}) @Test public void testGetCssValueShouldReturnStandardizedColour() { driver.get(pages.colorPage); @@ -64,7 +65,7 @@ public void testGetCssValueShouldReturnStandardizedColour() { } @JavascriptEnabled - @Ignore({OPERA, HTMLUNIT}) + @Ignore({HTMLUNIT}) @Test public void testShouldAllowInheritedStylesToBeUsed() { driver.get(pages.javascriptPage); diff --git a/java/client/test/org/openqa/selenium/ElementAttributeTest.java b/java/client/test/org/openqa/selenium/ElementAttributeTest.java index fc0d5a1051104..e73e36d6ea8f5 100644 --- a/java/client/test/org/openqa/selenium/ElementAttributeTest.java +++ b/java/client/test/org/openqa/selenium/ElementAttributeTest.java @@ -1,5 +1,5 @@ /* -Copyright 2012 Software Freedom Conservancy +Copyright 2012-2015 Software Freedom Conservancy Copyright 2007-2012 Selenium committers Licensed under the Apache License, Version 2.0 (the "License"); @@ -37,8 +37,6 @@ import static org.junit.Assert.fail; 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.OPERA; -import static org.openqa.selenium.testing.Ignore.Driver.OPERA_MOBILE; public class ElementAttributeTest extends JUnit4TestBase { @@ -81,7 +79,7 @@ public void testShouldReturnEmptyAttributeValuesWhenPresentAndTheValueIsActually assertThat(body.getAttribute("style"), equalTo("")); } - @Ignore({OPERA, MARIONETTE}) + @Ignore({MARIONETTE}) @Test public void testShouldReturnTheValueOfTheDisabledAttributeAsNullIfNotSet() { driver.get(pages.formPage); @@ -322,7 +320,6 @@ public void testCanRetrieveTheCurrentValueOfATextFormField_emailInput() { assertEquals("hello@example.com", element.getAttribute("value")); } - @Ignore({OPERA_MOBILE}) @Test public void testCanRetrieveTheCurrentValueOfATextFormField_textArea() { driver.get(pages.formPage); @@ -332,7 +329,7 @@ public void testCanRetrieveTheCurrentValueOfATextFormField_textArea() { assertEquals("hello world", element.getAttribute("value")); } - @Ignore({OPERA, MARIONETTE}) + @Ignore({MARIONETTE}) @Test public void testShouldReturnNullForNonPresentBooleanAttributes() { driver.get(pages.booleanAttributes); @@ -357,7 +354,7 @@ public void testShouldReturnTrueForPresentBooleanAttributes() { assertEquals("true", element5.getAttribute("nowrap")); } - @Ignore({OPERA, MARIONETTE}) + @Ignore({MARIONETTE}) @Test public void testMultipleAttributeShouldBeNullWhenNotSet() { driver.get(pages.selectPage); diff --git a/java/client/test/org/openqa/selenium/ElementEqualityTest.java b/java/client/test/org/openqa/selenium/ElementEqualityTest.java index a5a410323475d..014220a56a42f 100644 --- a/java/client/test/org/openqa/selenium/ElementEqualityTest.java +++ b/java/client/test/org/openqa/selenium/ElementEqualityTest.java @@ -1,6 +1,6 @@ /* Copyright 2012 Selenium committers -Copyright 2012 Software Freedom Conservancy +Copyright 2012-2015 Software Freedom Conservancy Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -15,7 +15,6 @@ limitations under the License. */ - package org.openqa.selenium; import org.junit.Test; @@ -30,8 +29,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.openqa.selenium.testing.Ignore.Driver.MARIONETTE; -import static org.openqa.selenium.testing.Ignore.Driver.OPERA; -import static org.openqa.selenium.testing.Ignore.Driver.OPERA_MOBILE; public class ElementEqualityTest extends JUnit4TestBase { @@ -74,8 +71,7 @@ public void testSameElementLookedUpDifferentWaysUsingFindElementsShouldHaveSameH } @JavascriptEnabled - @Ignore(value = {OPERA, OPERA_MOBILE, MARIONETTE}, - reason = "Opera: Needs investigation") + @Ignore(value = {MARIONETTE}) @Test public void testAnElementFoundInADifferentFrameViaJsShouldHaveSameId() { driver.get(pages.missedJsReferencePage); diff --git a/java/client/test/org/openqa/selenium/ElementFindingTest.java b/java/client/test/org/openqa/selenium/ElementFindingTest.java index 799a51194dc47..279daf0ee7007 100644 --- a/java/client/test/org/openqa/selenium/ElementFindingTest.java +++ b/java/client/test/org/openqa/selenium/ElementFindingTest.java @@ -1,5 +1,5 @@ /* -Copyright 2012 Software Freedom Conservancy +Copyright 2012-2015 Software Freedom Conservancy Copyright 2007-2012 Selenium committers Licensed under the Apache License, Version 2.0 (the "License"); @@ -34,8 +34,6 @@ 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.OPERA; -import static org.openqa.selenium.testing.Ignore.Driver.OPERA_MOBILE; import static org.openqa.selenium.testing.Ignore.Driver.REMOTE; import static org.openqa.selenium.testing.Ignore.Driver.SAFARI; import static org.openqa.selenium.testing.TestUtilities.isOldIe; @@ -298,44 +296,42 @@ public void testShouldNotFindElementByClassWhenTheNameQueriedIsShorterThanCandid driver.findElement(By.className("nameB")); } - @Ignore(value = {CHROME}, reason = "Throws WebDriverException") + @Ignore(value = {CHROME}, reason = "throws WebDriverException") @Test(expected = NoSuchElementException.class) public void testFindingASingleElementByEmptyClassNameShouldThrow() { driver.get(pages.xhtmlTestPage); driver.findElement(By.className("")); } - @Ignore(value = {CHROME, OPERA, OPERA_MOBILE}, reason = "Throws WebDriverException") + @Ignore(value = {CHROME}, reason = "throws WebDriverException") @Test(expected = NoSuchElementException.class) public void testFindingMultipleElementsByEmptyClassNameShouldThrow() { driver.get(pages.xhtmlTestPage); driver.findElements(By.className("")); } - @Ignore(value = {CHROME, OPERA, OPERA_MOBILE}, reason = "Throws WebDriverException") + @Ignore(value = {CHROME}, reason = "throws WebDriverException") @Test(expected = NoSuchElementException.class) public void testFindingASingleElementByCompoundClassNameShouldThrow() { driver.get(pages.xhtmlTestPage); driver.findElement(By.className("a b")); } - @Ignore(value = {CHROME, OPERA, OPERA_MOBILE}, - reason = "Chrome: throws WebDriverException") + @Ignore(value = {CHROME}, reason = "throws WebDriverException") @Test(expected = NoSuchElementException.class) public void testFindingMultipleElementsByCompoundClassNameShouldThrow() { driver.get(pages.xhtmlTestPage); driver.findElements(By.className("a b")); } - @Ignore(value = {CHROME}, reason = "Throws InvalidElementStateException") + @Ignore(value = {CHROME}, reason = "throws InvalidElementStateException") @Test(expected = NoSuchElementException.class) public void testFindingASingleElementByInvalidClassNameShouldThrow() { driver.get(pages.xhtmlTestPage); driver.findElement(By.className("!@#$%^&*")); } - @Ignore(value = {CHROME, OPERA, OPERA_MOBILE}, - reason = "Chrome: throws InvalidElementStateException") + @Ignore(value = {CHROME}, reason = "throws InvalidElementStateException") @Test(expected = NoSuchElementException.class) public void testFindingMultipleElementsByInvalidClassNameShouldThrow() { driver.get(pages.xhtmlTestPage); @@ -398,7 +394,7 @@ public void testFindingALinkByXpathUsingContainsKeywordShouldWork() { assertThat(element.getText(), containsString("hello world")); } - @Ignore({HTMLUNIT, IE, OPERA, OPERA_MOBILE, MARIONETTE, SAFARI}) + @Ignore({HTMLUNIT, IE, MARIONETTE, SAFARI}) @Test public void testShouldBeAbleToFindElementByXPathWithNamespace() { driver.get(pages.svgPage); @@ -414,14 +410,14 @@ public void testShouldThrowAnExceptionWhenThereIsNoLinkToClick() { driver.findElement(By.xpath("//a[@id='Not here']")); } - @Ignore({OPERA, OPERA_MOBILE, MARIONETTE}) + @Ignore({MARIONETTE}) @Test(expected = InvalidSelectorException.class) public void testShouldThrowInvalidSelectorExceptionWhenXPathIsSyntacticallyInvalidInDriverFindElement() { driver.get(pages.formPage); driver.findElement(By.xpath("this][isnot][valid")); } - @Ignore({OPERA, OPERA_MOBILE, MARIONETTE}) + @Ignore({MARIONETTE}) @Test(expected = InvalidSelectorException.class) public void testShouldThrowInvalidSelectorExceptionWhenXPathIsSyntacticallyInvalidInDriverFindElements() { assumeFalse("Ignoring xpath error test in IE6", TestUtilities.isIe6(driver)); @@ -430,7 +426,7 @@ public void testShouldThrowInvalidSelectorExceptionWhenXPathIsSyntacticallyInval driver.findElements(By.xpath("this][isnot][valid")); } - @Ignore({OPERA, OPERA_MOBILE, MARIONETTE}) + @Ignore({MARIONETTE}) @Test(expected = InvalidSelectorException.class) public void testShouldThrowInvalidSelectorExceptionWhenXPathIsSyntacticallyInvalidInElementFindElement() { driver.get(pages.formPage); @@ -438,7 +434,7 @@ public void testShouldThrowInvalidSelectorExceptionWhenXPathIsSyntacticallyInval body.findElement(By.xpath("this][isnot][valid")); } - @Ignore({OPERA, OPERA_MOBILE, MARIONETTE}) + @Ignore({MARIONETTE}) @Test(expected = InvalidSelectorException.class) public void testShouldThrowInvalidSelectorExceptionWhenXPathIsSyntacticallyInvalidInElementFindElements() { assumeFalse("Ignoring xpath error test in IE6", TestUtilities.isIe6(driver)); @@ -448,14 +444,14 @@ public void testShouldThrowInvalidSelectorExceptionWhenXPathIsSyntacticallyInval body.findElements(By.xpath("this][isnot][valid")); } - @Ignore({OPERA, OPERA_MOBILE, MARIONETTE}) + @Ignore({MARIONETTE}) @Test(expected = InvalidSelectorException.class) public void testShouldThrowInvalidSelectorExceptionWhenXPathReturnsWrongTypeInDriverFindElement() { driver.get(pages.formPage); driver.findElement(By.xpath("count(//input)")); } - @Ignore({OPERA, OPERA_MOBILE, MARIONETTE}) + @Ignore({MARIONETTE}) @Test(expected = InvalidSelectorException.class) public void testShouldThrowInvalidSelectorExceptionWhenXPathReturnsWrongTypeInDriverFindElements() { assumeFalse("Ignoring xpath error test in IE6", TestUtilities.isIe6(driver)); @@ -464,7 +460,7 @@ public void testShouldThrowInvalidSelectorExceptionWhenXPathReturnsWrongTypeInDr driver.findElements(By.xpath("count(//input)")); } - @Ignore({OPERA, OPERA_MOBILE, MARIONETTE}) + @Ignore({MARIONETTE}) @Test(expected = InvalidSelectorException.class) public void testShouldThrowInvalidSelectorExceptionWhenXPathReturnsWrongTypeInElementFindElement() { driver.get(pages.formPage); @@ -473,7 +469,7 @@ public void testShouldThrowInvalidSelectorExceptionWhenXPathReturnsWrongTypeInEl body.findElement(By.xpath("count(//input)")); } - @Ignore({OPERA, OPERA_MOBILE, MARIONETTE}) + @Ignore({MARIONETTE}) @Test(expected = InvalidSelectorException.class) public void testShouldThrowInvalidSelectorExceptionWhenXPathReturnsWrongTypeInElementFindElements() { assumeFalse("Ignoring xpath error test in IE6", TestUtilities.isIe6(driver)); @@ -560,22 +556,21 @@ public void testFindingASingleElementByEmptyCssSelectorShouldThrow() { driver.findElement(By.cssSelector("")); } - @Ignore(value = {CHROME, OPERA, OPERA_MOBILE}, - reason = "Chrome: throws WebDriverException") + @Ignore(value = {CHROME}, reason = "throws WebDriverException") @Test(expected = NoSuchElementException.class) public void testFindingMultipleElementsByEmptyCssSelectorShouldThrow() { driver.get(pages.xhtmlTestPage); driver.findElements(By.cssSelector("")); } - @Ignore(value = {CHROME}, reason = "Throws InvalidElementStateException") + @Ignore(value = {CHROME}, reason = "throws InvalidElementStateException") @Test(expected = NoSuchElementException.class) public void testFindingASingleElementByInvalidCssSelectorShouldThrow() { driver.get(pages.xhtmlTestPage); driver.findElement(By.cssSelector("//a/b/c[@id='1']")); } - @Ignore(value = {CHROME, OPERA, OPERA_MOBILE}, + @Ignore(value = {CHROME}, reason = "Chrome: throws InvalidElementStateException") @Test(expected = NoSuchElementException.class) public void testFindingMultipleElementsByInvalidCssSelectorShouldThrow() { @@ -616,7 +611,7 @@ public void testShouldFindMultipleElementsByLinkTextContainingEqualsSign() { } @Test - @Ignore({OPERA, MARIONETTE}) + @Ignore({MARIONETTE}) public void findsByLinkTextOnXhtmlPage() { assumeFalse("Old IE doesn't render XHTML pages, don't try loading XHTML pages in it", isOldIe(driver)); @@ -740,7 +735,7 @@ public void testShouldNotBeAbleToLocateASingleElementOnABlankPage() { driver.findElement(By.id("nonExistantButton")); } - @Ignore(value = {OPERA, OPERA_MOBILE, MARIONETTE}, reason = "Just not working") + @Ignore(value = {MARIONETTE}) @Test public void testAnElementFoundInADifferentFrameIsStale() { driver.get(pages.missedJsReferencePage); @@ -756,7 +751,7 @@ public void testAnElementFoundInADifferentFrameIsStale() { } @JavascriptEnabled - @Ignore({OPERA, OPERA_MOBILE, MARIONETTE}) + @Ignore({MARIONETTE}) @Test public void testAnElementFoundInADifferentFrameViaJsCanBeUsed() { driver.get(pages.missedJsReferencePage); diff --git a/java/client/test/org/openqa/selenium/ElementSelectingTest.java b/java/client/test/org/openqa/selenium/ElementSelectingTest.java index ecaaf73d0ee00..371d52ad49c54 100644 --- a/java/client/test/org/openqa/selenium/ElementSelectingTest.java +++ b/java/client/test/org/openqa/selenium/ElementSelectingTest.java @@ -1,6 +1,6 @@ /* Copyright 2012 Selenium committers -Copyright 2012 Software Freedom Conservancy +Copyright 2012-2015 Software Freedom Conservancy Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -22,7 +22,6 @@ import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import static org.openqa.selenium.testing.Ignore.Driver.MARIONETTE; -import static org.openqa.selenium.testing.Ignore.Driver.OPERA_MOBILE; import org.junit.Test; import org.openqa.selenium.support.ui.ExpectedConditions; @@ -60,7 +59,7 @@ public void testShouldNotBeAbleToSelectADisabledCheckboxDisabledWithRandomString } @Test - @Ignore({OPERA_MOBILE, MARIONETTE}) + @Ignore({MARIONETTE}) public void testShouldNotBeAbleToSelectADisabledRadioButton() { driver.get(pages.formPage); assertCannotSelect(disabledUnselectedRadioButton()); diff --git a/java/client/test/org/openqa/selenium/ExecutingAsyncJavascriptTest.java b/java/client/test/org/openqa/selenium/ExecutingAsyncJavascriptTest.java index 51e10f901734a..25ea447870d5e 100644 --- a/java/client/test/org/openqa/selenium/ExecutingAsyncJavascriptTest.java +++ b/java/client/test/org/openqa/selenium/ExecutingAsyncJavascriptTest.java @@ -1,6 +1,6 @@ /* Copyright 2012 Selenium committers -Copyright 2012 Software Freedom Conservancy +Copyright 2012-2015 Software Freedom Conservancy Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -43,15 +43,12 @@ 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.OPERA; -import static org.openqa.selenium.testing.Ignore.Driver.OPERA_MOBILE; import static org.openqa.selenium.testing.Ignore.Driver.PHANTOMJS; import static org.openqa.selenium.testing.Ignore.Driver.SAFARI; import com.google.common.base.Throwables; -@Ignore(value = {OPERA, OPERA_MOBILE, PHANTOMJS, MARIONETTE}, - reason = "Opera: not implemented yet") +@Ignore(value = {PHANTOMJS, MARIONETTE}) public class ExecutingAsyncJavascriptTest extends JUnit4TestBase { private JavascriptExecutor executor; @@ -246,7 +243,7 @@ public void shouldNotTimeoutWithMultipleCallsTheFirstOneBeingSynchronous() { @JavascriptEnabled @Test - @Ignore(value = {CHROME, HTMLUNIT, IE, OPERA, OPERA_MOBILE, PHANTOMJS, SAFARI}) + @Ignore(value = {CHROME, HTMLUNIT, IE, PHANTOMJS, SAFARI}) public void shouldCatchErrorsWithMessageAndStacktraceWhenExecutingInitialScript() { driver.get(pages.ajaxyPage); String js = "function functionB() { throw Error('errormessage'); };" @@ -344,7 +341,7 @@ public void shouldBeAbleToMakeXMLHttpRequestsAndWaitForTheResponse() { @JavascriptEnabled @Test - @Ignore(value = {CHROME, HTMLUNIT, IE, OPERA}) + @Ignore(value = {CHROME, HTMLUNIT, IE}) @NeedsLocalEnvironment(reason = "Relies on timing") public void throwsIfScriptTriggersAlert() { driver.get(pages.simpleTestPage); @@ -362,7 +359,7 @@ public void throwsIfScriptTriggersAlert() { @JavascriptEnabled @Test - @Ignore(value = {CHROME, HTMLUNIT, IE, OPERA}) + @Ignore(value = {CHROME, HTMLUNIT, IE}) @NeedsLocalEnvironment(reason = "Relies on timing") public void throwsIfAlertHappensDuringScript() { driver.get(pages.slowLoadingAlertPage); @@ -378,7 +375,7 @@ public void throwsIfAlertHappensDuringScript() { } @Test - @Ignore(value = {CHROME, HTMLUNIT, IE, OPERA}) + @Ignore(value = {CHROME, HTMLUNIT, IE}) @NeedsLocalEnvironment(reason = "Relies on timing") public void throwsIfScriptTriggersAlertWhichTimesOut() { driver.get(pages.simpleTestPage); @@ -396,7 +393,7 @@ public void throwsIfScriptTriggersAlertWhichTimesOut() { @JavascriptEnabled @Test - @Ignore(value = {CHROME, HTMLUNIT, IE, OPERA}) + @Ignore(value = {CHROME, HTMLUNIT, IE}) @NeedsLocalEnvironment(reason = "Relies on timing") public void throwsIfAlertHappensDuringScriptWhichTimesOut() { driver.get(pages.slowLoadingAlertPage); @@ -413,7 +410,7 @@ public void throwsIfAlertHappensDuringScriptWhichTimesOut() { @JavascriptEnabled @Test - @Ignore(value = {CHROME, HTMLUNIT, IE, OPERA}) + @Ignore(value = {CHROME, HTMLUNIT, IE}) @NeedsLocalEnvironment(reason = "Relies on timing") public void includesAlertTextInUnhandledAlertException() { driver.manage().timeouts().setScriptTimeout(5000, TimeUnit.MILLISECONDS); diff --git a/java/client/test/org/openqa/selenium/ExecutingJavascriptTest.java b/java/client/test/org/openqa/selenium/ExecutingJavascriptTest.java index 7a7519f32bc76..1da793033250a 100644 --- a/java/client/test/org/openqa/selenium/ExecutingJavascriptTest.java +++ b/java/client/test/org/openqa/selenium/ExecutingJavascriptTest.java @@ -1,4 +1,5 @@ /* +Copyright 2015 Software Freedom Conservancy Copyright 2007-2009 Selenium committers Licensed under the Apache License, Version 2.0 (the "License"); @@ -53,8 +54,6 @@ import static org.junit.Assert.fail; import static org.junit.Assume.assumeTrue; import static org.openqa.selenium.testing.Ignore.Driver.IE; -import static org.openqa.selenium.testing.Ignore.Driver.OPERA; -import static org.openqa.selenium.testing.Ignore.Driver.OPERA_MOBILE; 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.MARIONETTE; @@ -216,7 +215,7 @@ public void testShouldBeAbleToExecuteSimpleJavascriptAndReturnAnObjectLiteral() @SuppressWarnings("unchecked") @JavascriptEnabled - @Ignore({IE, OPERA, OPERA_MOBILE}) + @Ignore({IE}) @Test public void testShouldBeAbleToExecuteSimpleJavascriptAndReturnAComplexObject() { driver.get(pages.javascriptPage); @@ -285,7 +284,7 @@ public void testShouldThrowAnExceptionWhenTheJavascriptIsBad() { @JavascriptEnabled @Test - @Ignore(value = {CHROME, HTMLUNIT, IE, OPERA, OPERA_MOBILE, PHANTOMJS, SAFARI, MARIONETTE}) + @Ignore(value = {CHROME, HTMLUNIT, IE, PHANTOMJS, SAFARI, MARIONETTE}) public void testShouldThrowAnExceptionWithMessageAndStacktraceWhenTheJavascriptIsBad() { driver.get(pages.xhtmlTestPage); @@ -374,7 +373,6 @@ public void testPassingArrayAsOnlyArgumentFlattensArray() { } @JavascriptEnabled - @Ignore({OPERA, OPERA_MOBILE}) @Test public void testShouldBeAbleToPassAnArrayAsAdditionalArgument() { driver.get(pages.javascriptPage); @@ -426,7 +424,7 @@ public void testShouldBeAbleToPassInMoreThanOneArgument() { @JavascriptEnabled @Test - @Ignore({MARIONETTE, OPERA, OPERA_MOBILE}) + @Ignore({MARIONETTE}) public void testShouldBeAbleToGrabTheBodyOfFrameOnceSwitchedTo() { driver.get(pages.richTextPage); @@ -466,7 +464,6 @@ public void testJavascriptStringHandlingShouldWorkAsExpected() { } @JavascriptEnabled - @Ignore(OPERA) @Test public void testShouldBeAbleToExecuteABigChunkOfJavascriptCode() throws IOException { driver.get(pages.javascriptPage); @@ -507,7 +504,6 @@ public void testShouldThrowExceptionIfExecutingOnNoPage() { } @JavascriptEnabled - @Ignore({OPERA, MARIONETTE}) @Test public void testShouldBeAbleToCreateAPersistentValue() { driver.get(pages.formPage); @@ -520,7 +516,6 @@ public void testShouldBeAbleToCreateAPersistentValue() { } @JavascriptEnabled - @Ignore(OPERA) @Test public void testCanHandleAnArrayOfElementsAsAnObjectArray() { driver.get(pages.formPage); @@ -535,8 +530,6 @@ public void testCanHandleAnArrayOfElementsAsAnObjectArray() { } @JavascriptEnabled - @Ignore(value = {OPERA, OPERA_MOBILE}, - reason = "Opera obeys the method contract. Android not tested") @Test public void testCanPassAMapAsAParameter() { driver.get(pages.simpleTestPage); @@ -551,7 +544,6 @@ public void testCanPassAMapAsAParameter() { @JavascriptEnabled @Test - @Ignore(value = {OPERA, OPERA_MOBILE}, reason = "Opera: failed") public void testShouldThrowAnExceptionWhenArgumentsWithStaleElementPassed() { driver.get(pages.simpleTestPage); @@ -577,7 +569,7 @@ public void testShouldThrowAnExceptionWhenArgumentsWithStaleElementPassed() { @JavascriptEnabled @Test - @Ignore(value = {CHROME, HTMLUNIT, IE, OPERA, OPERA_MOBILE, PHANTOMJS, SAFARI, MARIONETTE}) + @Ignore(value = {CHROME, HTMLUNIT, IE, PHANTOMJS, SAFARI, MARIONETTE}) public void testShouldBeAbleToReturnADateObject() { driver.get(pages.simpleTestPage); @@ -592,7 +584,7 @@ public void testShouldBeAbleToReturnADateObject() { @JavascriptEnabled @Test(timeout = 10000) - @Ignore(value = {CHROME, IE, OPERA, OPERA_MOBILE, PHANTOMJS, SAFARI, MARIONETTE}) + @Ignore(value = {CHROME, IE, PHANTOMJS, SAFARI, MARIONETTE}) public void shouldReturnDocumentElementIfDocumentIsReturned() { driver.get(pages.simpleTestPage); diff --git a/java/client/test/org/openqa/selenium/FormHandlingTest.java b/java/client/test/org/openqa/selenium/FormHandlingTest.java index fec525accd26c..b00d043bb7677 100644 --- a/java/client/test/org/openqa/selenium/FormHandlingTest.java +++ b/java/client/test/org/openqa/selenium/FormHandlingTest.java @@ -1,4 +1,5 @@ /* +Copyright 2015 Software Freedom Conservancy Copyright 2007-2009 Selenium committers Licensed under the Apache License, Version 2.0 (the "License"); @@ -28,8 +29,6 @@ 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.OPERA; -import static org.openqa.selenium.testing.Ignore.Driver.OPERA_MOBILE; import static org.openqa.selenium.testing.Ignore.Driver.PHANTOMJS; import static org.openqa.selenium.testing.Ignore.Driver.SAFARI; import static org.openqa.selenium.testing.TestUtilities.isIe6; @@ -94,14 +93,13 @@ public void testShouldSubmitAFormWhenAnyElementWithinThatFormIsSubmitted() { } @Test(expected = NoSuchElementException.class) - @Ignore(value = {OPERA, PHANTOMJS, SAFARI, OPERA_MOBILE}) + @Ignore(value = {PHANTOMJS, SAFARI}) public void testShouldNotBeAbleToSubmitAFormThatDoesNotExist() { driver.get(pages.formPage); driver.findElement(By.name("SearchableText")).submit(); } @Test - @Ignore(OPERA_MOBILE) public void testShouldBeAbleToEnterTextIntoATextAreaBySettingItsValue() { driver.get(pages.javascriptPage); WebElement textarea = driver.findElement(By.id("keyUpArea")); @@ -110,7 +108,6 @@ public void testShouldBeAbleToEnterTextIntoATextAreaBySettingItsValue() { assertThat(textarea.getAttribute("value"), equalTo(cheesy)); } - @Ignore(value = {OPERA_MOBILE}) @Test public void testSendKeysKeepsCapitalization() { driver.get(pages.javascriptPage); @@ -121,7 +118,6 @@ public void testSendKeysKeepsCapitalization() { assertThat(textarea.getAttribute("value"), equalTo(cheesey)); } - @Ignore(value = {OPERA_MOBILE}) @Test public void testShouldSubmitAFormUsingTheNewlineLiteral() { driver.get(pages.formPage); @@ -132,7 +128,7 @@ public void testShouldSubmitAFormUsingTheNewlineLiteral() { assertTrue(driver.getCurrentUrl().endsWith("?x=name")); } - @Ignore({OPERA_MOBILE, MARIONETTE}) + @Ignore({MARIONETTE}) @Test public void testShouldSubmitAFormUsingTheEnterKey() { driver.get(pages.formPage); @@ -159,7 +155,7 @@ public void testShouldEnterDataIntoFormFields() { assertThat(newFormValue, equalTo("some text")); } - @Ignore(value = {SAFARI, OPERA, OPERA_MOBILE, MARIONETTE}, + @Ignore(value = {SAFARI, MARIONETTE}, reason = "Does not yet support file uploads", issues = {4220}) @Test public void testShouldBeAbleToAlterTheContentsOfAFileUploadInputElement() throws IOException { @@ -176,7 +172,7 @@ public void testShouldBeAbleToAlterTheContentsOfAFileUploadInputElement() throws assertTrue(uploadPath.endsWith(file.getName())); } - @Ignore(value = {OPERA, SAFARI, OPERA_MOBILE, MARIONETTE}, + @Ignore(value = {SAFARI, MARIONETTE}, reason = "Does not yet support file uploads", issues = {4220}) @Test public void testShouldBeAbleToSendKeysToAFileUploadInputElementInAnXhtmlDocument() @@ -198,7 +194,7 @@ public void testShouldBeAbleToSendKeysToAFileUploadInputElementInAnXhtmlDocument assertTrue(uploadPath.endsWith(file.getName())); } - @Ignore(value = {OPERA, SAFARI}, + @Ignore(value = {SAFARI}, reason = "Does not yet support file uploads", issues = {4220}) @Test public void testShouldBeAbleToUploadTheSameFileTwice() throws IOException { @@ -222,7 +218,6 @@ public void testShouldBeAbleToUploadTheSameFileTwice() throws IOException { // If we get this far, then we're all good. } - @Ignore(value = {OPERA}) @Test public void testSendingKeyboardEventsShouldAppendTextInInputs() { driver.get(pages.formPage); @@ -236,7 +231,6 @@ public void testSendingKeyboardEventsShouldAppendTextInInputs() { assertThat(value, is("some text")); } - @Ignore(value = {OPERA, OPERA_MOBILE}) @Test public void testSendingKeyboardEventsShouldAppendTextInInputsWithExistingValue() { driver.get(pages.formPage); @@ -247,8 +241,6 @@ public void testSendingKeyboardEventsShouldAppendTextInInputsWithExistingValue() assertThat(value, is("Example text. Some text")); } - @Ignore(value = {OPERA_MOBILE}, - reason = "Not implemented going to the end of the line first;") @Test public void testSendingKeyboardEventsShouldAppendTextInTextAreas() { driver.get(pages.formPage); @@ -268,7 +260,7 @@ public void testEmptyTextBoxesShouldReturnAnEmptyStringNotNull() { } @Test - @Ignore(value = {HTMLUNIT, OPERA, PHANTOMJS, SAFARI, OPERA_MOBILE, MARIONETTE}, + @Ignore(value = {HTMLUNIT, PHANTOMJS, SAFARI, MARIONETTE}, reason = "untested") public void handleFormWithJavascriptAction() { String url = appServer.whereIs("form_handling_js_submit.html"); @@ -282,27 +274,27 @@ public void handleFormWithJavascriptAction() { assertEquals("Tasty cheese", text); } - @Ignore(value = {SAFARI, OPERA_MOBILE}, reason = "untested") + @Ignore(value = {SAFARI}, reason = "untested") @Test public void testCanClickOnASubmitButton() { checkSubmitButton("internal_explicit_submit"); } - @Ignore(value = {HTMLUNIT, SAFARI, OPERA_MOBILE}, reason = "untested") + @Ignore(value = {HTMLUNIT, SAFARI}, reason = "untested") @Test public void testCanClickOnAnImplicitSubmitButton() { assumeFalse(isIe6(driver) || isIe7(driver) ); checkSubmitButton("internal_implicit_submit"); } - @Ignore(value = {HTMLUNIT, IE, SAFARI, OPERA_MOBILE}, + @Ignore(value = {HTMLUNIT, IE, SAFARI}, reason = "IE, HtmlUnit: failed; Others: untested") @Test public void testCanClickOnAnExternalSubmitButton() { checkSubmitButton("external_explicit_submit"); } - @Ignore(value = {HTMLUNIT, IE, SAFARI, OPERA_MOBILE}, + @Ignore(value = {HTMLUNIT, IE, SAFARI}, reason = "IE, HtmlUnit: failed; Others: untested") @Test public void testCanClickOnAnExternalImplicitSubmitButton() { diff --git a/java/client/test/org/openqa/selenium/FrameSwitchingTest.java b/java/client/test/org/openqa/selenium/FrameSwitchingTest.java index b2e86ea0e1722..232ad1588318c 100644 --- a/java/client/test/org/openqa/selenium/FrameSwitchingTest.java +++ b/java/client/test/org/openqa/selenium/FrameSwitchingTest.java @@ -1,5 +1,5 @@ /* -Copyright 2012 Software Freedom Conservancy +Copyright 2012-2015 Software Freedom Conservancy Copyright 2007-2012 Selenium committers Licensed under the Apache License, Version 2.0 (the "License"); @@ -32,8 +32,6 @@ import static org.openqa.selenium.testing.Ignore.Driver.CHROME; 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.OPERA; -import static org.openqa.selenium.testing.Ignore.Driver.OPERA_MOBILE; import static org.openqa.selenium.testing.Ignore.Driver.PHANTOMJS; import static org.openqa.selenium.testing.Ignore.Driver.SAFARI; @@ -149,7 +147,7 @@ public void testShouldBeAbleToSwitchToAnIframeByItsID() { } @Test - @Ignore({OPERA, OPERA_MOBILE, MARIONETTE}) + @Ignore({MARIONETTE}) public void testShouldBeAbleToSwitchToFrameWithNameContainingDot() { driver.get(pages.framesetPage); driver.switchTo().frame("sixth.iframe1"); @@ -218,7 +216,7 @@ public void testFrameSearchesShouldBeRelativeToTheCurrentlySelectedFrame() { assertThat(driver.findElement(By.id("pageNumber")).getText(), equalTo("2")); } - @Ignore({OPERA, OPERA_MOBILE, MARIONETTE}) + @Ignore({MARIONETTE}) @Test public void testShouldSelectChildFramesByChainedCalls() { driver.get(pages.framesetPage); @@ -266,7 +264,7 @@ public void testShouldThrowAnExceptionWhenAFrameCannotBeFoundByIndex() { } } - @Ignore({CHROME, IE, OPERA, OPERA_MOBILE, PHANTOMJS, SAFARI, MARIONETTE}) + @Ignore({CHROME, IE, PHANTOMJS, SAFARI, MARIONETTE}) @Test public void testShouldBeAbleToSwitchToParentFrame() { driver.get(pages.framesetPage); @@ -275,7 +273,7 @@ public void testShouldBeAbleToSwitchToParentFrame() { assertThat(driver.findElement(By.id("pageNumber")).getText(), equalTo("1")); } - @Ignore({CHROME, IE, OPERA, OPERA_MOBILE, PHANTOMJS, SAFARI, MARIONETTE}) + @Ignore({CHROME, IE, PHANTOMJS, SAFARI, MARIONETTE}) @Test public void testShouldBeAbleToSwitchToParentFrameFromASecondLevelFrame() { driver.get(pages.framesetPage); @@ -285,7 +283,7 @@ public void testShouldBeAbleToSwitchToParentFrameFromASecondLevelFrame() { assertThat(driver.findElement(By.id("pageNumber")).getText(), equalTo("11")); } - @Ignore({CHROME, IE, OPERA, OPERA_MOBILE, PHANTOMJS, SAFARI, MARIONETTE}) + @Ignore({CHROME, IE, PHANTOMJS, SAFARI, MARIONETTE}) @Test public void testSwitchingToParentFrameFromDefaultContextIsNoOp() { driver.get(pages.xhtmlTestPage); @@ -293,7 +291,7 @@ public void testSwitchingToParentFrameFromDefaultContextIsNoOp() { assertEquals(driver.getTitle(), "XHTML Test Page"); } - @Ignore({CHROME, IE, OPERA, OPERA_MOBILE, PHANTOMJS, SAFARI, MARIONETTE}) + @Ignore({CHROME, IE, PHANTOMJS, SAFARI, MARIONETTE}) @Test public void testShouldBeAbleToSwitchToParentFromAnIframe() { driver.get(pages.iframePage); @@ -325,7 +323,7 @@ public void testShouldContinueToReferToTheSameFrameOnceItHasBeenSelected() { wait.until(WaitingConditions.elementTextToEqual(By.xpath("//p"), "Success!")); } - @Ignore(value = {OPERA, OPERA_MOBILE, MARIONETTE}) + @Ignore(value = {MARIONETTE}) @Test public void testShouldFocusOnTheReplacementWhenAFrameFollowsALinkToA_TopTargetedPage() throws Exception { @@ -367,7 +365,7 @@ public String getTextOfGreetingElement() { return wait.until(presenceOfElementLocated(By.id("greeting"))).getText(); } - @Ignore({OPERA, OPERA_MOBILE, MARIONETTE}) + @Ignore({MARIONETTE}) @Test public void testShouldBeAbleToClickInAFrame() { driver.get(pages.framesetPage); @@ -382,8 +380,6 @@ public void testShouldBeAbleToClickInAFrame() { assertThat(getTextOfGreetingElement(), equalTo("Success!")); } - // See https://code.google.com/p/selenium/issues/detail?id=5237 - @Ignore({OPERA, OPERA_MOBILE}) @JavascriptEnabled @Test public void testShouldBeAbleToClickInAFrameThatRewritesTopWindowLocation() { @@ -394,7 +390,7 @@ public void testShouldBeAbleToClickInAFrameThatRewritesTopWindowLocation() { wait.until(titleIs("Target page for issue 5237")); } - @Ignore({OPERA, OPERA_MOBILE, MARIONETTE}) + @Ignore({MARIONETTE}) @Test public void testShouldBeAbleToClickInASubFrame() { driver.get(pages.framesetPage); @@ -442,7 +438,7 @@ public void testGetCurrentUrl() { assertThat(driver.getCurrentUrl(), equalTo(url)); } - @Ignore(value = {OPERA, OPERA_MOBILE, PHANTOMJS}) + @Ignore(value = {PHANTOMJS}) @JavascriptEnabled @Test public void testShouldBeAbleToSwitchToTheTopIfTheFrameIsDeletedFromUnderUs() { diff --git a/java/client/test/org/openqa/selenium/I18nTest.java b/java/client/test/org/openqa/selenium/I18nTest.java index 4e47f1a1c7aa9..8e93181776d1c 100644 --- a/java/client/test/org/openqa/selenium/I18nTest.java +++ b/java/client/test/org/openqa/selenium/I18nTest.java @@ -1,4 +1,5 @@ /* +Copyright 2015 Software Freedom Conservancy Copyright 2007-2009 Selenium committers Licensed under the Apache License, Version 2.0 (the "License"); @@ -26,7 +27,6 @@ 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.OPERA; import org.junit.Test; import org.openqa.selenium.environment.GlobalTestEnvironment; @@ -88,11 +88,9 @@ public void testEnteringHebrewTextFromRightToLeft() { @Test @Ignore( - value = {MARIONETTE, CHROME, OPERA}, - reason = "MAIONETTE: not checked, " - + "CHROME: ChromeDriver only supports characters in the BMP" - + "OPERA: doesn't work - see issue 5069" - ) + value = {MARIONETTE, CHROME}, + reason = "MARIONETTE: not checked, " + + "CHROME: ChromeDriver only supports characters in the BMP") public void testEnteringSupplementaryCharacters() { assumeFalse("IE: versions less thank 10 have issue 5069", TestUtilities.isInternetExplorer(driver) && @@ -131,7 +129,7 @@ public void testShouldBeAbleToReturnTheTextInAPage() { } @NeedsFreshDriver - @Ignore(value = {IE, CHROME, HTMLUNIT, FIREFOX, OPERA}, + @Ignore(value = {IE, CHROME, HTMLUNIT, FIREFOX}, reason = "Not implemented on anything other than" + "Firefox/Linux at the moment.") @Test @@ -181,7 +179,7 @@ public void testShouldBeAbleToActivateIMEEngine() throws InterruptedException { + " It was:" + elementValue, elementValue.equals(tokyo)); } - @Ignore(value = {IE, CHROME, HTMLUNIT, OPERA}, + @Ignore(value = {IE, CHROME, HTMLUNIT}, reason = "Not implemented on anything other than" + "Firefox/Linux at the moment.") @Test diff --git a/java/client/test/org/openqa/selenium/JavascriptEnabledDriverTest.java b/java/client/test/org/openqa/selenium/JavascriptEnabledDriverTest.java index 4fb8b91255a2c..c63eddd6854f4 100644 --- a/java/client/test/org/openqa/selenium/JavascriptEnabledDriverTest.java +++ b/java/client/test/org/openqa/selenium/JavascriptEnabledDriverTest.java @@ -1,6 +1,6 @@ /* Copyright 2007-2009 Selenium committers -Portions copyright 2011 Software Freedom Conservancy +Portions copyright 2011-2015 Software Freedom Conservancy Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -29,7 +29,6 @@ import static org.openqa.selenium.WaitingConditions.windowToBeSwitchedToWithName; import static org.openqa.selenium.support.ui.ExpectedConditions.titleIs; import static org.openqa.selenium.testing.Ignore.Driver.MARIONETTE; -import static org.openqa.selenium.testing.Ignore.Driver.OPERA; import static org.openqa.selenium.testing.Ignore.Driver.SAFARI; import org.hamcrest.Matchers; @@ -249,7 +248,7 @@ public void testShouldBeAbleToGetTheLocationOfAnElement() { * running: "ImplicitWaitTest", "TemporaryFilesystemTest", "JavascriptEnabledDriverTest". * SimonStewart 2010-10-04 */ - @Ignore(value = {OPERA, SAFARI, MARIONETTE}, reason = "Safari: issue 3693") + @Ignore(value = {SAFARI, MARIONETTE}, reason = "Safari: issue 3693") @JavascriptEnabled @NeedsFreshDriver @Test diff --git a/java/client/test/org/openqa/selenium/MiscTest.java b/java/client/test/org/openqa/selenium/MiscTest.java index 01861ef382138..795858da42eba 100644 --- a/java/client/test/org/openqa/selenium/MiscTest.java +++ b/java/client/test/org/openqa/selenium/MiscTest.java @@ -1,5 +1,5 @@ /* -Copyright 2012 Software Freedom Conservancy +Copyright 2012-2015 Software Freedom Conservancy Copyright 2007-2012 Selenium committers Licensed under the Apache License, Version 2.0 (the "License"); @@ -30,8 +30,6 @@ import static org.openqa.selenium.testing.Ignore.Driver.CHROME; 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.OPERA; -import static org.openqa.selenium.testing.Ignore.Driver.OPERA_MOBILE; import static org.openqa.selenium.testing.Ignore.Driver.SAFARI; public class MiscTest extends JUnit4TestBase { @@ -77,10 +75,9 @@ public void testShouldReturnTheSourceOfAPage() { } @JavascriptEnabled - @Ignore(value = {CHROME, IE, SAFARI, OPERA, OPERA_MOBILE}, - reason = "Chrome, Safari: returns XML content formatted for display as HTML document" - + "Opera: includes XML doctype" - + "Others: untested") + @Ignore(value = {CHROME, IE, SAFARI}, + reason = "Chrome, Safari: returns XML content formatted for display as HTML document" + + "Others: untested") @Test public void testShouldBeAbleToGetTheSourceOfAnXmlDocument() { driver.get(pages.simpleXmlDocument); diff --git a/java/client/test/org/openqa/selenium/PageLoadingTest.java b/java/client/test/org/openqa/selenium/PageLoadingTest.java index 4ce3a42d0415d..7bdd0b2bd07f0 100644 --- a/java/client/test/org/openqa/selenium/PageLoadingTest.java +++ b/java/client/test/org/openqa/selenium/PageLoadingTest.java @@ -1,6 +1,6 @@ /* Copyright 2007-2012 Selenium committers -Copyright 2012 Software Freedom Conservancy +Copyright 2012-2015 Software Freedom Conservancy Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -43,8 +43,6 @@ 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.OPERA; -import static org.openqa.selenium.testing.Ignore.Driver.OPERA_MOBILE; import static org.openqa.selenium.testing.Ignore.Driver.PHANTOMJS; import static org.openqa.selenium.testing.Ignore.Driver.SAFARI; import static org.openqa.selenium.testing.TestUtilities.isChrome; @@ -80,7 +78,7 @@ private void initLocalDriver(String strategy) { localDriver = new WebDriverBuilder().setDesiredCapabilities(caps).get(); } - @Ignore(value = {CHROME, IE, OPERA, SAFARI, MARIONETTE, PHANTOMJS, HTMLUNIT}) + @Ignore(value = {CHROME, IE, SAFARI, MARIONETTE, PHANTOMJS, HTMLUNIT}) @NeedsLocalEnvironment @Test public void testNoneStrategyShouldNotWaitForPageToLoad() { @@ -98,7 +96,7 @@ public void testNoneStrategyShouldNotWaitForPageToLoad() { assertTrue("Took too long to load page: " + duration, duration < 1000); } - @Ignore(value = {CHROME, IE, OPERA, SAFARI, MARIONETTE, PHANTOMJS, HTMLUNIT}) + @Ignore(value = {CHROME, IE, SAFARI, MARIONETTE, PHANTOMJS, HTMLUNIT}) @NeedsLocalEnvironment @Test public void testNoneStrategyShouldNotWaitForPageToRefresh() { @@ -120,7 +118,7 @@ public void testNoneStrategyShouldNotWaitForPageToRefresh() { assertTrue("Took too long to load page: " + duration, duration < 1000); } - @Ignore(value = {FIREFOX, CHROME, IE, OPERA, SAFARI, MARIONETTE, PHANTOMJS, HTMLUNIT}) + @Ignore(value = {FIREFOX, CHROME, IE, SAFARI, MARIONETTE, PHANTOMJS, HTMLUNIT}) @NeedsLocalEnvironment @Test public void testEagerStrategyShouldNotWaitForResources() { @@ -141,7 +139,7 @@ public void testEagerStrategyShouldNotWaitForResources() { assertTrue("Took too long to load page: " + duration, duration < 5 * 1000); } - @Ignore(value = {FIREFOX, CHROME, IE, OPERA, SAFARI, MARIONETTE, PHANTOMJS, HTMLUNIT}) + @Ignore(value = {FIREFOX, CHROME, IE, SAFARI, MARIONETTE, PHANTOMJS, HTMLUNIT}) @NeedsLocalEnvironment @Test public void testEagerStrategyShouldNotWaitForResourcesOnRefresh() { @@ -216,7 +214,7 @@ public void testShouldReturnWhenGettingAUrlThatDoesNotResolve() { } } - @Ignore(value = {IE, OPERA, SAFARI, MARIONETTE, PHANTOMJS}) + @Ignore(value = {IE, SAFARI, MARIONETTE, PHANTOMJS}) @Test(expected = WebDriverException.class) @NeedsFreshDriver public void testShouldThrowIfUrlIsMalformed() { @@ -317,7 +315,7 @@ public void testShouldBeAbleToNavigateForwardsInTheBrowserHistory() { wait.until(titleIs("We Arrive Here")); } - @Ignore(value = {IE, OPERA, SAFARI, OPERA_MOBILE, PHANTOMJS}, + @Ignore(value = {IE, SAFARI, PHANTOMJS}, reason = "Safari: does not support insecure SSL") @Test public void testShouldBeAbleToAccessPagesWithAnInsecureSslCertificate() { @@ -327,7 +325,7 @@ public void testShouldBeAbleToAccessPagesWithAnInsecureSslCertificate() { assertThat(driver.getTitle(), equalTo("Hello WebDriver")); } - @Ignore({CHROME, HTMLUNIT, IE, OPERA, OPERA_MOBILE, PHANTOMJS, SAFARI, MARIONETTE}) + @Ignore({CHROME, HTMLUNIT, IE, PHANTOMJS, SAFARI, MARIONETTE}) @Test public void shouldBeAbleToDisableAcceptOfInsecureSslCertsWithRequiredCapability() { // TODO: Resolve why this test doesn't work on the remote server @@ -361,7 +359,7 @@ public void testShouldBeAbleToRefreshAPage() { * driver after it. * @see Issue 2282 */ - @Ignore(value = {IE, OPERA, SAFARI, OPERA_MOBILE, MARIONETTE}, + @Ignore(value = {IE, SAFARI, MARIONETTE}, reason = "Safari: issue 4062; Others: Untested user-agents", issues = {4062}) @NoDriverAfterTest @@ -376,7 +374,7 @@ public void testShouldNotHangIfDocumentOpenCallIsNeverFollowedByDocumentCloseCal wait.until(elementTextToContain(body, "world")); } - @Ignore(value = {OPERA, SAFARI, OPERA_MOBILE, MARIONETTE}, + @Ignore(value = {SAFARI, MARIONETTE}, reason = "Not implemented; Safari: see issue 687, comment 41", issues = {687}) @NeedsLocalEnvironment @@ -414,7 +412,7 @@ public void testShouldTimeoutIfAPageTakesTooLongToLoad() { } } - @Ignore(value = {HTMLUNIT, OPERA, SAFARI, OPERA_MOBILE, MARIONETTE}, + @Ignore(value = {HTMLUNIT, SAFARI, MARIONETTE}, reason = "Not implemented; Safari: see issue 687, comment 41", issues = {687}) @NeedsLocalEnvironment @@ -454,7 +452,7 @@ public void testShouldTimeoutIfAPageTakesTooLongToLoadAfterClick() { } } - @Ignore(value = {OPERA, SAFARI, OPERA_MOBILE, MARIONETTE}, + @Ignore(value = {SAFARI, MARIONETTE}, reason = "Not implemented; Safari: see issue 687, comment 41", issues = {687}) @NeedsLocalEnvironment @@ -494,7 +492,7 @@ public void testShouldTimeoutIfAPageTakesTooLongToRefresh() { } } - @Ignore(value = {CHROME, HTMLUNIT, OPERA, SAFARI, OPERA_MOBILE, MARIONETTE}, + @Ignore(value = {CHROME, HTMLUNIT, SAFARI, MARIONETTE}, reason = "Not implemented; Safari: see issue 687, comment 41", issues = {687}) @NeedsLocalEnvironment diff --git a/java/client/test/org/openqa/selenium/PositionAndSizeTest.java b/java/client/test/org/openqa/selenium/PositionAndSizeTest.java index 43118b32a583e..38413ca2ae28b 100644 --- a/java/client/test/org/openqa/selenium/PositionAndSizeTest.java +++ b/java/client/test/org/openqa/selenium/PositionAndSizeTest.java @@ -1,5 +1,5 @@ /* -Copyright 2012 Software Freedom Conservancy +Copyright 2012-2015 Software Freedom Conservancy Copyright 2012 Selenium committers Licensed under the Apache License, Version 2.0 (the "License"); @@ -32,8 +32,6 @@ import static org.openqa.selenium.testing.Ignore.Driver.FIREFOX; 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.OPERA; -import static org.openqa.selenium.testing.Ignore.Driver.OPERA_MOBILE; import static org.openqa.selenium.testing.Ignore.Driver.PHANTOMJS; import static org.openqa.selenium.testing.Ignore.Driver.SAFARI; @@ -44,7 +42,7 @@ import org.openqa.selenium.testing.JavascriptEnabled; import org.openqa.selenium.testing.TestUtilities; -@Ignore(value = {HTMLUNIT, OPERA_MOBILE, MARIONETTE}, +@Ignore(value = {HTMLUNIT, MARIONETTE}, reason = "HtmlUnit: Getting coordinates requires rendering, others: not tested") public class PositionAndSizeTest extends JUnit4TestBase { @@ -84,7 +82,7 @@ public void testShouldGetCoordinatesOfAnInvisibleElement() { assertThat(getLocationOnPage(By.id("box")), is(new Point(0, 0))); } - @Ignore(value = {OPERA, SAFARI}, reason = "Opera: window().getSize() is not implemented") + @Ignore(value = {SAFARI}) @Test public void testShouldScrollPageAndGetCoordinatesOfAnElementThatIsOutOfViewPort() { assumeFalse( @@ -109,7 +107,7 @@ public void testShouldGetCoordinatesOfAnElementInAFrame() { assertThat(getLocationOnPage(By.id("box")), is(new Point(10, 10))); } - @Ignore({OPERA, SAFARI}) + @Ignore({SAFARI}) @Test public void testShouldGetCoordinatesInViewPortOfAnElementInAFrame() { driver.get(appServer.whereIs("coordinates_tests/element_in_frame.html")); @@ -118,7 +116,7 @@ public void testShouldGetCoordinatesInViewPortOfAnElementInAFrame() { assertThat(getLocationOnPage(By.id("box")), is(new Point(10, 10))); } - @Ignore({OPERA, SAFARI}) + @Ignore({SAFARI}) @Test public void testShouldGetCoordinatesInViewPortOfAnElementInANestedFrame() { driver.get(appServer.whereIs("coordinates_tests/element_in_nested_frame.html")); @@ -156,7 +154,7 @@ public void testShouldCorrectlyIdentifyThatAnElementHasWidthAndHeight() { // should handle sub-pixel rendering, and every browser seems to be different anyhow: // http://ejohn.org/blog/sub-pixel-problems-in-css/ @JavascriptEnabled - @Ignore({IE, CHROME, OPERA, SAFARI, OPERA_MOBILE, PHANTOMJS, MARIONETTE}) + @Ignore({IE, CHROME, SAFARI, PHANTOMJS, MARIONETTE}) // Reason for Chrome: WebKit bug 28804 @Test public void testShouldHandleNonIntegerPositionAndSize() { diff --git a/java/client/test/org/openqa/selenium/ProxySettingTest.java b/java/client/test/org/openqa/selenium/ProxySettingTest.java index 856ebe2cbd349..42deece3413ed 100644 --- a/java/client/test/org/openqa/selenium/ProxySettingTest.java +++ b/java/client/test/org/openqa/selenium/ProxySettingTest.java @@ -1,6 +1,6 @@ /* Copyright 2012 Selenium committers -Copyright 2012 Software Freedom Conservancy +Copyright 2012-2015 Software Freedom Conservancy Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -26,8 +26,6 @@ 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.OPERA; -import static org.openqa.selenium.testing.Ignore.Driver.OPERA_MOBILE; 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; @@ -86,8 +84,8 @@ public void tearDown() { } } - @Ignore(value = {OPERA_MOBILE, PHANTOMJS, SAFARI}, - reason = "PhantomJS - not tested, Opera mobile/Safari - not implemented") + @Ignore(value = {PHANTOMJS, SAFARI}, + reason = "PhantomJS - not tested, Safari - not implemented") @NeedsLocalEnvironment @Test public void canConfigureManualHttpProxy() { @@ -102,8 +100,8 @@ public void canConfigureManualHttpProxy() { assertTrue("Proxy should have been called", proxyServer.hasBeenCalled("simpleTest.html")); } - @Ignore(value = {OPERA_MOBILE, PHANTOMJS, SAFARI, HTMLUNIT}, - reason = "PhantomJS - not tested, Opera mobile/Safari - not implemented") + @Ignore(value = {PHANTOMJS, SAFARI, HTMLUNIT}, + reason = "PhantomJS - not tested, Safari - not implemented") @NeedsLocalEnvironment @Test public void canConfigureProxyThroughPACFile() { @@ -128,8 +126,8 @@ public void canConfigureProxyThroughPACFile() { "Hello, world!", driver.findElement(By.tagName("h3")).getText()); } - @Ignore(value = {OPERA_MOBILE, PHANTOMJS, SAFARI, HTMLUNIT}, - reason = "PhantomJS - not tested, Opera mobile/Safari - not implemented") + @Ignore(value = {PHANTOMJS, SAFARI, HTMLUNIT}, + reason = "PhantomJS - not tested, Safari - not implemented") @NeedsLocalEnvironment @Test public void canUsePACThatOnlyProxiesCertainHosts() throws Exception { @@ -163,7 +161,7 @@ public void canUsePACThatOnlyProxiesCertainHosts() throws Exception { "Heading", driver.findElement(By.tagName("h1")).getText()); } - @Ignore({CHROME, HTMLUNIT, IE, OPERA, OPERA_MOBILE, PHANTOMJS, REMOTE, SAFARI}) + @Ignore({CHROME, HTMLUNIT, IE, PHANTOMJS, REMOTE, SAFARI}) @NeedsLocalEnvironment @Test public void canConfigureProxyWithRequiredCapability() { @@ -178,7 +176,7 @@ public void canConfigureProxyWithRequiredCapability() { assertTrue("Proxy should have been called", proxyServer.hasBeenCalled("simpleTest.html")); } - @Ignore({CHROME, HTMLUNIT, IE, OPERA, OPERA_MOBILE, PHANTOMJS, REMOTE, SAFARI}) + @Ignore({CHROME, HTMLUNIT, IE, PHANTOMJS, REMOTE, SAFARI}) @NeedsLocalEnvironment @Test public void requiredProxyCapabilityShouldHavePriority() { diff --git a/java/client/test/org/openqa/selenium/ReferrerTest.java b/java/client/test/org/openqa/selenium/ReferrerTest.java index b64db67dcb4d0..701c4feec6e6e 100644 --- a/java/client/test/org/openqa/selenium/ReferrerTest.java +++ b/java/client/test/org/openqa/selenium/ReferrerTest.java @@ -25,8 +25,6 @@ import static org.openqa.selenium.support.ui.ExpectedConditions.titleIs; 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.OPERA; -import static org.openqa.selenium.testing.Ignore.Driver.OPERA_MOBILE; import static org.openqa.selenium.testing.Ignore.Driver.PHANTOMJS; import static org.openqa.selenium.testing.Ignore.Driver.SAFARI; import static org.openqa.selenium.testing.InProject.locate; @@ -93,9 +91,9 @@ * not be served by the same server. */ @Ignore( - value = {HTMLUNIT, OPERA, OPERA_MOBILE, PHANTOMJS, SAFARI}, + value = {HTMLUNIT, PHANTOMJS, SAFARI}, reason = "HtmlUnit/Opera/PhantomJS - not tested, " + - "Opera mobile/Safari - not implemented") + "Safari - not implemented") public class ReferrerTest extends JUnit4TestBase { private static String page1; diff --git a/java/client/test/org/openqa/selenium/SelectElementHandlingTest.java b/java/client/test/org/openqa/selenium/SelectElementHandlingTest.java index 86651e617da48..70e371efeffa3 100644 --- a/java/client/test/org/openqa/selenium/SelectElementHandlingTest.java +++ b/java/client/test/org/openqa/selenium/SelectElementHandlingTest.java @@ -1,4 +1,5 @@ /* +Copyright 2015 Software Freedom Conservancy Copyright 2007-2009 Selenium committers Licensed under the Apache License, Version 2.0 (the "License"); @@ -23,7 +24,6 @@ import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import static org.openqa.selenium.testing.Ignore.Driver.MARIONETTE; -import static org.openqa.selenium.testing.Ignore.Driver.OPERA; import static org.hamcrest.Matchers.is; @@ -31,7 +31,7 @@ public class SelectElementHandlingTest extends JUnit4TestBase { - @Ignore({OPERA, MARIONETTE}) + @Ignore({MARIONETTE}) @Test public void testShouldBePossibleToDeselectASingleOptionFromASelectWhichAllowsMultipleChoices() { driver.get(pages.formPage); @@ -50,7 +50,7 @@ public void testShouldBePossibleToDeselectASingleOptionFromASelectWhichAllowsMul assertThat(option.isSelected(), is(true)); } - @Ignore({OPERA, MARIONETTE}) + @Ignore({MARIONETTE}) @Test public void testShouldBeAbleToChangeTheSelectedOptionInASelect() { driver.get(pages.formPage); diff --git a/java/client/test/org/openqa/selenium/SessionHandlingTest.java b/java/client/test/org/openqa/selenium/SessionHandlingTest.java index 86c06413057fb..5685f76574243 100644 --- a/java/client/test/org/openqa/selenium/SessionHandlingTest.java +++ b/java/client/test/org/openqa/selenium/SessionHandlingTest.java @@ -1,6 +1,6 @@ /* Copyright 2012 Selenium committers -Copyright 2012 Software Freedom Conservancy +Copyright 2012-2015 Software Freedom Conservancy Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -26,14 +26,12 @@ import static org.openqa.selenium.testing.Ignore.Driver.FIREFOX; import static org.openqa.selenium.testing.Ignore.Driver.MARIONETTE; -import static org.openqa.selenium.testing.Ignore.Driver.OPERA; -import static org.openqa.selenium.testing.Ignore.Driver.OPERA_MOBILE; 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; @RunWith(SeleniumTestRunner.class) -@Ignore(value = {OPERA_MOBILE, REMOTE}, reason = "Not tested") +@Ignore(value = {REMOTE}, reason = "Not tested") public class SessionHandlingTest { @Test @@ -66,9 +64,7 @@ public void callingQuitAfterClosingTheLastWindowIsANoOp() { } @Test(expected = SessionNotFoundException.class) - @Ignore(value = {OPERA, SAFARI}, reason = - "Opera: throws Opera-specific exception," - + "Safari: throws UnreachableBrowserException") + @Ignore(value = {SAFARI}, reason = "Safari: throws UnreachableBrowserException") public void callingAnyOperationAfterQuitShouldThrowAnException() { WebDriver driver = new WebDriverBuilder().get(); driver.quit(); @@ -76,9 +72,8 @@ public void callingAnyOperationAfterQuitShouldThrowAnException() { } @Test(expected = SessionNotFoundException.class) - @Ignore(value = {FIREFOX, OPERA, PHANTOMJS, SAFARI, MARIONETTE}, reason = + @Ignore(value = {FIREFOX, PHANTOMJS, SAFARI, MARIONETTE}, reason = "Firefox: can perform an operation after closing the last window," - + "Opera: throws Opera-specific exception," + "PhantomJS: throws NoSuchWindowException," + "Safari: throws NullPointerException") public void callingAnyOperationAfterClosingTheLastWindowShouldThrowAnException() { diff --git a/java/client/test/org/openqa/selenium/SlowLoadingPageTest.java b/java/client/test/org/openqa/selenium/SlowLoadingPageTest.java index af368f3c5e15d..3af17d2f6a7b8 100644 --- a/java/client/test/org/openqa/selenium/SlowLoadingPageTest.java +++ b/java/client/test/org/openqa/selenium/SlowLoadingPageTest.java @@ -1,6 +1,6 @@ /* Copyright 2012 Selenium committers -Copyright 2012 Software Freedom Conservancy +Copyright 2012-2015 Software Freedom Conservancy Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -22,16 +22,12 @@ import org.openqa.selenium.testing.JUnit4TestBase; import static org.junit.Assert.assertTrue; -import static org.openqa.selenium.testing.Ignore.Driver.OPERA; -import static org.openqa.selenium.testing.Ignore.Driver.OPERA_MOBILE; -@Ignore(OPERA_MOBILE) public class SlowLoadingPageTest extends JUnit4TestBase { - private static final long LOAD_TIME_IN_SECONDS = 3; @Test - public void testShouldBlockUntilPageLoads() throws Exception { + public void testShouldBlockUntilPageLoads() { long start = System.currentTimeMillis(); driver.get(pages.sleepingPage + "?time=" + LOAD_TIME_IN_SECONDS); long now = System.currentTimeMillis(); @@ -46,7 +42,6 @@ public void testShouldBlockUntilIFramesAreLoaded() throws Exception { assertElapsed(3000, now - start); } - @Ignore(value = {OPERA}, reason = "untested") @Test public void testRefreshShouldBlockUntilPageLoads() { long start = System.currentTimeMillis(); diff --git a/java/client/test/org/openqa/selenium/SvgDocumentTest.java b/java/client/test/org/openqa/selenium/SvgDocumentTest.java index db1491511d065..0f16559d79ce9 100644 --- a/java/client/test/org/openqa/selenium/SvgDocumentTest.java +++ b/java/client/test/org/openqa/selenium/SvgDocumentTest.java @@ -25,14 +25,12 @@ import static org.junit.Assume.assumeFalse; 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.OPERA; -import static org.openqa.selenium.testing.Ignore.Driver.OPERA_MOBILE; import static org.openqa.selenium.testing.Ignore.Driver.SAFARI; import static org.openqa.selenium.testing.TestUtilities.getFirefoxVersion; import static org.openqa.selenium.testing.TestUtilities.isFirefox; import static org.openqa.selenium.testing.TestUtilities.isOldIe; -@Ignore(value = {HTMLUNIT, OPERA, OPERA_MOBILE, SAFARI}, +@Ignore(value = {HTMLUNIT, SAFARI}, reason = "HtmlUnit: SVG interaction is only implemented in rendered browsers;" + "Safari: SafariDriver cannot manipulate SVG documents") public class SvgDocumentTest extends JUnit4TestBase { diff --git a/java/client/test/org/openqa/selenium/SvgElementTest.java b/java/client/test/org/openqa/selenium/SvgElementTest.java index f1ed0b9885fea..d68ba2711ec20 100644 --- a/java/client/test/org/openqa/selenium/SvgElementTest.java +++ b/java/client/test/org/openqa/selenium/SvgElementTest.java @@ -1,6 +1,6 @@ /* Copyright 2007-2012 Selenium committers -Portions copyright 2011-2012 Software Freedom Conservancy +Portions copyright 2011-2015 Software Freedom Conservancy Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -28,14 +28,12 @@ import static org.junit.Assume.assumeFalse; import static org.openqa.selenium.WaitingConditions.elementTextToEqual; import static org.openqa.selenium.testing.Ignore.Driver.HTMLUNIT; -import static org.openqa.selenium.testing.Ignore.Driver.OPERA; -import static org.openqa.selenium.testing.Ignore.Driver.OPERA_MOBILE; import static org.openqa.selenium.testing.TestUtilities.isFirefox30; import static org.openqa.selenium.testing.TestUtilities.isNativeEventsEnabled; import static org.openqa.selenium.testing.TestUtilities.isOldIe; -@Ignore(value = {HTMLUNIT, OPERA, OPERA_MOBILE}, - reason = "HtmlUnit: SVG interaction is only implemented in rendered browsers") +@Ignore(value = {HTMLUNIT}, + reason = "HtmlUnit: SVG interaction is only implemented in rendered browsers") public class SvgElementTest extends JUnit4TestBase { @Test diff --git a/java/client/test/org/openqa/selenium/TakesScreenshotTest.java b/java/client/test/org/openqa/selenium/TakesScreenshotTest.java index 1918305686278..2dd7600e5bfa4 100644 --- a/java/client/test/org/openqa/selenium/TakesScreenshotTest.java +++ b/java/client/test/org/openqa/selenium/TakesScreenshotTest.java @@ -1,5 +1,6 @@ /* -Copyright 2009 Selenium committers +Copyright 2015 Software Freedom Conservancy +Copyright 2009-2015 Selenium committers Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -30,8 +31,6 @@ import static org.openqa.selenium.testing.Ignore.Driver.FIREFOX; 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.OPERA; -import static org.openqa.selenium.testing.Ignore.Driver.OPERA_MOBILE; import static org.openqa.selenium.testing.Ignore.Driver.PHANTOMJS; import static org.openqa.selenium.testing.Ignore.Driver.SAFARI; @@ -70,8 +69,7 @@ // TODO(user): test screenshots at guaranteed minimized browsers // TODO(user): test screenshots at guaranteed fullscreened/kiosked browsers (WINDOWS platform specific) -@Ignore(value = {OPERA_MOBILE, IE}, reason = "untested properly" - + " IE: strange colors appeared") +@Ignore(value = {IE}, reason = "IE: strange colors appeared") public class TakesScreenshotTest extends JUnit4TestBase { private TakesScreenshot screenshoter; @@ -133,11 +131,9 @@ public void testShouldCaptureScreenshotOfCurrentViewport() throws Exception { } @Test - @Ignore(value = {OPERA, SAFARI, CHROME, MARIONETTE}, + @Ignore(value = {SAFARI, CHROME, MARIONETTE}, reason = " SAFARI: takes only visible viewport." + - " CHROME: takes only visible viewport." + - " OPERA: takes only visible viewport." - ) + " CHROME: takes only visible viewport.") public void testShouldCaptureScreenshotOfPageWithLongX() throws Exception { driver.get(appServer.whereIs("screen/screen_x_long.html")); @@ -156,11 +152,9 @@ public void testShouldCaptureScreenshotOfPageWithLongX() throws Exception { } @Test - @Ignore(value = {OPERA, SAFARI, CHROME, MARIONETTE}, + @Ignore(value = {SAFARI, CHROME, MARIONETTE}, reason = " SAFARI: takes only visible viewport." + - " CHROME: takes only visible viewport." + - " OPERA: takes only visible viewport." - ) + " CHROME: takes only visible viewport.") public void testShouldCaptureScreenshotOfPageWithLongY() throws Exception { driver.get(appServer.whereIs("screen/screen_y_long.html")); @@ -179,14 +173,12 @@ public void testShouldCaptureScreenshotOfPageWithLongY() throws Exception { } @Test - @Ignore(value = {PHANTOMJS, OPERA, SAFARI, CHROME, IE, FIREFOX, MARIONETTE}, + @Ignore(value = {PHANTOMJS, SAFARI, CHROME, IE, FIREFOX, MARIONETTE}, reason = " IE: cuts captured image at driver level." + " FF: captured image is cat at driver level." + " SAFARI: takes only visible viewport." + " CHROME: takes only visible viewport." + - " PHANTOMJS: diffs at colors - small dimensions or coloring problem." + - " OPERA: takes only visible viewport." - ) + " PHANTOMJS: diffs at colors - small dimensions or coloring problem.") public void testShouldCaptureScreenshotOfPageWithTooLongX() throws Exception { driver.get(appServer.whereIs("screen/screen_x_too_long.html")); @@ -205,14 +197,12 @@ public void testShouldCaptureScreenshotOfPageWithTooLongX() throws Exception { } @Test - @Ignore(value = {PHANTOMJS, OPERA, SAFARI, CHROME, IE, FIREFOX, MARIONETTE}, + @Ignore(value = {PHANTOMJS, SAFARI, CHROME, IE, FIREFOX, MARIONETTE}, reason = " IE: cuts captured image at driver level." + " FF: captured image is cat at driver level." + " SAFARI: takes only visible viewport." + " CHROME: takes only visible viewport." + - " PHANTOMJS: diffs at colors - small dimensions or coloring problem." + - " OPERA: takes only visible viewport." - ) + " PHANTOMJS: diffs at colors - small dimensions or coloring problem.") public void testShouldCaptureScreenshotOfPageWithTooLongY() throws Exception { driver.get(appServer.whereIs("screen/screen_y_too_long.html")); @@ -231,13 +221,12 @@ public void testShouldCaptureScreenshotOfPageWithTooLongY() throws Exception { } @Test - @Ignore(value = {PHANTOMJS, OPERA, SAFARI, CHROME, IE, FIREFOX, MARIONETTE}, + @Ignore(value = {PHANTOMJS, SAFARI, CHROME, IE, FIREFOX, MARIONETTE}, reason = " IE: returns null." + " FF: failed due NS_ERROR_FAILURE at context.drawWindow." + " SAFARI: takes only visible viewport." + " CHROME: takes only visible viewport." + - " PHANTOMJS: takes empty data of byte[], no errors. " + - " OPERA: takes only visible viewport." + " PHANTOMJS: takes empty data of byte[], no errors. ") ) public void testShouldCaptureScreenshotOfPageWithTooLongXandY() throws Exception { driver.get(appServer.whereIs("screen/screen_too_long.html")); @@ -258,9 +247,8 @@ public void testShouldCaptureScreenshotOfPageWithTooLongXandY() throws Exception @Test @Ignore( - value = {OPERA, IE, MARIONETTE}, - reason = " OPERA: takes empty 1x1 screenshot." + - " IE: v9 shows strange border which broke color comparison" + value = {IE, MARIONETTE}, + reason = " IE: v9 shows strange border which broke color comparison" ) public void testShouldCaptureScreenshotAtFramePage() throws Exception { driver.get(appServer.whereIs("screen/screen_frames.html")); @@ -313,9 +301,8 @@ public void testShouldCaptureScreenshotAtIFramePage() throws Exception { @Test @Ignore( - value = {OPERA, IE, MARIONETTE}, - reason = " OPERA: takes screenshot only of switched-in frame." + - " IE: v9 shows strange border which broke color comparison" + value = {IE, MARIONETTE}, + reason = "IE: v9 shows strange border which broke color comparison" ) public void testShouldCaptureScreenshotAtFramePageAfterSwitching() throws Exception { driver.get(appServer.whereIs("screen/screen_frames.html")); @@ -345,9 +332,8 @@ public void testShouldCaptureScreenshotAtFramePageAfterSwitching() throws Except @Test @Ignore( - value = {OPERA, IE, CHROME, MARIONETTE}, - reason = " OPERA: takes screenshot only of switched-in frame." + - " IE: v9 takes screesnhot only of switched-in frame area " + + value = {IE, CHROME, MARIONETTE}, + reason = " IE: v9 takes screesnhot only of switched-in frame area " + " CHROME: Unknown actual colors are presented at screenshot" ) public void testShouldCaptureScreenshotAtIFramePageAfterSwitching() throws Exception { diff --git a/java/client/test/org/openqa/selenium/TextHandlingTest.java b/java/client/test/org/openqa/selenium/TextHandlingTest.java index 9a513da4dd4d7..9b4131494f2d4 100644 --- a/java/client/test/org/openqa/selenium/TextHandlingTest.java +++ b/java/client/test/org/openqa/selenium/TextHandlingTest.java @@ -1,4 +1,5 @@ /* +Copyright 2015 Software Freedom Conservancy Copyright 2007-2009 Selenium committers Licensed under the Apache License, Version 2.0 (the "License"); @@ -25,8 +26,6 @@ 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.OPERA; -import static org.openqa.selenium.testing.Ignore.Driver.OPERA_MOBILE; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.endsWith; @@ -167,7 +166,6 @@ public void testShouldReturnTheEntireTextOfInlineElements() { assertThat(text, equalTo("An inline element")); } - @Ignore({OPERA}) @Test public void testShouldRetainTheFormatingOfTextWithinAPreElement() { driver.get(pages.simpleTestPage); @@ -179,7 +177,6 @@ public void testShouldRetainTheFormatingOfTextWithinAPreElement() { " ")); } - @Ignore({OPERA}) @Test public void testShouldRetainTheFormatingOfTextWithinAPreElementThatIsWithinARegularBlock() { driver.get(pages.simpleTestPage); @@ -192,9 +189,7 @@ public void testShouldRetainTheFormatingOfTextWithinAPreElementThatIsWithinARegu "after pre")); } - @Ignore(value = {IE, OPERA, OPERA_MOBILE}, reason = - "iPhone: sendKeys is broken;" - + " Opera,IE: inserts \r\n instead of \n.") + @Ignore(value = {IE}, reason = "IE: inserts \r\n instead of \n") @Test public void testShouldBeAbleToSetMoreThanOneLineOfTextInATextArea() { driver.get(pages.formPage); @@ -211,7 +206,7 @@ public void testShouldBeAbleToSetMoreThanOneLineOfTextInATextArea() { assertThat(seenText, equalTo(expectedText)); } - @Ignore(value = {OPERA, MARIONETTE}) + @Ignore(value = {MARIONETTE}) @Test public void testShouldBeAbleToEnterDatesAfterFillingInOtherValuesFirst() { driver.get(pages.formPage); diff --git a/java/client/test/org/openqa/selenium/TextPagesTest.java b/java/client/test/org/openqa/selenium/TextPagesTest.java index dbfb227cce967..daa8cd8770f79 100644 --- a/java/client/test/org/openqa/selenium/TextPagesTest.java +++ b/java/client/test/org/openqa/selenium/TextPagesTest.java @@ -1,6 +1,6 @@ /* Copyright 2007-2012 Selenium committers -Copyright 2007-2012 Software Freedom Conservancy +Copyright 2007-2015 Software Freedom Conservancy Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -23,8 +23,6 @@ import static org.openqa.selenium.testing.Ignore.Driver.FIREFOX; 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.OPERA; -import static org.openqa.selenium.testing.Ignore.Driver.OPERA_MOBILE; import static org.openqa.selenium.testing.Ignore.Driver.PHANTOMJS; import static org.openqa.selenium.testing.Ignore.Driver.SAFARI; @@ -43,7 +41,7 @@ public void setUp() throws Exception { textPage = GlobalTestEnvironment.get().getAppServer().whereIs("plain.txt"); } - @Ignore(value = {IE, FIREFOX, CHROME, OPERA, SAFARI, OPERA_MOBILE, PHANTOMJS, MARIONETTE}, + @Ignore(value = {IE, FIREFOX, CHROME, SAFARI, PHANTOMJS, MARIONETTE}, reason = "IE, Firefox: adds HTML tags.") @Test public void testShouldBeAbleToLoadASimplePageOfText() { @@ -65,8 +63,8 @@ public void testFindingAnElementOnAPlainTextPageWillNeverWork() { } } - @Ignore(value = {CHROME, IE, OPERA, SAFARI, OPERA_MOBILE, PHANTOMJS}, reason = - "Opera, Safari, IE, Firefox: creates DOM for displaying text pages") + @Ignore(value = {CHROME, IE, SAFARI, PHANTOMJS}, + reason = "Safari, IE, Firefox: creates DOM for displaying text pages") @Test public void testShouldThrowExceptionWhenAddingCookieToAPageThatIsNotHtml() { driver.get(textPage); diff --git a/java/client/test/org/openqa/selenium/TypingTest.java b/java/client/test/org/openqa/selenium/TypingTest.java index 82d77542d938c..3c5b2fb95224f 100644 --- a/java/client/test/org/openqa/selenium/TypingTest.java +++ b/java/client/test/org/openqa/selenium/TypingTest.java @@ -1,6 +1,6 @@ /* Copyright 2007-2012 Selenium committers -Copyright 2012 Software Freedom Conservancy +Copyright 2012-2015 Software Freedom Conservancy Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -31,8 +31,6 @@ 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.OPERA; -import static org.openqa.selenium.testing.Ignore.Driver.OPERA_MOBILE; import static org.openqa.selenium.testing.Ignore.Driver.PHANTOMJS; import static org.openqa.selenium.testing.Ignore.Driver.SAFARI; import static org.openqa.selenium.testing.TestUtilities.getEffectivePlatform; @@ -164,7 +162,7 @@ public void testArrowKeysShouldNotBePrintable() { assertThat(keyReporter.getAttribute("value"), is("")); } - @Ignore(value = {HTMLUNIT, OPERA_MOBILE, MARIONETTE}) + @Ignore(value = {HTMLUNIT, MARIONETTE}) @Test public void testShouldBeAbleToUseArrowKeys() { driver.get(pages.javascriptPage); @@ -216,7 +214,6 @@ public void testWillSimulateAKeyPressWhenEnteringTextIntoInputElements() { } @JavascriptEnabled - @Ignore({OPERA_MOBILE}) @Test public void testWillSimulateAKeyUpWhenEnteringTextIntoTextAreas() { driver.get(pages.javascriptPage); @@ -229,7 +226,6 @@ public void testWillSimulateAKeyUpWhenEnteringTextIntoTextAreas() { } @JavascriptEnabled - @Ignore({OPERA_MOBILE}) @Test public void testWillSimulateAKeyDownWhenEnteringTextIntoTextAreas() { driver.get(pages.javascriptPage); @@ -244,7 +240,6 @@ public void testWillSimulateAKeyDownWhenEnteringTextIntoTextAreas() { } @JavascriptEnabled - @Ignore({OPERA_MOBILE}) @Test public void testWillSimulateAKeyPressWhenEnteringTextIntoTextAreas() { driver.get(pages.javascriptPage); @@ -355,8 +350,7 @@ public void testNumericNonShiftKeys() { } @JavascriptEnabled - @Ignore(value = {HTMLUNIT, OPERA, OPERA_MOBILE, MARIONETTE}, - reason = "untested user agent") + @Ignore(value = {HTMLUNIT, MARIONETTE}, reason = "untested user agent") @Test public void testNumericShiftKeys() { driver.get(pages.javascriptPage); @@ -386,8 +380,7 @@ public void testLowerCaseAlphaKeys() { } @JavascriptEnabled - @Ignore(value = {HTMLUNIT, OPERA, OPERA_MOBILE, MARIONETTE}, - reason = "untested user agents") + @Ignore(value = {HTMLUNIT, MARIONETTE}, reason = "untested user agents") @Test public void testUppercaseAlphaKeys() { driver.get(pages.javascriptPage); @@ -403,8 +396,7 @@ public void testUppercaseAlphaKeys() { } @JavascriptEnabled - @Ignore(value = {HTMLUNIT, OPERA, OPERA_MOBILE, MARIONETTE}, - reason = "untested user agents") + @Ignore(value = {HTMLUNIT, MARIONETTE}, reason = "untested user agents") @Test public void testAllPrintableKeys() { driver.get(pages.javascriptPage); @@ -421,8 +413,7 @@ public void testAllPrintableKeys() { assertThat(result.getText().trim(), containsString(" up: 16")); } - @Ignore(value = {HTMLUNIT, OPERA_MOBILE, MARIONETTE}, - reason = "untested user agents") + @Ignore(value = {HTMLUNIT, MARIONETTE}, reason = "untested user agents") @Test public void testArrowKeysAndPageUpAndDown() { driver.get(pages.javascriptPage); @@ -435,8 +426,7 @@ public void testArrowKeysAndPageUpAndDown() { } @JavascriptEnabled - @Ignore(value = {HTMLUNIT, OPERA_MOBILE, MARIONETTE}, - reason = "untested user agents") + @Ignore(value = {HTMLUNIT, MARIONETTE}, reason = "untested user agents") @Test public void testHomeAndEndAndPageUpAndPageDownKeys() { assumeFalse("FIXME: macs don't have HOME keys, would PGUP work?", @@ -453,8 +443,7 @@ public void testHomeAndEndAndPageUpAndPageDownKeys() { } @JavascriptEnabled - @Ignore(value = {OPERA, HTMLUNIT, OPERA_MOBILE, MARIONETTE}, - reason = "untested user agents") + @Ignore(value = {HTMLUNIT, MARIONETTE}, reason = "untested user agents") @Test public void testDeleteAndBackspaceKeys() { driver.get(pages.javascriptPage); @@ -500,9 +489,8 @@ public void testNumberpadKeys() { } @JavascriptEnabled - @Ignore(value = {OPERA, IE, MARIONETTE}, - reason = "untested user agents, Opera: F4 triggers sidebar," + - "IE: F4 triggers address bar") + @Ignore(value = {IE, MARIONETTE}, + reason = "untested user agents, "IE: F4 triggers address bar") @Test public void testFunctionKeys() { driver.get(pages.javascriptPage); @@ -515,9 +503,8 @@ public void testFunctionKeys() { } @JavascriptEnabled - @Ignore(value = {HTMLUNIT, OPERA, SAFARI, OPERA_MOBILE, MARIONETTE}, - reason = "untested user agents. Opera: F2 focuses location bar" + - "Safari: issue 4221", + @Ignore(value = {HTMLUNIT, SAFARI, MARIONETTE}, + reason = "untested user agents; Safari: issue 4221", issues = {4221}) @Test public void testShiftSelectionDeletes() { @@ -534,8 +521,7 @@ public void testShiftSelectionDeletes() { } @JavascriptEnabled - @Ignore(value = {HTMLUNIT, OPERA, OPERA_MOBILE, MARIONETTE}, - reason = "untested user agents") + @Ignore(value = {HTMLUNIT, MARIONETTE}, reason = "untested user agents") @Test public void testChordControlHomeShiftEndDelete() { assumeFalse("FIXME: macs don't have HOME keys, would PGUP work?", @@ -557,8 +543,7 @@ public void testChordControlHomeShiftEndDelete() { } @JavascriptEnabled - @Ignore(value = {HTMLUNIT, OPERA, OPERA_MOBILE, MARIONETTE}, - reason = "untested user agents") + @Ignore(value = {HTMLUNIT, MARIONETTE}, reason = "untested user agents") @Test public void testChordReveseShiftHomeSelectionDeletes() { assumeFalse("FIXME: macs don't have HOME keys, would PGUP work?", @@ -591,8 +576,7 @@ public void testChordReveseShiftHomeSelectionDeletes() { // and linux, but not on the MAC. @JavascriptEnabled - @Ignore(value = {HTMLUNIT, OPERA, OPERA_MOBILE, MARIONETTE}, - reason = "untested user agents") + @Ignore(value = {HTMLUNIT, MARIONETTE}, reason = "untested user agents") @Test public void testChordControlCutAndPaste() { assumeFalse("FIXME: macs don't have HOME keys, would PGUP work?", @@ -683,9 +667,8 @@ public void testGenerateKeyPressEventEvenWhenElementPreventsDefault() { } @JavascriptEnabled - @Ignore(value = {OPERA, SAFARI, OPERA_MOBILE, MARIONETTE}, - reason = "Opera Mobile: does not support contentEditable;" + - "Safari: cannot type on contentEditable with synthetic events") + @Ignore(value = {SAFARI, MARIONETTE}, + reason = "Safari: cannot type on contentEditable with synthetic events") @Test public void testTypingIntoAnIFrameWithContentEditableOrDesignModeSet() { driver.get(pages.richTextPage); @@ -707,7 +690,7 @@ public void testTypingIntoAnIFrameWithContentEditableOrDesignModeSet() { } @JavascriptEnabled - @Ignore(value = {HTMLUNIT, OPERA, OPERA_MOBILE, MARIONETTE}, issues = {6711}) + @Ignore(value = {HTMLUNIT, MARIONETTE}, issues = {6711}) @Test public void testNonPrintableCharactersShouldWorkWithContentEditableOrDesignModeSet() { assumeFalse("FIXME: Fails in Firefox on Linux with synthesized events", @@ -742,10 +725,9 @@ public void testShouldBeAbleToTypeOnANumberInputField() { assertThat(email.getAttribute("value"), equalTo("33")); } - @Ignore(value = {HTMLUNIT, OPERA, SAFARI, OPERA_MOBILE}, - reason = "Untested browsers;" + - " Safari: cannot type on contentEditable with synthetic events", - issues = {3127}) + @Ignore(value = {HTMLUNIT, SAFARI}, reason = "Untested browsers;" + + " Safari: cannot type on contentEditable with synthetic events", + issues = {3127}) @Test public void testShouldBeAbleToTypeIntoEmptyContentEditableElement() { driver.get(pages.readOnlyPage); @@ -769,7 +751,7 @@ public void testShouldBeAbleToTypeIntoContentEditableElementWithExistingValue() assertThat(editable.getText(), equalTo(initialText + ", edited")); } - @Ignore(value = {HTMLUNIT, IE, OPERA, SAFARI, OPERA_MOBILE}, + @Ignore(value = {HTMLUNIT, IE, SAFARI}, reason = "Untested browsers;" + " Safari: cannot type on contentEditable with synthetic events", issues = {3127}) @@ -787,7 +769,7 @@ public void testShouldBeAbleToTypeIntoTinyMCE() { } @JavascriptEnabled - @Ignore(value = {HTMLUNIT, SAFARI, OPERA}, reason = "Untested") + @Ignore(value = {HTMLUNIT, SAFARI}, reason = "Untested") @Test public void canSafelyTypeOnElementThatIsRemovedFromTheDomOnKeyPress() { driver.get(appServer.whereIs("key_tests/remove_on_keypress.html")); diff --git a/java/client/test/org/openqa/selenium/UnexpectedAlertBehaviorTest.java b/java/client/test/org/openqa/selenium/UnexpectedAlertBehaviorTest.java index 0290dd3bff6bd..a4c6750ded667 100644 --- a/java/client/test/org/openqa/selenium/UnexpectedAlertBehaviorTest.java +++ b/java/client/test/org/openqa/selenium/UnexpectedAlertBehaviorTest.java @@ -1,5 +1,5 @@ /* -Copyright 2012 Software Freedom Conservancy +Copyright 2015 Software Freedom Conservancy Copyright 2007-2012 Selenium committers Licensed under the Apache License, Version 2.0 (the "License"); @@ -25,8 +25,6 @@ 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.OPERA; -import static org.openqa.selenium.testing.Ignore.Driver.OPERA_MOBILE; import static org.openqa.selenium.testing.Ignore.Driver.PHANTOMJS; import static org.openqa.selenium.testing.Ignore.Driver.SAFARI; @@ -41,7 +39,7 @@ import org.openqa.selenium.testing.drivers.WebDriverBuilder; @NeedsLocalEnvironment(reason = "Requires local browser launching environment") -@Ignore(value = {CHROME, HTMLUNIT, OPERA, PHANTOMJS, SAFARI, OPERA_MOBILE, MARIONETTE}, +@Ignore(value = {CHROME, HTMLUNIT, PHANTOMJS, SAFARI, MARIONETTE}, issues = {3862}) public class UnexpectedAlertBehaviorTest extends JUnit4TestBase { diff --git a/java/client/test/org/openqa/selenium/UploadTest.java b/java/client/test/org/openqa/selenium/UploadTest.java index 042b2d01b08b8..26883c289dd79 100644 --- a/java/client/test/org/openqa/selenium/UploadTest.java +++ b/java/client/test/org/openqa/selenium/UploadTest.java @@ -1,6 +1,6 @@ /* -Copyright 2012 Selenium committers -Copyright 2012 Software Freedom Conservancy +Copyright 2012-2015 Selenium committers +Copyright 2012-2015 Software Freedom Conservancy Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -23,8 +23,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.MARIONETTE; -import static org.openqa.selenium.testing.Ignore.Driver.OPERA; -import static org.openqa.selenium.testing.Ignore.Driver.OPERA_MOBILE; import static org.openqa.selenium.testing.Ignore.Driver.SAFARI; import com.google.common.base.Charsets; @@ -57,8 +55,6 @@ public void setUp() throws Exception { } @JavascriptEnabled - @Ignore(value = {OPERA, OPERA_MOBILE}, - reason = "Opera/Opera Mobile: File input elements are not supported yet") @Test public void testFileUploading() throws Exception { assumeFalse( diff --git a/java/client/test/org/openqa/selenium/VisibilityTest.java b/java/client/test/org/openqa/selenium/VisibilityTest.java index d3d8321c34c7a..0aeac408144da 100644 --- a/java/client/test/org/openqa/selenium/VisibilityTest.java +++ b/java/client/test/org/openqa/selenium/VisibilityTest.java @@ -1,6 +1,6 @@ /* Copyright 2007-2012 Selenium committers -Portions copyright 2011-2012 Software Freedom Conservancy +Portions copyright 2011-2015 Software Freedom Conservancy Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -31,8 +31,6 @@ 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.OPERA; -import static org.openqa.selenium.testing.Ignore.Driver.OPERA_MOBILE; import static org.openqa.selenium.testing.Ignore.Driver.PHANTOMJS; import static org.openqa.selenium.testing.Ignore.Driver.SAFARI; @@ -160,7 +158,7 @@ public void parentNodeVisibleWhenAllChildrenAreAbsolutelyPositionedAndOverflowIs assertTrue(element.isDisplayed()); } - @Ignore({IE, HTMLUNIT, OPERA, OPERA_MOBILE, PHANTOMJS, SAFARI, MARIONETTE}) + @Ignore({IE, HTMLUNIT, PHANTOMJS, SAFARI, MARIONETTE}) @Test public void testElementHiddenByOverflowXIsNotVisible() { String[] pages = new String[]{ @@ -177,7 +175,7 @@ public void testElementHiddenByOverflowXIsNotVisible() { } } - @Ignore({HTMLUNIT, OPERA, OPERA_MOBILE, PHANTOMJS}) + @Ignore({HTMLUNIT, PHANTOMJS}) @Test public void testElementHiddenByOverflowYIsNotVisible() { String[] pages = new String[]{ @@ -246,7 +244,7 @@ public void testElementScrollableByOverflowXAndYIsVisible() { } @Test - @Ignore({OPERA, OPERA_MOBILE, MARIONETTE}) + @Ignore({MARIONETTE}) public void tooSmallAWindowWithOverflowHiddenIsNotAProblem() { // Browser window cannot be resized on ANDROID (and most mobile platforms // though others aren't defined in org.openqa.selenium.Platform). @@ -292,7 +290,7 @@ public void testShouldShowElementNotVisibleWhenParentElementHasHiddenAttribute() * http://code.google.com/p/selenium/issues/detail?id=1610 */ @JavascriptEnabled - @Ignore({IE, HTMLUNIT, OPERA, OPERA_MOBILE, MARIONETTE}) + @Ignore({IE, HTMLUNIT, MARIONETTE}) @Test public void testShouldBeAbleToClickOnElementsWithOpacityZero() { driver.get(pages.clickJacker); diff --git a/java/client/test/org/openqa/selenium/WindowSwitchingTest.java b/java/client/test/org/openqa/selenium/WindowSwitchingTest.java index a8d16889e7e00..89574330638e0 100644 --- a/java/client/test/org/openqa/selenium/WindowSwitchingTest.java +++ b/java/client/test/org/openqa/selenium/WindowSwitchingTest.java @@ -1,5 +1,5 @@ /* -Copyright 2012-2013 Software Freedom Conservancy +Copyright 2012-2015 Software Freedom Conservancy Copyright 2007-2013 Selenium committers Licensed under the Apache License, Version 2.0 (the "License"); @@ -30,8 +30,6 @@ import static org.openqa.selenium.support.ui.ExpectedConditions.alertIsPresent; 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.OPERA; -import static org.openqa.selenium.testing.Ignore.Driver.OPERA_MOBILE; import static org.openqa.selenium.testing.Ignore.Driver.REMOTE; import com.google.common.collect.Sets; @@ -47,8 +45,7 @@ import java.util.Set; public class WindowSwitchingTest extends JUnit4TestBase { - - @Ignore({OPERA_MOBILE, MARIONETTE}) + @Ignore({MARIONETTE}) @Test public void testShouldSwitchFocusToANewWindowWhenItIsOpenedAndNotStopFutureOperations() { assumeFalse(Browser.detect() == Browser.opera && @@ -92,7 +89,7 @@ public void testShouldThrowNoSuchWindowException() { driver.switchTo().window(current); } - @Ignore({OPERA, OPERA_MOBILE, MARIONETTE}) + @Ignore({MARIONETTE}) @Test public void testShouldThrowNoSuchWindowExceptionOnAnAttemptToGetItsHandle() { driver.get(pages.xhtmlTestPage); @@ -116,7 +113,7 @@ public void testShouldThrowNoSuchWindowExceptionOnAnAttemptToGetItsHandle() { } } - @Ignore({OPERA, OPERA_MOBILE, MARIONETTE}) + @Ignore({MARIONETTE}) @Test public void testShouldThrowNoSuchWindowExceptionOnAnyOperationIfAWindowIsClosed() { driver.get(pages.xhtmlTestPage); @@ -149,7 +146,7 @@ public void testShouldThrowNoSuchWindowExceptionOnAnyOperationIfAWindowIsClosed( } } - @Ignore({OPERA, OPERA_MOBILE, MARIONETTE}) + @Ignore({MARIONETTE}) @Test public void testShouldThrowNoSuchWindowExceptionOnAnyElementOperationIfAWindowIsClosed() { driver.get(pages.xhtmlTestPage); @@ -298,7 +295,6 @@ public void testFailingToSwitchToAWindowLeavesTheCurrentWindowAsIs() { @NeedsFreshDriver @NoDriverAfterTest - @Ignore(value = {OPERA_MOBILE}) @Test public void testCanCloseWindowWhenMultipleWindowsAreOpen() { driver.get(pages.xhtmlTestPage); @@ -321,7 +317,6 @@ public void testCanCloseWindowWhenMultipleWindowsAreOpen() { @NeedsFreshDriver @NoDriverAfterTest - @Ignore(value = {OPERA_MOBILE}) @Test public void testCanCloseWindowAndSwitchBackToMainWindow() { driver.get(pages.xhtmlTestPage); diff --git a/java/client/test/org/openqa/selenium/WindowTest.java b/java/client/test/org/openqa/selenium/WindowTest.java index 6876944667976..3f98c23802ab5 100644 --- a/java/client/test/org/openqa/selenium/WindowTest.java +++ b/java/client/test/org/openqa/selenium/WindowTest.java @@ -1,6 +1,6 @@ /* Copyright 2011-2012 Selenium committers -Copyright 2011-2012 Software Freedom Conservancy. +Copyright 2011-2015 Software Freedom Conservancy. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -24,8 +24,6 @@ import static org.junit.Assume.assumeFalse; import static org.openqa.selenium.Platform.ANDROID; import static org.openqa.selenium.testing.Ignore.Driver.MARIONETTE; -import static org.openqa.selenium.testing.Ignore.Driver.OPERA; -import static org.openqa.selenium.testing.Ignore.Driver.OPERA_MOBILE; import static org.openqa.selenium.testing.Ignore.Driver.PHANTOMJS; import static org.openqa.selenium.testing.Ignore.Driver.SAFARI; @@ -38,8 +36,7 @@ import java.util.logging.Logger; -@Ignore(value = {OPERA, OPERA_MOBILE, MARIONETTE}, - reason = "Not yet implemented.") +@Ignore(value = {MARIONETTE}, reason = "Not yet implemented.") public class WindowTest extends JUnit4TestBase { private static Logger log = Logger.getLogger(WindowTest.class.getName()); diff --git a/java/client/test/org/openqa/selenium/html5/Html5CapabilitiesTest.java b/java/client/test/org/openqa/selenium/html5/Html5CapabilitiesTest.java index 907fcaccd7fe5..e526cd60a55f9 100644 --- a/java/client/test/org/openqa/selenium/html5/Html5CapabilitiesTest.java +++ b/java/client/test/org/openqa/selenium/html5/Html5CapabilitiesTest.java @@ -1,5 +1,5 @@ /* -Copyright 2012-2014 Software Freedom Conservancy +Copyright 2012-2015 Software Freedom Conservancy Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -26,7 +26,6 @@ import static org.openqa.selenium.remote.CapabilityType.SUPPORTS_WEB_STORAGE; 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.OPERA; import static org.openqa.selenium.testing.Ignore.Driver.SAFARI; import org.junit.After; @@ -42,7 +41,7 @@ import org.openqa.selenium.testing.TestUtilities; import org.openqa.selenium.testing.drivers.WebDriverBuilder; -@Ignore({IE, OPERA, SAFARI, MARIONETTE}) +@Ignore({IE, SAFARI, MARIONETTE}) public class Html5CapabilitiesTest extends JUnit4TestBase { private WebDriver localDriver; diff --git a/java/client/test/org/openqa/selenium/interactions/BasicKeyboardInterfaceTest.java b/java/client/test/org/openqa/selenium/interactions/BasicKeyboardInterfaceTest.java index dd12d7b83f6a4..128df188804f1 100644 --- a/java/client/test/org/openqa/selenium/interactions/BasicKeyboardInterfaceTest.java +++ b/java/client/test/org/openqa/selenium/interactions/BasicKeyboardInterfaceTest.java @@ -1,4 +1,5 @@ /* +Copyright 2015 Software Freedom Conservancy Copyright 2007-2010 Selenium committers Licensed under the Apache License, Version 2.0 (the "License"); @@ -23,8 +24,6 @@ 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.OPERA; -import static org.openqa.selenium.testing.Ignore.Driver.OPERA_MOBILE; import static org.openqa.selenium.testing.Ignore.Driver.SAFARI; import static org.hamcrest.Matchers.is; @@ -69,7 +68,7 @@ public void testBasicKeyboardInput() { } @JavascriptEnabled - @Ignore({IE, OPERA, OPERA_MOBILE}) + @Ignore({IE}) @Test public void testSendingKeyDownOnly() { driver.get(pages.javascriptPage); @@ -91,7 +90,7 @@ public void testSendingKeyDownOnly() { } @JavascriptEnabled - @Ignore({IE, OPERA, OPERA_MOBILE}) + @Ignore({IE}) @Test public void testSendingKeyUp() { driver.get(pages.javascriptPage); @@ -116,7 +115,7 @@ public void testSendingKeyUp() { } @JavascriptEnabled - @Ignore({HTMLUNIT, IE, OPERA, OPERA_MOBILE}) + @Ignore({HTMLUNIT, IE}) @Test public void testSendingKeysWithShiftPressed() { driver.get(pages.javascriptPage); @@ -174,7 +173,7 @@ public void testBasicKeyboardInputOnActiveElement() { assertThat(keyReporter.getAttribute("value"), is("abc def")); } - @Ignore(value = {IE, OPERA, SAFARI, HTMLUNIT}, reason = "untested") + @Ignore(value = {IE, SAFARI, HTMLUNIT}, reason = "untested") @JavascriptEnabled @Test public void canGenerateKeyboardShortcuts() { @@ -202,7 +201,7 @@ public void canGenerateKeyboardShortcuts() { } @Test - @Ignore({HTMLUNIT, OPERA, OPERA_MOBILE}) + @Ignore({HTMLUNIT}) public void testSelectionSelectBySymbol() { driver.get(pages.javascriptPage); @@ -223,7 +222,7 @@ public void testSelectionSelectBySymbol() { } @Test - @Ignore({HTMLUNIT, IE, OPERA, OPERA_MOBILE}) + @Ignore({HTMLUNIT, IE}) public void testSelectionSelectByWord() { assumeTrue( "Test fails with native events enabled, likely due to issue 4385", @@ -252,7 +251,7 @@ public void testSelectionSelectByWord() { } @Test - @Ignore({HTMLUNIT, IE, OPERA, OPERA_MOBILE}) + @Ignore({HTMLUNIT, IE}) public void testSelectionSelectAll() { assumeTrue( "Test fails with native events enabled, likely due to issue 4385", diff --git a/java/client/test/org/openqa/selenium/interactions/BasicMouseInterfaceTest.java b/java/client/test/org/openqa/selenium/interactions/BasicMouseInterfaceTest.java index 776ec7599f435..749436ffb739b 100644 --- a/java/client/test/org/openqa/selenium/interactions/BasicMouseInterfaceTest.java +++ b/java/client/test/org/openqa/selenium/interactions/BasicMouseInterfaceTest.java @@ -1,4 +1,5 @@ /* +Copyright 2015 Software Freedom Conservancy Copyright 2007-2010 Selenium committers Licensed under the Apache License, Version 2.0 (the "License"); @@ -32,8 +33,6 @@ 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.OPERA; -import static org.openqa.selenium.testing.Ignore.Driver.OPERA_MOBILE; 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; @@ -194,7 +193,6 @@ public void testDragAndDrop() throws InterruptedException { } @JavascriptEnabled - @Ignore({OPERA}) @Test public void testDoubleClick() { driver.get(pages.javascriptPage); @@ -258,7 +256,7 @@ public void testCannotMoveToANullLocator() { } @JavascriptEnabled - @Ignore({CHROME, IE, FIREFOX, OPERA, HTMLUNIT, OPERA_MOBILE}) + @Ignore({CHROME, IE, FIREFOX, HTMLUNIT}) @Test public void testMousePositionIsNotPreservedInActionsChain() { driver.get(pages.javascriptPage); @@ -276,7 +274,7 @@ public void testMousePositionIsNotPreservedInActionsChain() { } } - @Ignore(value = {IE, HTMLUNIT, REMOTE, OPERA}, + @Ignore(value = {IE, HTMLUNIT, REMOTE}, reason = "Behaviour not finalized yet regarding linked images.") @Test public void testMovingIntoAnImageEnclosedInALink() { @@ -355,8 +353,7 @@ public void testMovingMousePastViewPort() { wait.until(elementTextToContain(resultArea, "parent matches")); } - @Ignore(value = {IE, HTMLUNIT, CHROME, OPERA, OPERA_MOBILE}, - reason = "Not implemented yet.") + @Ignore(value = {IE, HTMLUNIT, CHROME}, reason = "Not implemented yet.") @Test public void testMovingMouseBackAndForthPastViewPort() { assumeTrue(!isFirefox(driver) || isNativeEventsEnabled(driver)); @@ -386,7 +383,6 @@ public void testMovingMouseBackAndForthPastViewPort() { wait.until(elementTextToEqual(resultArea, expectedEvents)); } - @Ignore({OPERA, OPERA_MOBILE}) @Test public void testShouldClickElementInIFrame() { driver.get(pages.clicksPage); @@ -404,7 +400,7 @@ public void testShouldClickElementInIFrame() { @JavascriptEnabled @Ignore( - value = {HTMLUNIT, OPERA, SAFARI, MARIONETTE}, + value = {HTMLUNIT, SAFARI, MARIONETTE}, reason = "HtmlUnit: Advanced mouse actions only implemented in rendered browsers.", issues = {4136}) @Test @@ -425,7 +421,7 @@ public void testShouldAllowUsersToHoverOverElements() { @JavascriptEnabled @Ignore( - value = {HTMLUNIT, OPERA, SAFARI, MARIONETTE}, + value = {HTMLUNIT, SAFARI, MARIONETTE}, reason = "HtmlUnit: Advanced mouse actions only implemented in rendered browsers", issues = {4136}) @Test @@ -460,7 +456,7 @@ public void testHoverPersists() throws Exception { @JavascriptEnabled @Ignore( - value = {HTMLUNIT, OPERA, FIREFOX, CHROME, SAFARI, PHANTOMJS, MARIONETTE}, + value = {HTMLUNIT, FIREFOX, CHROME, SAFARI, PHANTOMJS, MARIONETTE}, reason = "This is an IE only tests") @NoDriverAfterTest @NeedsLocalEnvironment @@ -507,7 +503,7 @@ public void testPersistentHoverCanBeTurnedOff() throws Exception { } @JavascriptEnabled - @Ignore(value = {HTMLUNIT, OPERA, SAFARI, MARIONETTE}, + @Ignore(value = {HTMLUNIT, SAFARI, MARIONETTE}, reason = "Advanced mouse actions only implemented in rendered browsers", issues = {4136}) @Test @@ -562,7 +558,7 @@ public void testMovingMouseToRelativeZeroElementOffset() { @JavascriptEnabled @NeedsFreshDriver - @Ignore(value = {HTMLUNIT, OPERA, SAFARI, MARIONETTE}, + @Ignore(value = {HTMLUNIT, SAFARI, MARIONETTE}, reason = "Advanced mouse actions only implemented in rendered browsers", issues = {4136}) @Test @@ -582,7 +578,7 @@ public void testMoveRelativeToBody() { @JavascriptEnabled @Test - @Ignore(value = {HTMLUNIT, OPERA, SAFARI, MARIONETTE}, + @Ignore(value = {HTMLUNIT, SAFARI, MARIONETTE}, reason = "Advanced mouse actions only implemented in rendered browsers", issues = {4136}) @NoDriverAfterTest diff --git a/java/client/test/org/openqa/selenium/interactions/CombinedInputActionsTest.java b/java/client/test/org/openqa/selenium/interactions/CombinedInputActionsTest.java index 048f11580e413..242dc8d17af9b 100644 --- a/java/client/test/org/openqa/selenium/interactions/CombinedInputActionsTest.java +++ b/java/client/test/org/openqa/selenium/interactions/CombinedInputActionsTest.java @@ -1,4 +1,5 @@ /* +Copyright 2015 Software Freedom Conservancy Copyright 2007-2010 Selenium committers Licensed under the Apache License, Version 2.0 (the "License"); @@ -28,8 +29,6 @@ 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.OPERA; -import static org.openqa.selenium.testing.Ignore.Driver.OPERA_MOBILE; 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; @@ -93,7 +92,7 @@ public void testPlainClickingOnMultiSelectionList() { // TODO: Check if this could work in any browser without native events. @JavascriptEnabled @Test - @Ignore({CHROME, IE, OPERA, OPERA_MOBILE}) + @Ignore({CHROME, IE}) public void testShiftClickingOnMultiSelectionList() { assumeTrue("Only works with native events on Linux", isNativeEventsEnabled(driver) && getEffectivePlatform().is(Platform.LINUX)); @@ -122,7 +121,7 @@ public void testShiftClickingOnMultiSelectionList() { // TODO: Check if this could work in any browser without native events. @JavascriptEnabled @Test - @Ignore({CHROME, HTMLUNIT, IE, OPERA, OPERA_MOBILE, PHANTOMJS}) + @Ignore({CHROME, HTMLUNIT, IE, PHANTOMJS}) public void testControlClickingOnMultiSelectionList() { assumeTrue("Only works with native events on Linux", isNativeEventsEnabled(driver) && getEffectivePlatform().is(Platform.LINUX)); @@ -149,7 +148,7 @@ public void testControlClickingOnMultiSelectionList() { } @JavascriptEnabled - @Ignore({IE, REMOTE, OPERA, PHANTOMJS}) + @Ignore({IE, REMOTE, PHANTOMJS}) @Test public void testControlClickingOnCustomMultiSelectionList() { assumeFalse("Does not works with native events on Windows", @@ -194,7 +193,7 @@ private void navigateToClicksPageAndClickLink() { wait.until(titleIs("XHTML Test Page")); } - @Ignore(value = {OPERA, PHANTOMJS, SAFARI}, reason = "Not tested") + @Ignore(value = {PHANTOMJS, SAFARI}, reason = "Not tested") @Test public void canMoveMouseToAnElementInAnIframeAndClick() { driver.get(appServer.whereIs("click_tests/click_in_iframe.html")); @@ -291,7 +290,7 @@ public void testMouseMovementWorksWhenNavigatingToAnotherPage() { wait.until(titleIs("We Arrive Here")); } - @Ignore({HTMLUNIT, OPERA, OPERA_MOBILE}) + @Ignore({HTMLUNIT}) @Test public void testChordControlCutAndPaste() { assumeFalse("FIXME: macs don't have CONRTROL key", getEffectivePlatform().is(Platform.MAC)); @@ -334,7 +333,7 @@ public void testChordControlCutAndPaste() { wait.until(elementValueToEqual(element, "abc defabc def")); } - @Ignore({HTMLUNIT, OPERA, IE}) + @Ignore({HTMLUNIT, IE}) @Test public void testCombiningShiftAndClickResultsInANewWindow() { assumeFalse("Does not works with native events on Windows", @@ -357,7 +356,7 @@ public void testCombiningShiftAndClickResultsInANewWindow() { assertEquals("Should not have navigated away.", originalTitle, driver.getTitle()); } - @Ignore({HTMLUNIT, OPERA, OPERA_MOBILE, IE}) + @Ignore({HTMLUNIT, IE}) @Test public void testHoldingDownShiftKeyWhileClicking() { assumeFalse("Does not works with native events on Windows", @@ -376,7 +375,7 @@ public void testHoldingDownShiftKeyWhileClicking() { @JavascriptEnabled @Test - @Ignore(value = {OPERA, OPERA_MOBILE, SAFARI, MARIONETTE}, issues = {4136}) + @Ignore(value = {SAFARI, MARIONETTE}, issues = {4136}) public void canClickOnASuckerFishStyleMenu() throws InterruptedException { driver.get(pages.javascriptPage); diff --git a/java/client/test/org/openqa/selenium/interactions/DragAndDropTest.java b/java/client/test/org/openqa/selenium/interactions/DragAndDropTest.java index 2f11b45e6bafa..e5e2987f388a0 100644 --- a/java/client/test/org/openqa/selenium/interactions/DragAndDropTest.java +++ b/java/client/test/org/openqa/selenium/interactions/DragAndDropTest.java @@ -28,8 +28,6 @@ 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.OPERA; -import static org.openqa.selenium.testing.Ignore.Driver.OPERA_MOBILE; import static org.openqa.selenium.testing.Ignore.Driver.PHANTOMJS; import static org.openqa.selenium.testing.Ignore.Driver.SAFARI; @@ -51,7 +49,7 @@ import java.util.regex.Pattern; @Ignore( - value = {HTMLUNIT, SAFARI, OPERA_MOBILE, MARIONETTE}, + value = {HTMLUNIT, MARIONETTE}, reason = "HtmlUnit: Advanced mouse actions only implemented in rendered browsers" + "Safari: not implemented (issue 4136)", issues = {4136}) @@ -78,7 +76,6 @@ public void testDragAndDropRelative() { } @JavascriptEnabled - @Ignore(OPERA) @Test public void testDragAndDropToElement() { driver.get(pages.dragAndDropPage); @@ -89,7 +86,6 @@ public void testDragAndDropToElement() { } @JavascriptEnabled - @Ignore(OPERA) @Test public void testDragAndDropToElementInIframe() { driver.get(pages.iframePage); @@ -104,7 +100,6 @@ public void testDragAndDropToElementInIframe() { } @JavascriptEnabled - @Ignore(value = {OPERA}, reason = "OPERA: ?") @Test public void testDragAndDropElementWithOffsetInIframeAtBottom() { driver.get(appServer.whereIs("iframeAtBottom.html")); @@ -121,7 +116,7 @@ public void testDragAndDropElementWithOffsetInIframeAtBottom() { } @JavascriptEnabled - @Ignore(value = {OPERA, IE}, reason = "OPERA: ?") + @Ignore(value = {IE}) @Test public void testDragAndDropElementWithOffsetInScrolledDiv() { assumeFalse("See issue 4241", Browser.detect() == Browser.ff && @@ -150,7 +145,7 @@ public void testElementInDiv() { } @JavascriptEnabled - @Ignore({CHROME, IE, OPERA, PHANTOMJS}) + @Ignore({CHROME, IE, PHANTOMJS}) @Test public void testDragTooFar() { assumeTrue(TestUtilities.isNativeEventsEnabled(driver)); @@ -199,7 +194,6 @@ private void drag(WebElement elem, Point expectedLocation, } @JavascriptEnabled - @Ignore(OPERA) @Test public void testDragAndDropOnJQueryItems() { driver.get(pages.droppableItems); @@ -236,7 +230,7 @@ public void testDragAndDropOnJQueryItems() { @JavascriptEnabled @Test - @Ignore({IE, OPERA, PHANTOMJS, SAFARI}) + @Ignore({IE, PHANTOMJS, SAFARI}) public void canDragAnElementNotVisibleInTheCurrentViewportDueToAParentOverflow() { driver.get(pages.dragDropOverflow); 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 dfe9735ebf56a..6f3355a6a734f 100644 --- a/java/client/test/org/openqa/selenium/interactions/touch/TouchFlickTest.java +++ b/java/client/test/org/openqa/selenium/interactions/touch/TouchFlickTest.java @@ -1,5 +1,5 @@ /* -Copyright 2012 Software Freedom Conservancy +Copyright 2012-2015 Software Freedom Conservancy Copyright 2007-2012 Selenium committers Licensed under the Apache License, Version 2.0 (the "License"); @@ -26,15 +26,11 @@ import org.openqa.selenium.testing.Ignore; import static org.junit.Assert.assertTrue; -import static org.openqa.selenium.testing.Ignore.Driver.OPERA; -import static org.openqa.selenium.testing.Ignore.Driver.OPERA_MOBILE; /** * Tests the basic flick operations on touch enabled devices. */ -@Ignore({OPERA, OPERA_MOBILE}) public class TouchFlickTest extends TouchTestBase { - private TouchActions getBuilder(WebDriver driver) { return new TouchActions(driver); } @@ -193,5 +189,4 @@ public void testCanFlickVerticallyFast() { // After flicking, the element should now be visible on the screen. assertTrue("Got: " + y, y < 4000); } - -} \ No newline at end of file +} 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 2de8b5def210d..22df5c9285128 100644 --- a/java/client/test/org/openqa/selenium/interactions/touch/TouchScrollTest.java +++ b/java/client/test/org/openqa/selenium/interactions/touch/TouchScrollTest.java @@ -1,5 +1,5 @@ /* -Copyright 2012 Software Freedom Conservancy +Copyright 2012-2015 Software Freedom Conservancy Copyright 2007-2012 Selenium committers Licensed under the Apache License, Version 2.0 (the "License"); @@ -26,15 +26,11 @@ import org.openqa.selenium.testing.Ignore; import static org.junit.Assert.assertTrue; -import static org.openqa.selenium.testing.Ignore.Driver.OPERA; -import static org.openqa.selenium.testing.Ignore.Driver.OPERA_MOBILE; /** * Tests the basic scroll operations on touch enabled devices.. */ -@Ignore({OPERA, OPERA_MOBILE}) public class TouchScrollTest extends TouchTestBase { - private TouchActions getBuilder(WebDriver driver) { return new TouchActions(driver); } @@ -116,5 +112,4 @@ public void testCanScrollHorizontally() { // After scrolling, the location of the element should change accordingly. assertTrue("Expected x < 1500, but got x = " + x, x < 1500); } - -} \ No newline at end of file +} diff --git a/java/client/test/org/openqa/selenium/logging/AvailableLogsTest.java b/java/client/test/org/openqa/selenium/logging/AvailableLogsTest.java index 7b419490264f4..bc702c06445c8 100644 --- a/java/client/test/org/openqa/selenium/logging/AvailableLogsTest.java +++ b/java/client/test/org/openqa/selenium/logging/AvailableLogsTest.java @@ -1,6 +1,6 @@ /* Copyright 2012 Selenium committers -Copyright 2012 Software Freedom Conservancy +Copyright 2012-2015 Software Freedom Conservancy Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -38,12 +38,10 @@ 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.OPERA; -import static org.openqa.selenium.testing.Ignore.Driver.OPERA_MOBILE; import static org.openqa.selenium.testing.Ignore.Driver.PHANTOMJS; import static org.openqa.selenium.testing.Ignore.Driver.SAFARI; -@Ignore({HTMLUNIT, IE, OPERA, OPERA_MOBILE, PHANTOMJS, MARIONETTE}) +@Ignore({HTMLUNIT, IE, PHANTOMJS, MARIONETTE}) public class AvailableLogsTest extends JUnit4TestBase { private WebDriver localDriver; diff --git a/java/client/test/org/openqa/selenium/logging/GetLogsTest.java b/java/client/test/org/openqa/selenium/logging/GetLogsTest.java index a68f0ee466a8d..a360457172d4a 100644 --- a/java/client/test/org/openqa/selenium/logging/GetLogsTest.java +++ b/java/client/test/org/openqa/selenium/logging/GetLogsTest.java @@ -1,5 +1,5 @@ /* -Copyright 2012 Software Freedom Conservatory. +Copyright 2012-2015 Software Freedom Conservatory. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -24,8 +24,6 @@ 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.OPERA; -import static org.openqa.selenium.testing.Ignore.Driver.OPERA_MOBILE; import static org.openqa.selenium.testing.Ignore.Driver.PHANTOMJS; import org.junit.After; @@ -45,7 +43,7 @@ import java.util.Set; import java.util.logging.Level; -@Ignore({HTMLUNIT, IE, OPERA, OPERA_MOBILE, PHANTOMJS, MARIONETTE}) +@Ignore({HTMLUNIT, IE, PHANTOMJS, MARIONETTE}) public class GetLogsTest extends JUnit4TestBase { private WebDriver localDriver; diff --git a/java/client/test/org/openqa/selenium/logging/PerformanceLogTypeTest.java b/java/client/test/org/openqa/selenium/logging/PerformanceLogTypeTest.java index 729371d655b33..580338a1475c5 100644 --- a/java/client/test/org/openqa/selenium/logging/PerformanceLogTypeTest.java +++ b/java/client/test/org/openqa/selenium/logging/PerformanceLogTypeTest.java @@ -1,5 +1,5 @@ /* -Copyright 2013 Software Freedom Conservancy +Copyright 2013-2015 Software Freedom Conservancy Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -23,8 +23,6 @@ import static org.junit.Assume.assumeTrue; 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.OPERA; -import static org.openqa.selenium.testing.Ignore.Driver.OPERA_MOBILE; import static org.openqa.selenium.testing.Ignore.Driver.PHANTOMJS; import static org.openqa.selenium.testing.Ignore.Driver.SAFARI; import static org.openqa.selenium.testing.TestUtilities.isChrome; @@ -45,7 +43,7 @@ import java.util.logging.Level; -@Ignore({HTMLUNIT, IE, OPERA, OPERA_MOBILE, PHANTOMJS, SAFARI}) +@Ignore({HTMLUNIT, IE, PHANTOMJS, SAFARI}) public class PerformanceLogTypeTest extends JUnit4TestBase { private WebDriver localDriver; diff --git a/java/client/test/org/openqa/selenium/logging/PerformanceLoggingTest.java b/java/client/test/org/openqa/selenium/logging/PerformanceLoggingTest.java index 06de7cf366c68..dbde934fe9a74 100644 --- a/java/client/test/org/openqa/selenium/logging/PerformanceLoggingTest.java +++ b/java/client/test/org/openqa/selenium/logging/PerformanceLoggingTest.java @@ -1,5 +1,5 @@ /* -Copyright 2012 Software Freedom Conservancy +Copyright 2012-2015 Software Freedom Conservancy Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -28,8 +28,6 @@ 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.OPERA; -import static org.openqa.selenium.testing.Ignore.Driver.OPERA_MOBILE; import static org.openqa.selenium.testing.Ignore.Driver.PHANTOMJS; import static org.openqa.selenium.testing.Ignore.Driver.SAFARI; @@ -51,7 +49,7 @@ import java.util.Arrays; -@Ignore({CHROME, HTMLUNIT, IE, OPERA, OPERA_MOBILE, PHANTOMJS, SAFARI, MARIONETTE}) +@Ignore({CHROME, HTMLUNIT, IE, PHANTOMJS, SAFARI, MARIONETTE}) public class PerformanceLoggingTest extends JUnit4TestBase { private WebDriver localDriver; diff --git a/java/client/test/org/openqa/selenium/opera/OperaDriverTests.java b/java/client/test/org/openqa/selenium/opera/OperaDriverTests.java deleted file mode 100644 index c464873e49fc7..0000000000000 --- a/java/client/test/org/openqa/selenium/opera/OperaDriverTests.java +++ /dev/null @@ -1,30 +0,0 @@ -/* -Copyright 2012 Selenium committers -Copyright 2012 Software Freedom Conservancy - -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 License for the specific language governing permissions and -limitations under the License. -*/ - - -package org.openqa.selenium.opera; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.openqa.selenium.StandardSeleniumTests; - -@RunWith(Suite.class) -@Suite.SuiteClasses({ - StandardSeleniumTests.class -}) -public class OperaDriverTests { -} diff --git a/java/client/test/org/openqa/selenium/opera/build.desc b/java/client/test/org/openqa/selenium/opera/build.desc index af9ba5f216e17..93cf4d167620b 100644 --- a/java/client/test/org/openqa/selenium/opera/build.desc +++ b/java/client/test/org/openqa/selenium/opera/build.desc @@ -1,17 +1,3 @@ -java_test(name = "test_presto", - srcs = [ - "OperaDriverTests.java", - ], - sysproperties = [ - { "selenium.browser" : "opera" }, - ], - deps = [ - "//java/client/test/org/openqa/selenium:tests", - "//third_party/java/junit", - "//third_party/java/opera-driver" - ] -) - java_test(name = "test_blink", srcs = [ "OperaBlinkDriverTests.java", @@ -23,7 +9,6 @@ java_test(name = "test_blink", deps = [ "//java/client/src/org/openqa/selenium/opera", "//java/client/test/org/openqa/selenium:tests", - "//third_party/java/junit", - "//third_party/java/opera-driver" + "//third_party/java/junit" ] ) diff --git a/java/client/test/org/openqa/selenium/opera/mobile/OperaMobileDriverTests.java b/java/client/test/org/openqa/selenium/opera/mobile/OperaMobileDriverTests.java deleted file mode 100644 index 68d5c732ad6eb..0000000000000 --- a/java/client/test/org/openqa/selenium/opera/mobile/OperaMobileDriverTests.java +++ /dev/null @@ -1,32 +0,0 @@ -/* -Copyright 2012 Selenium committers -Copyright 2012 Software Freedom Conservancy - -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 License for the specific language governing permissions and -limitations under the License. -*/ - - -package org.openqa.selenium.opera.mobile; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.openqa.selenium.StandardSeleniumTests; -import org.openqa.selenium.interactions.touch.TouchTests; - -@RunWith(Suite.class) -@Suite.SuiteClasses({ - StandardSeleniumTests.class, - TouchTests.class -}) -public class OperaMobileDriverTests { -} diff --git a/java/client/test/org/openqa/selenium/opera/mobile/build.desc b/java/client/test/org/openqa/selenium/opera/mobile/build.desc deleted file mode 100644 index f64677bb4b9e1..0000000000000 --- a/java/client/test/org/openqa/selenium/opera/mobile/build.desc +++ /dev/null @@ -1,13 +0,0 @@ -java_test(name = "test", - srcs = [ - "*.java", - ], - sysproperties = [ - { "selenium.browser" : "opera_mobile" }, - ], - deps = [ - "//java/client/test/org/openqa/selenium:tests", - "//third_party/java/junit", - "//third_party/java/opera-driver" - ] -) diff --git a/java/client/test/org/openqa/selenium/testing/Ignore.java b/java/client/test/org/openqa/selenium/testing/Ignore.java index 0883d83bb77d4..a629d6b1aee45 100644 --- a/java/client/test/org/openqa/selenium/testing/Ignore.java +++ b/java/client/test/org/openqa/selenium/testing/Ignore.java @@ -1,5 +1,5 @@ /* -Copyright 2012 Software Freedom Conservancy +Copyright 2012-2015 Software Freedom Conservancy Copyright 2007-2012 Selenium committers Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,8 +35,6 @@ public static enum Driver { FIREFOX, IE, MARIONETTE, - OPERA, - OPERA_MOBILE, PHANTOMJS, REMOTE, SAFARI, diff --git a/java/client/test/org/openqa/selenium/testing/drivers/BUCK b/java/client/test/org/openqa/selenium/testing/drivers/BUCK index 05bb8cb8b0483..d9153e1f8916f 100644 --- a/java/client/test/org/openqa/selenium/testing/drivers/BUCK +++ b/java/client/test/org/openqa/selenium/testing/drivers/BUCK @@ -36,7 +36,6 @@ java_library(name = 'drivers', '//java/client/test/org/openqa/selenium/testing:helpers', '//third_party/java/guava-libraries:guava-libraries', '//third_party/java/junit:junit', - '//third_party/java/opera-driver:opera-driver', '//third_party/java/phantomjs-driver:phantomjs-driver', ], visibility = [ diff --git a/java/client/test/org/openqa/selenium/testing/drivers/Browser.java b/java/client/test/org/openqa/selenium/testing/drivers/Browser.java index 113d0eac250e5..88b8d33d2d799 100644 --- a/java/client/test/org/openqa/selenium/testing/drivers/Browser.java +++ b/java/client/test/org/openqa/selenium/testing/drivers/Browser.java @@ -33,10 +33,8 @@ public boolean isJavascriptEnabled() { htmlunit_js, ie, none, // For those cases where you don't actually want a browser - @Deprecated opera, + opera, operablink, - operapresto, - opera_mobile, phantomjs, safari; diff --git a/java/client/test/org/openqa/selenium/testing/drivers/BrowserToCapabilities.java b/java/client/test/org/openqa/selenium/testing/drivers/BrowserToCapabilities.java index 11616099abf25..691e18b5d47ac 100644 --- a/java/client/test/org/openqa/selenium/testing/drivers/BrowserToCapabilities.java +++ b/java/client/test/org/openqa/selenium/testing/drivers/BrowserToCapabilities.java @@ -1,6 +1,6 @@ /* Copyright 2012 Selenium committers -Copyright 2012 Software Freedom Conservancy +Copyright 2012-2015 Software Freedom Conservancy Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -15,13 +15,8 @@ limitations under the License. */ - package org.openqa.selenium.testing.drivers; -import com.opera.core.systems.OperaProduct; -import com.opera.core.systems.OperaProfile; -import com.opera.core.systems.OperaSettings; - import static org.openqa.selenium.remote.CapabilityType.HAS_NATIVE_EVENTS; import org.openqa.selenium.remote.DesiredCapabilities; @@ -57,23 +52,6 @@ public static DesiredCapabilities of(Browser browser) { caps = DesiredCapabilities.internetExplorer(); break; - case opera: - case operapresto: - OperaProfile profile = new OperaProfile(); - profile.preferences().set("Geolocation", "Enable geolocation", true); - // This pref allows all sites to access geolocation without prompting. - // A 0 value would deny all sites and -1 would prompt for all sites. - profile.preferences().set("User Prefs", "Geolocation site state", 1); - - caps = DesiredCapabilities.operaPresto(); - caps.setCapability("opera.profile", profile); - break; - - case opera_mobile: - caps = DesiredCapabilities.operaPresto(); - caps.setCapability(OperaSettings.Capability.PRODUCT.getCapability(), OperaProduct.MOBILE); - break; - case operablink: caps = DesiredCapabilities.operaBlink(); break; diff --git a/java/client/test/org/openqa/selenium/testing/drivers/OperaPrestoDriverSupplier.java b/java/client/test/org/openqa/selenium/testing/drivers/OperaPrestoDriverSupplier.java deleted file mode 100644 index af9b8d9a02072..0000000000000 --- a/java/client/test/org/openqa/selenium/testing/drivers/OperaPrestoDriverSupplier.java +++ /dev/null @@ -1,50 +0,0 @@ -/* -Copyright 2012 Selenium committers -Copyright 2012 Software Freedom Conservancy - -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 License for the specific language governing permissions and -limitations under the License. -*/ - -package org.openqa.selenium.testing.drivers; - -import com.google.common.base.Supplier; - -import com.opera.core.systems.OperaDriver; - -import org.openqa.selenium.Capabilities; -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.remote.DesiredCapabilities; - -public class OperaPrestoDriverSupplier implements Supplier { - - private final Capabilities capabilities; - - public OperaPrestoDriverSupplier(Capabilities capabilities) { - this.capabilities = capabilities; - } - - public WebDriver get() { - if (capabilities == null) { - return null; - } - - if (!DesiredCapabilities.operaPresto().getBrowserName().equals(capabilities.getBrowserName()) - && !DesiredCapabilities.opera().getBrowserName().equals(capabilities.getBrowserName())) { - return null; - } - - // It's okay to avoid reflection here because the OperaDriver is a third party dependency - return new OperaDriver(capabilities); - } - -} \ No newline at end of file diff --git a/java/client/test/org/openqa/selenium/testing/drivers/PhantomJSDriverSupplier.java b/java/client/test/org/openqa/selenium/testing/drivers/PhantomJSDriverSupplier.java index 9684df30e63b8..f4a040d9e943a 100644 --- a/java/client/test/org/openqa/selenium/testing/drivers/PhantomJSDriverSupplier.java +++ b/java/client/test/org/openqa/selenium/testing/drivers/PhantomJSDriverSupplier.java @@ -1,6 +1,6 @@ /* Copyright 2012 Selenium committers -Copyright 2012 Software Freedom Conservancy +Copyright 2012-2015 Software Freedom Conservancy Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -26,7 +26,6 @@ import org.openqa.selenium.remote.DesiredCapabilities; public class PhantomJSDriverSupplier implements Supplier { - private final Capabilities capabilities; public PhantomJSDriverSupplier(Capabilities capabilities) { @@ -42,8 +41,6 @@ public WebDriver get() { return null; } - // It's okay to avoid reflection here because the OperaDriver is a third party dependency return new PhantomJSDriver(capabilities); } - -} \ No newline at end of file +} diff --git a/java/client/test/org/openqa/selenium/testing/drivers/TestIgnorance.java b/java/client/test/org/openqa/selenium/testing/drivers/TestIgnorance.java index a4003d56c2d91..cb88b6b3b78e4 100644 --- a/java/client/test/org/openqa/selenium/testing/drivers/TestIgnorance.java +++ b/java/client/test/org/openqa/selenium/testing/drivers/TestIgnorance.java @@ -1,6 +1,6 @@ /* Copyright 2011 Selenium committers -Copyright 2011 Software Freedom Conservancy +Copyright 2011-2015 Software Freedom Conservancy Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -26,8 +26,6 @@ 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.OPERA; -import static org.openqa.selenium.testing.Ignore.Driver.OPERA_MOBILE; 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; @@ -199,19 +197,12 @@ private void addIgnoresForBrowser(Browser browser, IgnoreComparator comparator) break; case opera: - case operapresto: - comparator.addDriver(OPERA); break; case operablink: comparator.addDriver(CHROME); break; - case opera_mobile: - comparator.addDriver(OPERA_MOBILE); - comparator.addDriver(REMOTE); - break; - case phantomjs: comparator.addDriver(PHANTOMJS); break; diff --git a/java/client/test/org/openqa/selenium/testing/drivers/WebDriverBuilder.java b/java/client/test/org/openqa/selenium/testing/drivers/WebDriverBuilder.java index 09de550e6c5d9..a4654196018b4 100644 --- a/java/client/test/org/openqa/selenium/testing/drivers/WebDriverBuilder.java +++ b/java/client/test/org/openqa/selenium/testing/drivers/WebDriverBuilder.java @@ -1,6 +1,6 @@ /* Copyright 2012 Selenium committers -Copyright 2012 Software Freedom Conservancy +Copyright 2012-2015 Software Freedom Conservancy Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -86,7 +86,6 @@ private List> getSuppliers(Capabilities desiredCaps, suppliers.add(new ExternalDriverSupplier(desiredCaps, requiredCaps)); suppliers.add(new SauceBackedDriverSupplier(desiredCaps)); suppliers.add(new RemoteSupplier(desiredCaps, requiredCaps)); - suppliers.add(new OperaPrestoDriverSupplier(desiredCaps)); suppliers.add(new PhantomJSDriverSupplier(desiredCaps)); suppliers.add(new TestInternetExplorerSupplier(desiredCaps)); suppliers.add(new ReflectionBackedDriverSupplier(desiredCaps, requiredCaps)); diff --git a/java/client/test/org/openqa/selenium/testing/drivers/build.desc b/java/client/test/org/openqa/selenium/testing/drivers/build.desc index c3fbebd9a86bd..9523f2f37d293 100644 --- a/java/client/test/org/openqa/selenium/testing/drivers/build.desc +++ b/java/client/test/org/openqa/selenium/testing/drivers/build.desc @@ -31,7 +31,6 @@ java_library(name = "drivers", "//java/client/test/org/openqa/selenium/testing:dev_mode", "//javascript/firefox-driver:webdriver", "//third_party/java/guava-libraries", - "//third_party/java/opera-driver", "//third_party/java/junit", ]) diff --git a/java/server/src/org/openqa/selenium/server/build.desc b/java/server/src/org/openqa/selenium/server/build.desc index 377e27c0b2b58..440d1e19e2141 100644 --- a/java/server/src/org/openqa/selenium/server/build.desc +++ b/java/server/src/org/openqa/selenium/server/build.desc @@ -4,7 +4,6 @@ java_binary(name = "server", ":base", ":server_resources", "//java/client/src/org/openqa/selenium:client-combined", - "//third_party/java/opera-driver", ]) # Light version of the server for drivers that don't need to depend on all other drivers. diff --git a/javascript/opera-driver/atoms.js b/javascript/opera-driver/atoms.js deleted file mode 100644 index 22d04e4c952b6..0000000000000 --- a/javascript/opera-driver/atoms.js +++ /dev/null @@ -1,40 +0,0 @@ -// Copyright 2012 Selenium committers -// Copyright 2012 Software Freedom Conservancy -// -// 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 License for the specific language governing permissions and -// limitations under the License. - -/** - * @fileoverview Opera specific atoms. - */ - -goog.provide("webdriver.opera"); - -/** - * Moves the caret position of an INPUT related field, roughly - * matching element.value == "text" || "textarea" to the end of the - * field. It will not focus the element, but when a focus is later - * triggered, it will appear at the end. - * - * When a TEXTAREA element is focused it returns the cursor to the - * last position was at, or places it last. INPUT @type="text" (or - * any other textual input element) places the caret at the beginning. - * Because of this we are forced to move the caret to the end of the - * input field. We do this by setting the selection range through - * JavaScript, which should move the cursor to the end of the field - * upon the next focus event. - * - * @param {!Element} element the element in which to move the caret - */ -webdriver.opera.moveCaretToEnd = function(element) { - element.setSelectionRange(element.value.length, element.value.length); -}; diff --git a/javascript/opera-driver/build.desc b/javascript/opera-driver/build.desc deleted file mode 100644 index 5368aacd40693..0000000000000 --- a/javascript/opera-driver/build.desc +++ /dev/null @@ -1,33 +0,0 @@ -# Used for https://github.com/operasoftware/operadriver/tree/master/src/com/opera/core/systems/OperaAtom.java - -js_library(name = "deps", - srcs = [ "*.js" ], - deps = [ "//javascript/atoms:all_js" ]) - -js_fragment(name = "move_caret_to_end", - module = "webdriver.opera", - function = "webdriver.opera.moveCaretToEnd", - deps = [ ":deps" ]) - -js_fragment_java(name = "atoms", - package = "com.opera.core.systems", - srcs = [ "*.js" ], - deps = [ - "//javascript/opera-driver:move_caret_to_end", - "//javascript/atoms/fragments:clear", - "//javascript/atoms/fragments:click", - "//javascript/atoms/fragments:execute_script", - "//javascript/atoms/fragments:execute_async_script", - "//javascript/atoms/fragments:find_element", - "//javascript/atoms/fragments:find_elements", - "//javascript/atoms/fragments:get_effective_style", - "//javascript/atoms/fragments:get_frame_index", - "//javascript/atoms/fragments:get_location", - "//javascript/atoms/fragments:get_size", - "//javascript/atoms/fragments:is_displayed", - "//javascript/atoms/fragments:is_enabled", - "//javascript/atoms/fragments:submit", - "//javascript/webdriver/atoms/fragments:get_attribute", - "//javascript/webdriver/atoms/fragments:get_text", - "//javascript/webdriver/atoms/fragments:is_selected", - ]) diff --git a/py/build.desc b/py/build.desc index 4904f06a74bd5..751d17b1ab3e0 100644 --- a/py/build.desc +++ b/py/build.desc @@ -30,12 +30,6 @@ py_test( deps = [ ":test_chrome" ], browsers = [ "chrome" ]) -py_test( - name = "opera_test", - opera_specific_tests = [ "test/selenium/webdriver/opera/*_tests.py" ], - deps = [ ":test_opera" ], - browsers = [ "opera" ]) - py_test( name = "ie_test", deps = [ ":test_ie" ], @@ -72,7 +66,6 @@ py_test( "ie", "phantomjs", "remote_firefox", - "opera", "safari", ]) diff --git a/rake-tasks/browsers.rb b/rake-tasks/browsers.rb index 2f52e95cf6854..01b0fd4bd1730 100644 --- a/rake-tasks/browsers.rb +++ b/rake-tasks/browsers.rb @@ -49,20 +49,6 @@ :browser_name => "chrome", :available => chrome? }, - "opera" => { - :python => { - :ignore => "opera", - :dir => "opera", - :file_string => "opera", - :class => "Opera" - }, - :java => { - :class => "com.opera.core.systems.OperaDriver", - :deps => [ "//third_party/java/opera-driver" ] - }, - :browser_name => "opera", - :available => opera? - }, "phantomjs" => { :python => { :ignore => "phantomjs", diff --git a/third_party/java/commons-exec/BUCK b/third_party/java/commons-exec/BUCK index 3f1d1c59e6b2d..3543e02862bd7 100644 --- a/third_party/java/commons-exec/BUCK +++ b/third_party/java/commons-exec/BUCK @@ -3,6 +3,5 @@ prebuilt_jar( binary_jar = 'commons-exec-1.1.jar', visibility = [ '//java/client/src/org/openqa/selenium/os:os', - '//third_party/java/opera-driver:opera-driver', ], ) diff --git a/third_party/java/commons-jxpath/BUCK b/third_party/java/commons-jxpath/BUCK deleted file mode 100644 index 6f14a6bd3ae6a..0000000000000 --- a/third_party/java/commons-jxpath/BUCK +++ /dev/null @@ -1,8 +0,0 @@ - -prebuilt_jar(name = 'commons-jxpath', - binary_jar = 'commons-jxpath-1.3.jar', - visibility = [ - '//third_party/java/opera-driver:opera-driver', - ], -) - diff --git a/third_party/java/commons-jxpath/build.desc b/third_party/java/commons-jxpath/build.desc deleted file mode 100644 index 9fe94d10b5fe9..0000000000000 --- a/third_party/java/commons-jxpath/build.desc +++ /dev/null @@ -1,6 +0,0 @@ - -java_library(name = "commons-jxpath", - deps = [ - "commons-jxpath-1.3.jar", - ]) - diff --git a/third_party/java/commons-jxpath/commons-jxpath-1.3.jar b/third_party/java/commons-jxpath/commons-jxpath-1.3.jar deleted file mode 100644 index e344a1e66d83c..0000000000000 Binary files a/third_party/java/commons-jxpath/commons-jxpath-1.3.jar and /dev/null differ diff --git a/third_party/java/google-protobuffers/BUCK b/third_party/java/google-protobuffers/BUCK deleted file mode 100644 index 0982cccd7f005..0000000000000 --- a/third_party/java/google-protobuffers/BUCK +++ /dev/null @@ -1,7 +0,0 @@ - -prebuilt_jar(name = 'google-protobuffers', - binary_jar = 'protobuf-java-2.4.1.jar', - visibility = [ - '//third_party/java/opera-driver:opera-driver', - ], -) diff --git a/third_party/java/google-protobuffers/build.desc b/third_party/java/google-protobuffers/build.desc deleted file mode 100644 index 45ec1f6ef9574..0000000000000 --- a/third_party/java/google-protobuffers/build.desc +++ /dev/null @@ -1,5 +0,0 @@ - -java_library(name = "google-protobuffers", - deps = [ - "protobuf-java-2.4.1.jar", - ]) diff --git a/third_party/java/google-protobuffers/protobuf-java-2.4.1.jar b/third_party/java/google-protobuffers/protobuf-java-2.4.1.jar deleted file mode 100644 index e208b23398c3e..0000000000000 Binary files a/third_party/java/google-protobuffers/protobuf-java-2.4.1.jar and /dev/null differ diff --git a/third_party/java/ini4j/BUCK b/third_party/java/ini4j/BUCK deleted file mode 100644 index df49e82340e71..0000000000000 --- a/third_party/java/ini4j/BUCK +++ /dev/null @@ -1,6 +0,0 @@ -prebuilt_jar(name = 'ini4j', - binary_jar = 'ini4j-0.5.2.jar', - visibility = [ - '//third_party/java/opera-driver:opera-driver', - ], -) diff --git a/third_party/java/ini4j/build.desc b/third_party/java/ini4j/build.desc deleted file mode 100644 index 415f68bef4fc4..0000000000000 --- a/third_party/java/ini4j/build.desc +++ /dev/null @@ -1,5 +0,0 @@ -java_library(name = "ini4j", - deps = [ - "ini4j-0.5.2.jar" - ] -) diff --git a/third_party/java/ini4j/ini4j-0.5.2.jar b/third_party/java/ini4j/ini4j-0.5.2.jar deleted file mode 100644 index 27e5ddc76356b..0000000000000 Binary files a/third_party/java/ini4j/ini4j-0.5.2.jar and /dev/null differ diff --git a/third_party/java/opera-driver/BUCK b/third_party/java/opera-driver/BUCK deleted file mode 100644 index 5536447faf6e9..0000000000000 --- a/third_party/java/opera-driver/BUCK +++ /dev/null @@ -1,15 +0,0 @@ -prebuilt_jar(name = 'opera-driver', - binary_jar = 'operadriver-1.5.jar', - deps = [ - '//java/client/src/org/openqa/selenium/remote:remote', - '//java/client/src/org/openqa/selenium/support:support', - '//third_party/java/commons-exec:commons-exec', - '//third_party/java/commons-jxpath:commons-jxpath', - '//third_party/java/google-protobuffers:google-protobuffers', - '//third_party/java/guava-libraries:guava-libraries', - '//third_party/java/ini4j:ini4j', - ], - visibility = [ - '//java/client/test/org/openqa/selenium/testing/drivers:drivers', - ], -) diff --git a/third_party/java/opera-driver/build.desc b/third_party/java/opera-driver/build.desc deleted file mode 100644 index 7c5477619babd..0000000000000 --- a/third_party/java/opera-driver/build.desc +++ /dev/null @@ -1,11 +0,0 @@ -java_library(name = "opera-driver", - deps = [ - "operadriver-1.5.jar", - "//java/client/src/org/openqa/selenium/remote", - "//java/client/src/org/openqa/selenium/support", - "//third_party/java/commons-exec", - "//third_party/java/commons-jxpath", - "//third_party/java/google-protobuffers", - "//third_party/java/guava-libraries", - "//third_party/java/ini4j" - ]) diff --git a/third_party/java/opera-driver/operadriver-1.5-sources.jar b/third_party/java/opera-driver/operadriver-1.5-sources.jar deleted file mode 100644 index 52cdc5c69b3e5..0000000000000 Binary files a/third_party/java/opera-driver/operadriver-1.5-sources.jar and /dev/null differ diff --git a/third_party/java/opera-driver/operadriver-1.5.jar b/third_party/java/opera-driver/operadriver-1.5.jar deleted file mode 100644 index 95088bdfcedb3..0000000000000 Binary files a/third_party/java/opera-driver/operadriver-1.5.jar and /dev/null differ