8234194: [TEST_BUG] Reenable few graphics unit tests

Reviewed-by: kcr
openjdk · Nov 16, 2019 · 4f496d4 · 4f496d4
1 parent 927fc8a
commit 4f496d4
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 19 deletions.
diff --git a/.../src/test/java/test/com/sun/javafx/scene/layout/region/BackgroundRepeatConverterTest.java b/.../src/test/java/test/com/sun/javafx/scene/layout/region/BackgroundRepeatConverterTest.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
@@ -26,14 +26,13 @@
 package test.com.sun.javafx.scene.layout.region;
 
 import javafx.scene.layout.BackgroundRepeat;
-import org.junit.Ignore;
 import org.junit.Test;
 import javafx.css.ParsedValue;
 import com.sun.javafx.css.ParsedValueImpl;
 import com.sun.javafx.scene.layout.region.RepeatStruct;
 
 import static org.junit.Assert.assertEquals;
-import com.sun.javafx.scene.layout.region.RepeatStructConverter;
+import static org.junit.Assert.fail;
 import com.sun.javafx.scene.layout.region.RepeatStructConverter;
 
 /**
@@ -54,8 +53,8 @@ public class BackgroundRepeatConverterTest {
     /*
         -fx-background-repeat: null
      */
-    @Ignore ("this doesn't work, but I'm not sure what would happen with a null background-repeat in reality")
-    @Test public void scenario2() {
+    @Test
+    public void scenario2() {
         ParsedValue<String,BackgroundRepeat>[][] values = new ParsedValueImpl[][] {
                 {null}
         };
@@ -64,8 +63,12 @@ public class BackgroundRepeatConverterTest {
                 new ParsedValueImpl<ParsedValue<String,BackgroundRepeat>[][], RepeatStruct[]>(
                         values, null
                 );
-        RepeatStruct[] results = RepeatStructConverter.getInstance().convert(value, null);
-        assertEquals(0, results.length, 0);
+        try {
+            RepeatStruct[] results = RepeatStructConverter.getInstance().convert(value, null);
+            fail("Expected NullPointerException");
+        } catch (NullPointerException expected) {
+            // Test Pass, NPE is expected
+        }
     }
 
     /*

diff --git a/...x.graphics/src/test/java/test/com/sun/scenario/animation/shared/TimelineClipCoreTest.java b/...x.graphics/src/test/java/test/com/sun/scenario/animation/shared/TimelineClipCoreTest.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
@@ -39,7 +39,6 @@
 import javafx.util.Duration;
 
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import java.io.IOException;
@@ -181,7 +180,6 @@ public void write(int i) throws IOException {
         assertEquals(3, eventHandler.callCount);
     }
 
-    @Ignore
     @Test
     public void testJumpTo() {
         // jumpTo on stopped timeline

diff --git a/modules/javafx.graphics/src/test/java/test/javafx/css/Node_cssStyleMap_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/css/Node_cssStyleMap_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -65,7 +65,6 @@
 import org.junit.Ignore;
 import org.junit.Test;
 
-@Ignore
 public class Node_cssStyleMap_Test {
 
     public Node_cssStyleMap_Test() {
@@ -101,6 +100,7 @@ private void checkFoundStyle(Property<?> property, Map<StyleableProperty<?>, Lis
 
     }
 
+    @Ignore("JDK-8234241")
     @Test
     public void testStyleMap() {
 

diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/Node_cssMethods_Test.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/Node_cssMethods_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2016, 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
@@ -34,7 +34,6 @@
 import javafx.scene.shape.Rectangle;
 
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
@@ -49,7 +48,6 @@
 import javafx.scene.ImageCursor;
 import javafx.scene.Node;
 
-@Ignore ("pending RT-35594")
 @RunWith(Parameterized.class)
 public final class Node_cssMethods_Test extends CssMethodsTestBase {
     private static final Node TEST_NODE = new Rectangle();

diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/RegionCSSTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/RegionCSSTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -3375,7 +3375,6 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, image);
     }
 
-    @Ignore("I am not certain that supporting auto makes sense for us, and if it does, is it anything other than 1?")
     @Test public void borderImageWidth_auto() {
         region.setStyle(
                 "-fx-border-image-source: url('test/javafx/scene/layout/center-btn.png');" +
@@ -3397,7 +3396,6 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, image);
     }
 
-    @Ignore("I am not certain that supporting auto makes sense for us, and if it does, is it anything other than 1?")
     @Test public void borderImageWidth_1_auto() {
         region.setStyle(
                 "-fx-border-image-source: url('test/javafx/scene/layout/center-btn.png');" +
@@ -3418,7 +3416,6 @@ private static String dump(BackgroundPosition position) {
         assertEquals(expected, image);
     }
 
-    @Ignore("I am not certain that supporting auto makes sense for us, and if it does, is it anything other than 1?")
     @Test public void borderImageWidth_1_2Percent_auto() {
         region.setStyle(
                 "-fx-border-image-source: url('test/javafx/scene/layout/center-btn.png');" +