8273366: [testbug] javax/swing/UIDefaults/6302464/bug6302464.java fai…

…ls on macOS12 Reviewed-by: serb Backport-of: febcc72a549e973de4649503fc686fc520e3b3cd
openjdk · Dec 9, 2021 · 8878ffc74fef24516ed09b2c089a78d6d883399e · 8878ffc · openjdk-notifier · Dec 9, 2021
1 parent 554498d
commit 8878ffc74fef24516ed09b2c089a78d6d883399e
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/test/jdk/javax/swing/UIDefaults/6302464/bug6302464.java b/test/jdk/javax/swing/UIDefaults/6302464/bug6302464.java
@@ -119,7 +119,7 @@ private static void testAntialiasingHints() {
         setMetalLookAndFeel();
 
         boolean isMacOSX14 = false;
-        boolean isMacOSXBigSur = false;
+        boolean isMacOSXBigSurOrAbove = false;
         if (System.getProperty("os.name").contains("OS X")) {
             String version = System.getProperty("os.version", "");
             if (version.startsWith("10.")) {
@@ -133,11 +133,17 @@ private static void testAntialiasingHints() {
                     isMacOSX14 = (v >= 14);
                 } catch (NumberFormatException e) {
                 }
-            } else if (version.startsWith("11.")) {
-                isMacOSXBigSur = true;
+            } else {
+                String majorVersion = version.substring(0, version.indexOf("."));
+                System.out.println(majorVersion);
+                try {
+                    int ver = Integer.parseInt(majorVersion);
+                    isMacOSXBigSurOrAbove = (ver >= 11);
+                } catch (NumberFormatException e){
+                }
             }
         }
-        if (!isMacOSX14 && !isMacOSXBigSur) {
+        if (!isMacOSX14 && !isMacOSXBigSurOrAbove) {
             HashSet colorsAAOff = getAntialiasedColors(VALUE_TEXT_ANTIALIAS_OFF, 100);
 
             if (colorsAAOff.size() > 2) {