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

-9
This file was deleted.

.idea/libraries/google_protobuffers.xml

-9
This file was deleted.

.idea/libraries/operadriver.xml

-11
This file was deleted.

Rakefile

-2
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

-3
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

-2
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

-1
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

+3-10
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

-12
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

+3-3
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

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

+5-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2012 Software Freedom Conservancy
2+
Copyright 2012-2015 Software Freedom Conservancy
33
Copyright 2007-2012 Selenium committers
44
55
Licensed under the Apache License, Version 2.0 (the "License");
@@ -32,14 +32,12 @@
3232
import static org.openqa.selenium.testing.Ignore.Driver.HTMLUNIT;
3333
import static org.openqa.selenium.testing.Ignore.Driver.IE;
3434
import static org.openqa.selenium.testing.Ignore.Driver.MARIONETTE;
35-
import static org.openqa.selenium.testing.Ignore.Driver.OPERA;
3635
import static org.openqa.selenium.testing.Ignore.Driver.PHANTOMJS;
3736
import static org.openqa.selenium.testing.Ignore.Driver.SAFARI;
38-
import static org.openqa.selenium.testing.Ignore.Driver.OPERA_MOBILE;
39-
import static org.openqa.selenium.testing.TestUtilities.isFirefox;
40-
import static org.openqa.selenium.testing.TestUtilities.isNativeEventsEnabled;
4137
import static org.openqa.selenium.testing.TestUtilities.getEffectivePlatform;
4238
import static org.openqa.selenium.testing.TestUtilities.getFirefoxVersion;
39+
import static org.openqa.selenium.testing.TestUtilities.isFirefox;
40+
import static org.openqa.selenium.testing.TestUtilities.isNativeEventsEnabled;
4341

4442
import org.openqa.selenium.support.ui.ExpectedCondition;
4543
import org.openqa.selenium.support.ui.WebDriverWait;
@@ -53,7 +51,7 @@
5351

5452
import java.util.Set;
5553

56-
@Ignore({HTMLUNIT, OPERA, PHANTOMJS, SAFARI, OPERA_MOBILE, MARIONETTE})
54+
@Ignore({HTMLUNIT, PHANTOMJS, SAFARI, MARIONETTE})
5755
public class AlertsTest extends JUnit4TestBase {
5856

5957
private WebDriverWait wait;
@@ -460,7 +458,7 @@ public void testShouldHandleAlertOnWindowClose() {
460458
}
461459

462460
@JavascriptEnabled
463-
@Ignore(value = {CHROME, HTMLUNIT, OPERA})
461+
@Ignore(value = {CHROME, HTMLUNIT})
464462
@Test
465463
public void testIncludesAlertTextInUnhandledAlertException() {
466464
driver.findElement(By.id("alert")).click();

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

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/*
2+
Copyright 2015 Software Freedom Conservancy
23
Copyright 2012 Selenium committers
34
45
Licensed under the Apache License, Version 2.0 (the "License");
@@ -22,8 +23,6 @@
2223

2324
import static org.junit.Assert.assertEquals;
2425
import static org.junit.Assert.fail;
25-
import static org.openqa.selenium.testing.Ignore.Driver.OPERA;
26-
import static org.openqa.selenium.testing.Ignore.Driver.OPERA_MOBILE;
2726

2827
public class ClearTest extends JUnit4TestBase {
2928

@@ -49,7 +48,6 @@ public void testTextInputShouldNotClearWhenDisabled() {
4948
}
5049

5150
@Test
52-
@Ignore({OPERA, OPERA_MOBILE})
5351
public void testTextInputShouldNotClearWhenReadOnly() {
5452
try {
5553
driver.get(pages.readOnlyPage);
@@ -82,7 +80,6 @@ public void testTextAreaShouldNotClearWhenDisabled() {
8280
}
8381

8482
@Test
85-
@Ignore({OPERA, OPERA_MOBILE})
8683
public void testTextAreaShouldNotClearWhenReadOnly() {
8784
try {
8885
driver.get(pages.readOnlyPage);
@@ -94,13 +91,11 @@ public void testTextAreaShouldNotClearWhenReadOnly() {
9491
}
9592
}
9693

97-
@Ignore({OPERA_MOBILE})
9894
@Test
9995
public void testContentEditableAreaShouldClear() {
10096
driver.get(pages.readOnlyPage);
10197
WebElement element = driver.findElement(By.id("content-editable"));
10298
element.clear();
10399
assertEquals("", element.getText());
104100
}
105-
106101
}

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

+7-16
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
Copyright 2012 Selenium committers
3-
Copyright 2012 Software Freedom Conservancy
3+
Copyright 2012-2015 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.
@@ -15,7 +15,6 @@
1515
limitations under the License.
1616
*/
1717

18-
1918
package org.openqa.selenium;
2019

2120
import static org.hamcrest.Matchers.greaterThan;
@@ -29,7 +28,6 @@
2928
import static org.openqa.selenium.testing.Ignore.Driver.HTMLUNIT;
3029
import static org.openqa.selenium.testing.Ignore.Driver.IE;
3130
import static org.openqa.selenium.testing.Ignore.Driver.MARIONETTE;
32-
import static org.openqa.selenium.testing.Ignore.Driver.OPERA;
3331
import static org.openqa.selenium.testing.Ignore.Driver.PHANTOMJS;
3432
import static org.openqa.selenium.testing.Ignore.Driver.SAFARI;
3533

@@ -110,7 +108,6 @@ public void testShouldBeAbleToClickOnAnElementHiddenByYOverflow() {
110108
}
111109

112110
@JavascriptEnabled
113-
@Ignore({OPERA})
114111
@Test
115112
public void testShouldNotScrollOverflowElementsWhichAreVisible() {
116113
driver.get(appServer.whereIs("scroll2.html"));
@@ -152,8 +149,7 @@ public void testShouldScrollOverflowElementsIfClickPointIsOutOfViewButElementIsI
152149
}
153150

154151
@Test
155-
@Ignore(value = {OPERA, SAFARI, MARIONETTE},
156-
reason = "Opera: fails, others: not tested")
152+
@Ignore(value = {SAFARI, MARIONETTE}, reason = "others: not tested")
157153
public void testShouldBeAbleToClickElementInAFrameThatIsOutOfView() {
158154
try {
159155
driver.get(appServer.whereIs("scrolling_tests/page_with_frame_out_of_view.html"));
@@ -167,8 +163,7 @@ public void testShouldBeAbleToClickElementInAFrameThatIsOutOfView() {
167163
}
168164

169165
@Test
170-
@Ignore(value = {OPERA, SAFARI, MARIONETTE},
171-
reason = "Opera: fails, others: not tested")
166+
@Ignore(value = {SAFARI, MARIONETTE}, reason = "not tested")
172167
public void testShouldBeAbleToClickElementThatIsOutOfViewInAFrame() {
173168
try {
174169
driver.get(appServer.whereIs("scrolling_tests/page_with_scrolling_frame.html"));
@@ -195,8 +190,7 @@ public void testShouldNotBeAbleToClickElementThatIsOutOfViewInANonScrollableFram
195190
}
196191

197192
@Test
198-
@Ignore(value = {OPERA, SAFARI, MARIONETTE},
199-
reason = "Opera: fails, others: not tested")
193+
@Ignore(value = {SAFARI, MARIONETTE}, reason = "not tested")
200194
public void testShouldBeAbleToClickElementThatIsOutOfViewInAFrameThatIsOutOfView() {
201195
try {
202196
driver.get(appServer.whereIs("scrolling_tests/page_with_scrolling_frame_out_of_view.html"));
@@ -210,8 +204,7 @@ public void testShouldBeAbleToClickElementThatIsOutOfViewInAFrameThatIsOutOfView
210204
}
211205

212206
@Test
213-
@Ignore(value = {OPERA, SAFARI, MARIONETTE},
214-
reason = "Opera: fails, others: not tested")
207+
@Ignore(value = {SAFARI, MARIONETTE}, reason = "not tested")
215208
public void testShouldBeAbleToClickElementThatIsOutOfViewInANestedFrame() {
216209
try {
217210
driver.get(appServer.whereIs("scrolling_tests/page_with_nested_scrolling_frames.html"));
@@ -226,8 +219,7 @@ public void testShouldBeAbleToClickElementThatIsOutOfViewInANestedFrame() {
226219
}
227220

228221
@Test
229-
@Ignore(value = {OPERA, SAFARI, MARIONETTE},
230-
reason = "Opera: fails, others: not tested")
222+
@Ignore(value = {SAFARI, MARIONETTE}, reason = "not tested")
231223
public void testShouldBeAbleToClickElementThatIsOutOfViewInANestedFrameThatIsOutOfView() {
232224
try {
233225
driver.get(appServer.whereIs("scrolling_tests/page_with_nested_scrolling_frames_out_of_view.html"));
@@ -255,8 +247,7 @@ private long getScrollTop() {
255247
}
256248

257249
@Test
258-
@Ignore(value = {OPERA, SAFARI, MARIONETTE},
259-
reason = "Not tested")
250+
@Ignore(value = {SAFARI, MARIONETTE}, reason = "Not tested")
260251
public void testShouldBeAbleToClickElementInATallFrame() {
261252
try {
262253
driver.get(appServer.whereIs("scrolling_tests/page_with_tall_frame.html"));

0 commit comments

Comments
 (0)