infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-01-28 12:09:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

8366369: Add @requires linux for GTK L&F tests

Browse Source 
Reviewed-by: serb, prr, tr
This commit is contained in:
Alexey Ivanov 2025-09-22 15:08:45 +00:00
parent 2b28c28384
commit e365b7d69c
3 changed files with 50 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
test/jdk/com/sun/java/swing/plaf/gtk/4928019/bug4928019.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2025, 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,25 +26,25 @@
* @bug 4928019
* @key headful
* @summary Makes sure all the basic classes can be created with GTK.
* @author Scott Violet
* @requires (os.family != "windows" & os.family != "mac")
* @library /test/lib
* @build jtreg.SkippedException
* @run main bug4928019
*/
import javax.swing.*;
import javax.swing.plaf.basic.*;
import jtreg.SkippedException;
public class bug4928019 {
public static void main(String[] args) throws Throwable {
try {
UIManager.setLookAndFeel("com.sun.java.swing.plaf.gtk.GTKLookAndFeel");
} catch (UnsupportedLookAndFeelException ex) {
System.err.println("GTKLookAndFeel is not supported on this platform." +
" Test is considered passed.");
return;
} catch (ClassNotFoundException ex) {
System.err.println("GTKLookAndFeel class is not found." +
" Test is considered passed.");
return;
} catch (Exception e) {
throw new SkippedException("GTKLookAndFeel isn't supported", e);
}
new JButton() {
public void updateUI() {
setUI(new BasicButtonUI());

36
test/jdk/com/sun/java/swing/plaf/gtk/Test6635110.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2008, 2025, 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
@ -21,18 +21,28 @@
* questions.
*/
/* @test
@bug 6635110
@key headful
@summary GTK icons should not throw NPE when called by non-GTK UI
@author Peter Zhelezniakov
@run main Test6635110
/*
* @test
* @bug 6635110
* @key headful
* @summary GTK icons should not throw NPE when called by non-GTK UI
* @requires (os.family != "windows" & os.family != "mac")
* @library /test/lib
* @build jtreg.SkippedException
* @run main Test6635110
*/
import javax.swing.*;
import java.awt.*;
import java.awt.Component;
import java.awt.image.BufferedImage;
import javax.swing.plaf.basic.*;
import javax.swing.JMenu;
import javax.swing.JToolBar;
import javax.swing.SwingUtilities;
import javax.swing.UIManager;
import javax.swing.plaf.basic.BasicMenuUI;
import javax.swing.plaf.basic.BasicToolBarUI;
import jtreg.SkippedException;
public class Test6635110 implements Runnable {
@ -53,7 +63,7 @@ public class Test6635110 implements Runnable {
paint(tb);
}
void paint(Component c) {
private void paint(Component c) {
c.setSize(WIDTH, HEIGHT);
c.paint(IMAGE.getGraphics());
}
@ -62,9 +72,9 @@ public class Test6635110 implements Runnable {
try {
UIManager.setLookAndFeel("com.sun.java.swing.plaf.gtk.GTKLookAndFeel");
} catch (Exception e) {
System.out.println("GTKLookAndFeel cannot be set, skipping this test");
return;
throw new SkippedException("GTKLookAndFeel isn't supported", e);
}
SwingUtilities.invokeAndWait(new Test6635110());
}
}

30
test/jdk/com/sun/java/swing/plaf/gtk/Test6963870.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2010, 2025, 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
@ -21,23 +21,28 @@
* questions.
*/
/* @test
@bug 6963870
@key headful
@summary Tests that GTKPainter.ListTableFocusBorder.getBorderInsets()
doesn't return null
@author Peter Zhelezniakov
@run main Test6963870
*/
/*
* @test
* @bug 6963870
* @key headful
* @summary Tests that GTKPainter.ListTableFocusBorder.getBorderInsets()
* doesn't return null
* @requires (os.family != "windows" & os.family != "mac")
* @library /test/lib
* @build jtreg.SkippedException
* @run main Test6963870
*/
import java.awt.Insets;
import javax.swing.SwingUtilities;
import javax.swing.UIManager;
import javax.swing.border.Border;
import jtreg.SkippedException;
public class Test6963870 implements Runnable {
final static String[] UI_NAMES = {
static final String[] UI_NAMES = {
"List.focusCellHighlightBorder",
"List.focusSelectedCellHighlightBorder",
"List.noFocusBorder",
@ -45,6 +50,7 @@ public class Test6963870 implements Runnable {
"Table.focusSelectedCellHighlightBorder",
};
@Override
public void run() {
for (String uiName: UI_NAMES) {
test(uiName);
@ -63,11 +69,9 @@ public class Test6963870 implements Runnable {
try {
UIManager.setLookAndFeel("com.sun.java.swing.plaf.gtk.GTKLookAndFeel");
} catch (Exception e) {
System.out.println("GTKLookAndFeel cannot be set, skipping this test");
return;
throw new SkippedException("GTKLookAndFeel isn't supported", e);
}
SwingUtilities.invokeAndWait(new Test6963870());
}
}