From c7c53d016e3f9c825f6896c46f1702a598da228b Mon Sep 17 00:00:00 2001
From: Prasanta Sadhukhan <psadhukhan@openjdk.org>
Date: Sat, 19 Dec 2020 12:00:18 +0000
Subject: [PATCH] 8258554: javax/swing/JTable/4235420/bug4235420.java fails in
 GTK L&F

Reviewed-by: serb
---
 test/jdk/ProblemList.txt                      |  1 -
 .../swing/JTable/4235420/bug4235420.java      | 40 +++++++++++++------
 2 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index 0c56886100f..0a466d2ee75 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -731,7 +731,6 @@ javax/swing/JWindow/ShapedAndTranslucentWindows/TranslucentJComboBox.java 802462
 # The next test below is an intermittent failure
 javax/swing/JComboBox/8033069/bug8033069ScrollBar.java 8163367 generic-all
 javax/swing/JColorChooser/Test6827032.java 8197825 windows-all
-javax/swing/JTable/4235420/bug4235420.java     8079127 generic-all
 javax/swing/JSplitPane/4201995/bug4201995.java 8079127 generic-all
 javax/swing/JTree/DnD/LastNodeLowerHalfDrop.java 8159131 linux-all
 javax/swing/JTree/4633594/JTreeFocusTest.java 8173125 macosx-all
diff --git a/test/jdk/javax/swing/JTable/4235420/bug4235420.java b/test/jdk/javax/swing/JTable/4235420/bug4235420.java
index dafd5ca58d2..7e613a910ea 100644
--- a/test/jdk/javax/swing/JTable/4235420/bug4235420.java
+++ b/test/jdk/javax/swing/JTable/4235420/bug4235420.java
@@ -37,20 +37,34 @@ import java.util.Map;
 public class bug4235420 {
 
     public static void main(String[] argv) throws Exception {
-        if ("Nimbus".equals(UIManager.getLookAndFeel().getName())) {
-            System.out.println("The test is skipped for Nimbus");
-
-            return;
-        }
-
-        SwingUtilities.invokeAndWait(new Runnable() {
-            @Override
-            public void run() {
-                Table table = new Table();
-
-                table.test();
+        for (UIManager.LookAndFeelInfo LF :
+                UIManager.getInstalledLookAndFeels()) {
+            try {
+                UIManager.setLookAndFeel(LF.getClassName());
+            } catch (UnsupportedLookAndFeelException ignored) {
+                System.out.println("Unsupported L&F: " + LF.getClassName());
+            } catch (ClassNotFoundException | InstantiationException
+                     | IllegalAccessException e) {
+                throw new RuntimeException(e);
             }
-        });
+            System.out.println("Testing L&F: " + LF.getClassName());
+
+            if ("Nimbus".equals(UIManager.getLookAndFeel().getName()) ||
+                "GTK".equals(UIManager.getLookAndFeel().getName())) {
+                System.out.println("The test is skipped for Nimbus and GTK");
+
+                continue;
+            }
+
+            SwingUtilities.invokeAndWait(new Runnable() {
+                @Override
+                public void run() {
+                    Table table = new Table();
+
+                    table.test();
+                }
+            });
+        }
     }
 
     private static class Table extends JTable {