8234239: [TEST_BUG] Reenable few ignored web tests

Reviewed-by: kcr

Author: arun-joseph

modules/javafx.web/src/test/java/test/com/sun/webkit/network/CookieManagerTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,7 +37,6 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
-import org.junit.Ignore;
 import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
@@ -407,10 +406,7 @@ public void testPutOverwrite() {
 
     /**
      * Tests if put() correctly overwrites expired cookie.
-     * This test is disabled because it takes considerable amount of time
-     * to run.
      */
-    @Ignore
     @Test
     public void testPutOverwriteExpired() {
         put("http://example.org/", "foo=bar; Max-Age=1; HttpOnly");
@@ -497,10 +493,7 @@ public void testPutPurgeDomain3() {
     /**
      * Tests if put() correctly purges individual domains
      * and takes into account cookie expiry.
-     * This test is disabled because it takes considerable amount of time
-     * to run.
      */
-    @Ignore
     @Test
     public void testPutPurgeDomainAfterExpiry() {
         for (int i = 0; i < 25; i++) {
@@ -547,10 +540,7 @@ public void testPutPurgeCookiesGlobally1() {
 
     /**
      * Tests if put() correctly purges cookies globally.
-     * This test is disabled because it takes considerable amount of time
-     * to run.
      */
-    @Ignore
     @Test
     public void testPutPurgeCookiesGlobally2() {
         String urip = "http://example%d.org/";
@@ -579,10 +569,7 @@ public void testPutPurgeCookiesGlobally2() {
 
     /**
      * Tests if put() correctly purges cookies globally.
-     * This test is disabled because it takes considerable amount of time
-     * to run.
      */
-    @Ignore
     @Test
     public void testPutPurgeCookiesGlobally3() {
         String urip = "http://example%d.org/";
@@ -612,10 +599,7 @@ public void testPutPurgeCookiesGlobally3() {
     /**
      * Tests if put() correctly purges cookies globally and takes
      * into account cookie expiry.
-     * This test is disabled because it takes considerable amount of time
-     * to run.
      */
-    @Ignore
     @Test
     public void testPutPurgeCookiesGloballyAfterExpiry() {
         String urip = "http://example%d.org/";

modules/javafx.web/src/test/java/test/javafx/scene/web/CallbackTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,7 +42,6 @@
 import javafx.scene.web.WebEvent;
 import javafx.util.Callback;
 
-import org.junit.Ignore;
 import org.junit.Test;
 
 
@@ -88,7 +87,6 @@ private void clear() {
         popupUi.clear();
     }
 
-    @Ignore("RT-34508")
     @Test public void testDefaultPopup() {
         clear();
         executeScript(JS_OPEN_DEFAULT);
@@ -106,7 +104,6 @@ private void checkDefaultPopup() {
         popupUi.checkCalled(VISIBILITY_CHANGED, true);
     }
 
-    @Ignore("RT-34508")
     @Test public void testCustomPopup() {
         clear();
         executeScript(JS_OPEN);

modules/javafx.web/src/test/java/test/javafx/scene/web/LeakTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -45,7 +45,6 @@
 import javafx.scene.web.WebView;
 import javafx.util.Duration;
 import netscape.javascript.JSObject;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -56,7 +55,6 @@ public class LeakTest extends TestBase {
 
     private static final int SLEEP_TIME = 1000;
 
-    @Ignore // RT-26710: javafx.scene.web.LeakTest hangs
     @Test public void testOleg() throws InterruptedException{
         final String URL = new File("src/test/resources/test/html/guimark2-vector.html").toURI().toASCIIString();
         final int CYCLE_COUNT = 16;
@@ -65,7 +63,7 @@ public class LeakTest extends TestBase {
 
         Timeline time = new Timeline();
         time.setCycleCount(CYCLE_LENGTH * CYCLE_COUNT);
-        time.getKeyFrames().add(new KeyFrame(Duration.millis(1000), new EventHandler<ActionEvent>() {
+        time.getKeyFrames().add(new KeyFrame(Duration.millis(200), new EventHandler<ActionEvent>() {
             int counter = -1;
             @Override public void handle(final ActionEvent e) {
                 ++counter;
@@ -82,7 +80,6 @@ public class LeakTest extends TestBase {
         latch.await();
     }
 
-    @Ignore // RT-26710: javafx.scene.web.LeakTest hangs
     @Test public void testGarbageCollectability() throws InterruptedException {
         final BlockingQueue<WeakReference<WebPage>> webPageRefQueue =
                 new LinkedBlockingQueue<WeakReference<WebPage>>();

modules/javafx.web/src/test/java/test/javafx/scene/web/MiscellaneousTest.java

@@ -91,7 +91,6 @@ private static final class DummyClass {
         private static int dummyField;
     }
 
-    @org.junit.Ignore
     @Test public void testRT30835() throws Exception {
         class Record {
             private final Document document;