8234189: [TEST_BUG] Remove ignored and invalid graphics unit tests

Reviewed-by: kcr
openjdk · Nov 15, 2019 · 3d0cb49 · 3d0cb49
1 parent dc01309
commit 3d0cb49
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 167 deletions.
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/iio/ImageLoaderScalingTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/iio/ImageLoaderScalingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -33,7 +33,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import static org.junit.Assert.*;
-import org.junit.Ignore;
 import org.junit.Test;
 
 public class ImageLoaderScalingTest {
@@ -154,12 +153,6 @@ public void testAllTheScalesBMP() throws Exception {
         testAllTheScales("bmp");
     }
 
-    @Ignore // libjpeg can scale the image itself and results are unpredictable
-    @Test
-    public void testAllTheScalesJPG() throws Exception {
-        testAllTheScales("jpg");
-    }
-
     @Test
     public void testAllTheScalesGIF() throws Exception {
         testAllTheScales("gif");

diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/input/PasteboardTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/input/PasteboardTest.java
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/input/TouchEventTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/input/TouchEventTest.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
@@ -1532,27 +1532,6 @@ public void shouldThrowREOnLostRelease() {
         ((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventEnd();
     }
 
-    // Reenable once indirect events are used
-    @Ignore("For now we've decided to ingore indirect events completely.")
-    @Test(expected=RuntimeException.class)
-    public void shouldThrowREOnLostIndirectRelease() {
-        Scene scene = createScene();
-        Rectangle rect =
-                (Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0);
-
-        ((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventBegin(
-                System.currentTimeMillis(), 1, false, false, false, false, false);
-        ((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventNext(
-                TouchPoint.State.PRESSED, 1368, 110, 110, 110, 110);
-        ((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventEnd();
-
-        ((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventBegin(
-                System.currentTimeMillis(), 1, false, false, false, false, false);
-        ((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventNext(
-                TouchPoint.State.PRESSED, 1, 110, 110, 110, 110);
-        ((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventEnd();
-    }
-
     private Scene createScene() {
         final Group root = new Group();
 

diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BackgroundSizeTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BackgroundSizeTest.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
@@ -74,12 +74,6 @@ public void negativeWidthThrowsException2() {
         new BackgroundSize(-2, 1, true, true, false, false);
     }
 
-    @Ignore("Surprised that MIN_VALUE is not < 0")
-    @Test(expected = IllegalArgumentException.class)
-    public void negativeWidthThrowsException3() {
-        new BackgroundSize(Double.MIN_VALUE, 1, true, true, false, false);
-    }
-
     @Ignore("Not handling positive infinity")
     @Test(expected = IllegalArgumentException.class)
     public void positiveInfinityWidthThrowsException() {
@@ -118,12 +112,6 @@ public void negativeHeightThrowsException2() {
         new BackgroundSize(1, -2, true, true, false, false);
     }
 
-    @Ignore("Surprised that MIN_VALUE is not < 0")
-    @Test(expected = IllegalArgumentException.class)
-    public void negativeHeightThrowsException3() {
-        new BackgroundSize(1, Double.MIN_VALUE, true, true, false, false);
-    }
-
     @Ignore("Not handling positive infinity")
     @Test(expected = IllegalArgumentException.class)
     public void positiveInfinityHeightThrowsException() {