Skip to content

Commit

Permalink
server: remove ignore guards for Presto-Opera tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@andreastt
andreastt committed Mar 2, 2015
1 parent 1e55133 commit 27a959c
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 17 deletions.
6 changes: 2 additions & 4 deletions java/server/test/org/openqa/selenium/remote/server/SessionLogsTest.java
View file
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -20,8 +20,6 @@
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.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.SAFARI;

import com.google.common.base.Charsets;
Expand Down Expand Up @@ -55,7 +53,7 @@
import java.util.Map;
import java.util.Set;

@Ignore({CHROME, HTMLUNIT, IE, OPERA, OPERA_MOBILE, SAFARI})
@Ignore({CHROME, HTMLUNIT, IE, SAFARI})
public class SessionLogsTest extends JUnit4TestBase {

private static OutOfProcessSeleniumServer server;
Expand Down
8 changes: 4 additions & 4 deletions java/server/test/org/openqa/selenium/tests/TestGet.html
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<!--
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.
Expand Down Expand Up @@ -35,9 +35,9 @@
<td>&nbsp;</td>
</tr>

<!-- 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. -->
<tr>
<td>verifyAttribute</td>
<td>//img[@alt='banner']@style</td>
Expand Down
15 changes: 7 additions & 8 deletions java/server/test/org/openqa/selenium/tests/TestSuite.html
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
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.
Expand Down Expand Up @@ -70,11 +70,10 @@
<tr><td><a href="./TestFramesOpen.html">TestFramesOpen</a></td></tr>
<tr><td><a href="./TestFramesNested.html">TestFramesNested</a></td></tr>
<tr><td><a href="./TestFramesClick.html">TestFramesClick</a></td></tr>
<tr unless="browserVersion.isOpera"><td><a href="./TestFramesSpecialTargets.html">TestFramesSpecialTargets</a></td></tr>
<tr unless="browserVersion.isOpera"><td><a href="./TestClickBlankTarget.html">TestClickBlankTarget</a></td></tr>
<tr><td><a href="./TestFramesSpecialTargets.html">TestFramesSpecialTargets</a></td></tr>
<tr><td><a href="./TestClickBlankTarget.html">TestClickBlankTarget</a></td></tr>
<tr><td><a href="./TestSelectMultiLevelFrame.html">TestSelectMultiLevelFrame</a></td></tr>
<tr><td><a href="./TestOpenInTargetFrame.html">TestOpenInTargetFrame</a></td></tr>


<tr unless="isFileURL()"><td><a href="./TestCookie.html">TestCookie</a></td></tr>
<tr><td><a href="./TestEval.html">TestEval</a></td></tr>
Expand Down Expand Up @@ -118,23 +117,23 @@
<tr><td><a href="./TestRollup.html">TestRollup</a></td></tr>
<tr unless="DISABLED"><td><a href="./TestXPathLocatorInXHtml.html">TestXPathLocatorInXHtml</a></td></tr>
<tr unless="browserVersion.isKonqueror || browserVersion.isSafari || browserVersion.isHTA"><td><a href="./TestGoBack.html">TestGoBack</a></td></tr>
<tr unless="browserVersion.isOpera"><td><a href="./TestRefresh.html">TestRefresh</a></td></tr>
<tr><td><a href="./TestRefresh.html">TestRefresh</a></td></tr>

<tr><td><a href="./TestHtmlSource.html">TestHtmlSource</a></td></tr>
<tr><td><a href="./TestComments.html">TestComments</a></td></tr>
<tr><td><a href="./events/TestLinkEvents.html">TestLinkEvents</a></td></tr>
<tr><td><a href="./events/TestButtonEvents.html">TestButtonEvents</a></td></tr>
<tr><td><a href="./events/TestSelectEvents.html">TestSelectEvents</a></td></tr>
<tr unless="browserVersion.isOpera"><td><a href="./events/TestRadioEvents.html">TestRadioEvents</a></td></tr>
<tr unless="browserVersion.isOpera"><td><a href="./events/TestCheckboxEvents.html">TestCheckboxEvents</a></td></tr>
<tr><td><a href="./events/TestRadioEvents.html">TestRadioEvents</a></td></tr>
<tr><td><a href="./events/TestCheckboxEvents.html">TestCheckboxEvents</a></td></tr>
<tr><td><a href="./events/TestTextEvents.html">TestTextEvents</a></td></tr>
<tr><td><a href="./events/TestFireEvents.html">TestFireEvents</a></td></tr>
<tr><td><a href="./TestFocusOnBlur.html">TestFocusOnBlur</a></td></tr>
<tr><td><a href="./TestAlerts.html">TestAlerts</a></td></tr>
<tr><td><a href="./TestConfirmations.html">TestConfirmations</a></td></tr>
<tr><td><a href="./TestPrompt.html">TestPrompt</a></td></tr>
<tr><td><a href="./TestEditable.html">TestEditable</a></td></tr>
<tr unless="browserVersion.isFirefox || browserVersion.isOpera || browserVersion.isMozilla || browserVersion.isKonqueror || browserVersion.isSafari"><td><a href="./TestCursorPosition.html">TestCursorPosition</a></td></tr>
<tr unless="browserVersion.isFirefox || browserVersion.isMozilla || browserVersion.isKonqueror || browserVersion.isSafari"><td><a href="./TestCursorPosition.html">TestCursorPosition</a></td></tr>
<tr unless="browserVersion.isKonqueror || browserVersion.isSafari"><td><a href="./TestDragAndDrop.html">TestDragAndDrop</a></td></tr>
<tr unless="(isFileURL() && browserVersion.isIE) || browserVersion.isKonqueror || browserVersion.isSafari"><td><a href="./TestDojoDragAndDrop.html">TestDojoDragAndDrop</a></td></tr>

Expand Down
2 changes: 1 addition & 1 deletion java/server/test/org/openqa/selenium/tests/html/test_funky_event_handling.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
}
};

if (window.addEventListener && !window.opera) {
if (window.addEventListener) {
parent.addEventListener("click", handler, false);
} else if (window.attachEvent) {
parent.attachEvent("onclick", handler);
Expand Down

0 comments on commit 27a959c

Please sign in to comment.