Skip to content

Commit 59f98c1

Browse files
committed
8226933: [TEST_BUG]GTK L&F: There is no swatches or RGB tab in JColorChooser
Backport-of: 5c4f1ef746b0c373a131726d74d27f0e0cc6e40d
1 parent 7c825dd commit 59f98c1

File tree

2 files changed

+75
-3
lines changed

2 files changed

+75
-3
lines changed

test/jdk/javax/swing/JColorChooser/Test4887836.java

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,12 @@
2626
import javax.swing.JColorChooser;
2727
import javax.swing.UIManager;
2828

29+
import jtreg.SkippedException;
30+
2931
/*
3032
* @test
3133
* @bug 4887836
32-
* @library /java/awt/regtesthelpers
34+
* @library /java/awt/regtesthelpers /test/lib
3335
* @build PassFailJFrame
3436
* @summary Checks for white area under the JColorChooser Swatch tab
3537
* @run main/manual Test4887836
@@ -38,16 +40,21 @@
3840
public class Test4887836 {
3941

4042
public static void main(String[] args) throws Exception {
43+
44+
// ColorChooser UI design is different for GTK L&F.
45+
// There is no Swatches tab available for GTK L&F, skip the testing.
46+
if (UIManager.getLookAndFeel().getName().contains("GTK")) {
47+
throw new SkippedException("Test not applicable for GTK L&F");
48+
}
49+
4150
String instructions = """
4251
If you do not see white area under the \"Swatches\" tab,
4352
then test passed, otherwise it failed.""";
4453

4554
PassFailJFrame.builder()
4655
.title("Test4759306")
4756
.instructions(instructions)
48-
.rows(5)
4957
.columns(40)
50-
.testTimeOut(10)
5158
.testUI(Test4887836::createColorChooser)
5259
.build()
5360
.awaitAndCheck();
Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
/*
2+
* Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* This code is free software; you can redistribute it and/or modify it
6+
* under the terms of the GNU General Public License version 2 only, as
7+
* published by the Free Software Foundation.
8+
*
9+
* This code is distributed in the hope that it will be useful, but WITHOUT
10+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11+
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
12+
* version 2 for more details (a copy is included in the LICENSE file that
13+
* accompanied this code).
14+
*
15+
* You should have received a copy of the GNU General Public License version
16+
* 2 along with this work; if not, write to the Free Software Foundation,
17+
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18+
*
19+
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20+
* or visit www.oracle.com if you need additional information or have any
21+
* questions.
22+
*/
23+
24+
import java.awt.Color;
25+
import javax.swing.JColorChooser;
26+
import javax.swing.UIManager;
27+
28+
import jtreg.SkippedException;
29+
30+
/*
31+
* @test
32+
* @bug 4419255
33+
* @library /java/awt/regtesthelpers /test/lib
34+
* @build PassFailJFrame
35+
* @summary Tests if Metal Slider's thumb isn't clipped
36+
* @run main/manual bug4419255
37+
*/
38+
39+
public class bug4419255 {
40+
41+
public static void main(String[] args) throws Exception {
42+
43+
// ColorChooser UI design is different for GTK L&F.
44+
// There is no RGB tab available for GTK L&F, skip the testing.
45+
if (UIManager.getLookAndFeel().getName().contains("GTK")) {
46+
throw new SkippedException("Test not applicable for GTK L&F");
47+
}
48+
String instructions = """
49+
Choose RGB tab. If sliders' thumbs are painted correctly
50+
(top is not clipped, black line is visible),
51+
then test passed. Otherwise it failed.""";
52+
53+
PassFailJFrame.builder()
54+
.title("bug4419255")
55+
.instructions(instructions)
56+
.columns(40)
57+
.testUI(bug4419255::createColorChooser)
58+
.build()
59+
.awaitAndCheck();
60+
}
61+
62+
private static JColorChooser createColorChooser() {
63+
return new JColorChooser(Color.BLUE);
64+
}
65+
}

0 commit comments

Comments
 (0)