Skip to content

Commit 3d0cb49

Browse files
committed
8234189: [TEST_BUG] Remove ignored and invalid graphics unit tests
Reviewed-by: kcr
1 parent dc01309 commit 3d0cb49

File tree

4 files changed

+3
-167
lines changed

4 files changed

+3
-167
lines changed

modules/javafx.graphics/src/test/java/test/com/sun/javafx/iio/ImageLoaderScalingTest.java

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,6 @@
3333
import java.io.IOException;
3434
import java.io.InputStream;
3535
import static org.junit.Assert.*;
36-
import org.junit.Ignore;
3736
import org.junit.Test;
3837

3938
public class ImageLoaderScalingTest {
@@ -154,12 +153,6 @@ public void testAllTheScalesBMP() throws Exception {
154153
testAllTheScales("bmp");
155154
}
156155

157-
@Ignore // libjpeg can scale the image itself and results are unpredictable
158-
@Test
159-
public void testAllTheScalesJPG() throws Exception {
160-
testAllTheScales("jpg");
161-
}
162-
163156
@Test
164157
public void testAllTheScalesGIF() throws Exception {
165158
testAllTheScales("gif");

modules/javafx.graphics/src/test/java/test/javafx/scene/input/PasteboardTest.java

Lines changed: 0 additions & 124 deletions
This file was deleted.

modules/javafx.graphics/src/test/java/test/javafx/scene/input/TouchEventTest.java

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -1532,27 +1532,6 @@ public void shouldThrowREOnLostRelease() {
15321532
((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventEnd();
15331533
}
15341534

1535-
// Reenable once indirect events are used
1536-
@Ignore("For now we've decided to ingore indirect events completely.")
1537-
@Test(expected=RuntimeException.class)
1538-
public void shouldThrowREOnLostIndirectRelease() {
1539-
Scene scene = createScene();
1540-
Rectangle rect =
1541-
(Rectangle) scene.getRoot().getChildrenUnmodifiable().get(0);
1542-
1543-
((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventBegin(
1544-
System.currentTimeMillis(), 1, false, false, false, false, false);
1545-
((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventNext(
1546-
TouchPoint.State.PRESSED, 1368, 110, 110, 110, 110);
1547-
((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventEnd();
1548-
1549-
((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventBegin(
1550-
System.currentTimeMillis(), 1, false, false, false, false, false);
1551-
((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventNext(
1552-
TouchPoint.State.PRESSED, 1, 110, 110, 110, 110);
1553-
((StubScene) SceneHelper.getPeer(scene)).getListener().touchEventEnd();
1554-
}
1555-
15561535
private Scene createScene() {
15571536
final Group root = new Group();
15581537

modules/javafx.graphics/src/test/java/test/javafx/scene/layout/BackgroundSizeTest.java

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -74,12 +74,6 @@ public void negativeWidthThrowsException2() {
7474
new BackgroundSize(-2, 1, true, true, false, false);
7575
}
7676

77-
@Ignore("Surprised that MIN_VALUE is not < 0")
78-
@Test(expected = IllegalArgumentException.class)
79-
public void negativeWidthThrowsException3() {
80-
new BackgroundSize(Double.MIN_VALUE, 1, true, true, false, false);
81-
}
82-
8377
@Ignore("Not handling positive infinity")
8478
@Test(expected = IllegalArgumentException.class)
8579
public void positiveInfinityWidthThrowsException() {
@@ -118,12 +112,6 @@ public void negativeHeightThrowsException2() {
118112
new BackgroundSize(1, -2, true, true, false, false);
119113
}
120114

121-
@Ignore("Surprised that MIN_VALUE is not < 0")
122-
@Test(expected = IllegalArgumentException.class)
123-
public void negativeHeightThrowsException3() {
124-
new BackgroundSize(1, Double.MIN_VALUE, true, true, false, false);
125-
}
126-
127115
@Ignore("Not handling positive infinity")
128116
@Test(expected = IllegalArgumentException.class)
129117
public void positiveInfinityHeightThrowsException() {

0 commit comments

Comments
 (0)