[java] Unignoring tests fixed in Safari TP 73

SeleniumHQ · Jan 19, 2019 · 7670f20 · 7670f20
1 parent 8b9ca40
commit 7670f20
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 15 deletions.
diff --git a/java/client/test/org/openqa/selenium/PositionAndSizeTest.java b/java/client/test/org/openqa/selenium/PositionAndSizeTest.java
@@ -39,7 +39,6 @@
 public class PositionAndSizeTest extends JUnit4TestBase {
 
   @Test
-  @NotYetImplemented(SAFARI)
   public void testShouldBeAbleToDetermineTheLocationOfAnElement() {
     driver.get(pages.xhtmlTestPage);
 
@@ -51,47 +50,41 @@ public void testShouldBeAbleToDetermineTheLocationOfAnElement() {
   }
 
   @Test
-  @NotYetImplemented(SAFARI)
   public void testShouldGetCoordinatesOfAnElement() {
     driver.get(appServer.whereIs("coordinates_tests/simple_page.html"));
     assertThat(getLocationInViewPort(By.id("box"))).isEqualTo(new Point(10, 10));
     assertThat(getLocationOnPage(By.id("box"))).isEqualTo(new Point(10, 10));
   }
 
   @Test
-  @NotYetImplemented(SAFARI)
   public void testShouldGetCoordinatesOfAnEmptyElement() {
     driver.get(appServer.whereIs("coordinates_tests/page_with_empty_element.html"));
     assertThat(getLocationInViewPort(By.id("box"))).isEqualTo(new Point(10, 10));
     assertThat(getLocationOnPage(By.id("box"))).isEqualTo(new Point(10, 10));
   }
 
   @Test
-  @NotYetImplemented(SAFARI)
   public void testShouldGetCoordinatesOfATransparentElement() {
     driver.get(appServer.whereIs("coordinates_tests/page_with_transparent_element.html"));
     assertThat(getLocationInViewPort(By.id("box"))).isEqualTo(new Point(10, 10));
     assertThat(getLocationOnPage(By.id("box"))).isEqualTo(new Point(10, 10));
   }
 
   @Test
-  @NotYetImplemented(SAFARI)
   public void testShouldGetCoordinatesOfAHiddenElement() {
     driver.get(appServer.whereIs("coordinates_tests/page_with_hidden_element.html"));
     assertThat(getLocationInViewPort(By.id("box"))).isEqualTo(new Point(10, 10));
     assertThat(getLocationOnPage(By.id("box"))).isEqualTo(new Point(10, 10));
   }
 
   @Test
-  @NotYetImplemented(SAFARI)
   public void testShouldGetCoordinatesOfAnInvisibleElement() {
     driver.get(appServer.whereIs("coordinates_tests/page_with_invisible_element.html"));
     assertThat(getLocationInViewPort(By.id("box"))).isEqualTo(new Point(0, 0));
     assertThat(getLocationOnPage(By.id("box"))).isEqualTo(new Point(0, 0));
   }
 
   @Test
-  @NotYetImplemented(SAFARI)
   public void testShouldScrollPageAndGetCoordinatesOfAnElementThatIsOutOfViewPort() {
     driver.get(appServer.whereIs("coordinates_tests/page_with_element_out_of_view.html"));
     int windowHeight = driver.manage().window().getSize().getHeight();
@@ -138,7 +131,6 @@ public void testShouldGetCoordinatesInViewPortOfAnElementInANestedFrame() {
 
   @Test
   @Ignore(FIREFOX)
-  @NotYetImplemented(SAFARI)
   public void testShouldGetCoordinatesOfAnElementWithFixedPosition() {
     assumeFalse("Ignoring fixed-position elements in IE6", TestUtilities.isIe6(driver));
     driver.get(appServer.whereIs("coordinates_tests/page_with_fixed_element.html"));

diff --git a/java/client/test/org/openqa/selenium/TextHandlingTest.java b/java/client/test/org/openqa/selenium/TextHandlingTest.java
@@ -373,6 +373,7 @@ public void testShouldGetTextWhichIsAValidComplexJSONObject() {
 
   @Test
   @NotYetImplemented(HTMLUNIT)
+  @NotYetImplemented(SAFARI)
   public void testShouldNotReturnLtrMarks() {
     driver.get(pages.unicodeLtrPage);
     WebElement element = driver.findElement(By.id("EH")).findElement(By.tagName("nobr"));

diff --git a/java/client/test/org/openqa/selenium/interactions/DragAndDropTest.java b/java/client/test/org/openqa/selenium/interactions/DragAndDropTest.java
@@ -47,7 +47,6 @@
 public class DragAndDropTest extends JUnit4TestBase {
 
   @Test
-  @NotYetImplemented(SAFARI)
   public void testDragAndDropRelative() {
     assumeFalse(Browser.detect() == Browser.OPERA &&
                 TestUtilities.getEffectivePlatform().is(Platform.WINDOWS));
@@ -66,7 +65,6 @@ public void testDragAndDropRelative() {
   }
 
   @Test
-  @NotYetImplemented(SAFARI)
   public void testDragAndDropToElement() {
     driver.get(pages.dragAndDropPage);
     WebElement img1 = driver.findElement(By.id("test1"));
@@ -77,7 +75,6 @@ public void testDragAndDropToElement() {
 
   @SwitchToTopAfterTest
   @Test
-  @NotYetImplemented(SAFARI)
   public void testDragAndDropToElementInIframe() {
     driver.get(pages.iframePage);
     final WebElement iframe = driver.findElement(By.tagName("iframe"));
@@ -92,7 +89,6 @@ public void testDragAndDropToElementInIframe() {
 
   @SwitchToTopAfterTest
   @Test
-  @NotYetImplemented(SAFARI)
   public void testDragAndDropElementWithOffsetInIframeAtBottom() {
     driver.get(appServer.whereIs("iframeAtBottom.html"));
 
@@ -123,7 +119,6 @@ public void testDragAndDropElementWithOffsetInScrolledDiv() {
   }
 
   @Test
-  @NotYetImplemented(SAFARI)
   public void testElementInDiv() {
     driver.get(pages.dragAndDropPage);
     WebElement img = driver.findElement(By.id("test3"));
@@ -180,6 +175,7 @@ private void drag(WebElement elem, Point expectedLocation,
   }
 
   @Test
+  @NotYetImplemented(SAFARI)
   public void testDragAndDropOnJQueryItems() {
     driver.get(pages.droppableItems);
 

diff --git a/java/client/test/org/openqa/selenium/testing/drivers/WebDriverBuilder.java b/java/client/test/org/openqa/selenium/testing/drivers/WebDriverBuilder.java
@@ -72,10 +72,9 @@ static void addShutdownAction(Runnable action) {
         }
         return options;
       })
-      .put(Browser.SAFARI, SafariOptions::new)
       .put(Browser.HTMLUNIT, DesiredCapabilities::htmlUnit)
       .put(Browser.OPERABLINK, OperaOptions::new)
-      .put(Browser.OPERA, () -> {
+      .put(Browser.SAFARI, () -> {
         SafariOptions options = new SafariOptions();
         if (Boolean.getBoolean("selenium.safari.tp")) {
           options.setUseTechnologyPreview(true);