Skip to content

Commit 45afa32

Browse files
committed
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.
1 parent cf2aefb commit 45afa32

File tree

89 files changed

+290
-870
lines changed

Some content is hidden

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

89 files changed

+290
-870
lines changed

.idea/libraries/commons_jxpath.xml

Lines changed: 0 additions & 9 deletions
This file was deleted.

.idea/libraries/google_protobuffers.xml

Lines changed: 0 additions & 9 deletions
This file was deleted.

.idea/libraries/operadriver.xml

Lines changed: 0 additions & 11 deletions
This file was deleted.

Rakefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,6 @@ if (!mac?)
158158
task :test_firefox => [ "//java/client/test/org/openqa/selenium/firefox:test_native:run" ]
159159
end
160160
task :test_opera => [ "//java/client/test/org/openqa/selenium/opera:test_blink:run" ]
161-
task :test_operapresto => [ "//java/client/test/org/openqa/selenium/opera:test_presto:run" ]
162-
task :test_opera_mobile => [ "//java/client/test/org/openqa/selenium/opera/mobile:test:run" ]
163161
task :test_remote_server => [ '//java/server/test/org/openqa/selenium/remote/server:test:run' ]
164162
task :test_remote => [
165163
'//java/client/test/org/openqa/selenium/remote:common-tests:run',

java/client/.classpath

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
<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"/>
1717
<classpathentry kind="lib" path="/third-party/java/cglib/cglib-nodep-2.1_3.jar"/>
1818
<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"/>
19-
<classpathentry kind="lib" path="/third-party/java/opera-driver/operadriver-1.5.jar"/>
2019
<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"/>
2120
<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"/>
2221
<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 @@
3534
<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"/>
3635
<classpathentry kind="lib" path="/third-party/java/nekohtml/nekohtml-1.9.21.jar"/>
3736
<classpathentry kind="lib" path="/third-party/java/netty/netty-3.5.7.Final.jar"/>
38-
<classpathentry kind="lib" path="/third-party/java/google-protobuffers/protobuf-java-2.4.1.jar"/>
39-
<classpathentry kind="lib" path="/third-party/java/commons-jxpath/commons-jxpath-1.3.jar"/>
4037
<classpathentry kind="lib" path="/third-party/java/xml/xml-apis-1.4.01.jar"/>
4138
<classpathentry kind="lib" path="/third-party/java/mockito/mockito-core-1.9.5.jar"/>
4239
<classpathentry kind="lib" path="/third-party/java/objenesis/objenesis-1.0.jar"/>

java/client/client.iml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,10 @@
1818
<orderEntry type="library" name="commons-fileupload" level="project" />
1919
<orderEntry type="library" name="commons-httpclient" level="project" />
2020
<orderEntry type="library" name="commons-io" level="project" />
21-
<orderEntry type="library" name="commons-jxpath" level="project" />
2221
<orderEntry type="library" scope="RUNTIME" name="commons-lang" level="project" />
2322
<orderEntry type="library" scope="RUNTIME" name="commons-logging" level="project" />
2423
<orderEntry type="library" scope="RUNTIME" name="cssparser" level="project" />
2524
<orderEntry type="library" exported="" name="guava-libraries" level="project" />
26-
<orderEntry type="library" name="google-protobuffers" level="project" />
2725
<orderEntry type="library" exported="" name="gson" level="project" />
2826
<orderEntry type="library" name="hamcrest" level="project" />
2927
<orderEntry type="library" name="htmlunit" level="project" />

java/client/src/org/openqa/selenium/build.desc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ java_library(name = "client-combined",
9797
"//java/client/src/org/openqa/selenium/safari",
9898
"//java/client/src/org/openqa/selenium/support",
9999
"//java/client/src/org/openqa/selenium/remote:augmenter",
100-
"//third_party/java/opera-driver",
101100
"//third_party/java/phantomjs-driver"
102101
])
103102

java/client/test/com/thoughtworks/selenium/InternalSelenseTestBase.java

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
2+
Copyright 2012-2015 Software Freedom Conservancy
23
Copyright 2012 Selenium committers
3-
Copyright 2012 Software Freedom Conservancy
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.
@@ -236,15 +236,8 @@ protected void before() throws Throwable {
236236
return;
237237
}
238238

239-
try {
240-
selenium.selectWindow("");
241-
selenium.windowFocus();
242-
} catch (SeleniumException e) {
243-
// TODO(simon): Window switching in Opera is picky.
244-
if (Browser.detect() != Browser.opera) {
245-
throw e;
246-
}
247-
}
239+
selenium.selectWindow("");
240+
selenium.windowFocus();
248241
}
249242
};
250243

java/client/test/com/thoughtworks/selenium/build.desc

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -67,18 +67,6 @@ java_test(name = "ie-emulation-test",
6767
"//cpp/iedriverserver:win32",
6868
])
6969

70-
java_test(name = "opera-emulation-test",
71-
test_suite = "com.thoughtworks.selenium.WebDriverSeleniumTestSuite",
72-
deps = [
73-
":rc-tests",
74-
],
75-
sysproperties = [
76-
{ "selenium.browser" : "opera" },
77-
],
78-
deps = [
79-
":rc-tests",
80-
])
81-
8270
java_test(name = "chrome-rc-test",
8371
test_suite = "com.thoughtworks.selenium.SeleniumRcTestSuite",
8472
sysproperties = [

java/client/test/com/thoughtworks/selenium/corebased/TestGet.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ public class TestGet extends InternalSelenseTestBase {
3030
public void testGet() throws Exception {
3131
// test API getters
3232
selenium.open("../tests/html/test_get.html");
33-
// IE uppercases the property names of the style. Both Opera and Firefox
34-
// lowercase the property names of the style. Both IE and Opera omit the
35-
// trailing semi-colon.
33+
// IE uppercases the property names of the style.
34+
// Firefox lowercases the property names of the style.
35+
// IE omits the trailing semi-colon.
3636
verifyTrue(Pattern.compile("(width|WIDTH): 644px; (height|HEIGHT): 41px(;?)")
3737
.matcher(selenium.getAttribute("//img[@alt='banner']@style")).find());
3838
// This asserts on the current behavior of selArrayToString(). Commas and

0 commit comments

Comments
 (0)