java: remove support for Presto-based Opera

This removes support for running tests for Presto-based Opera from
Selenium. This means Presto-based Operas are unsupported for Selenium,
but not that the existing OperaDriver will not run using existing
Selenium technology.

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',

java/client/.classpath

@@ -16,7 +16,6 @@
 	<classpathentry kind="lib" path="/third-party/java/jetty/jetty-repacked-7.6.1.jar" sourcepath="/third-party/java/jetty/jetty-repacked-7.6.1-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/cglib/cglib-nodep-2.1_3.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/servlet-api/servlet-api-2.5-6.1.9.jar" sourcepath="/third-party/java/servlet-api/servlet-api-2.5-6.1.9-sources.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/opera-driver/operadriver-1.5.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/phantomjs-driver/phantomjsdriver-1.2.1.jar" sourcepath="/third-party/java/phantomjs-driver/phantomjsdriver-1.2.1-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/apache-httpclient/httpclient-4.3.6.jar" sourcepath="/third-party/java/apache-httpclient/httpclient-4.3.6-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/apache-httpclient/httpcore-4.3.3.jar" sourcepath="/third-party/java/apache-httpclient/httpcore-4.3.3-sources.jar"/>
@@ -35,8 +34,6 @@
 	<classpathentry kind="lib" path="/third-party/java/little_proxy/littleproxy-0.5.3.jar" sourcepath="/third-party/java/little_proxy/littleproxy-0.5.3-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/nekohtml/nekohtml-1.9.21.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/netty/netty-3.5.7.Final.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/google-protobuffers/protobuf-java-2.4.1.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/commons-jxpath/commons-jxpath-1.3.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/xml/xml-apis-1.4.01.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/mockito/mockito-core-1.9.5.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/objenesis/objenesis-1.0.jar"/>

java/client/client.iml

@@ -18,12 +18,10 @@
     <orderEntry type="library" name="commons-fileupload" level="project" />
     <orderEntry type="library" name="commons-httpclient" level="project" />
     <orderEntry type="library" name="commons-io" level="project" />
-    <orderEntry type="library" name="commons-jxpath" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="commons-lang" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="commons-logging" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="cssparser" level="project" />
     <orderEntry type="library" exported="" name="guava-libraries" level="project" />
-    <orderEntry type="library" name="google-protobuffers" level="project" />
     <orderEntry type="library" exported="" name="gson" level="project" />
     <orderEntry type="library" name="hamcrest" level="project" />
     <orderEntry type="library" name="htmlunit" level="project" />

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"
   ])
 

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();
     }
   };
 

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 = [

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

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();

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,13 +91,11 @@ public void testTextAreaShouldNotClearWhenReadOnly() {
     }
   }
 
-  @Ignore({OPERA_MOBILE})
   @Test
   public void testContentEditableAreaShouldClear() {
     driver.get(pages.readOnlyPage);
     WebElement element = driver.findElement(By.id("content-editable"));
     element.clear();
     assertEquals("", element.getText());
   }
-
 }

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"));