< prev index next >

test/jdk/java/awt/GraphicsDevice/CheckDisplayModes.java

Print this page

        

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, 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
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.

@@ -22,27 +22,25 @@
  */
 
 /*
  * @test
  * @key headful
- * @bug 8007146
+ * @bug 8007146 8213119
  * @summary [macosx] Setting a display mode crashes JDK under VNC
- * @author Alexander Scherbatiy
- * @run main CheckDisplayModes
  */
 import java.awt.DisplayMode;
 import java.awt.GraphicsDevice;
 import java.awt.GraphicsEnvironment;
 
 public class CheckDisplayModes {
 
     public static void main(String[] args) {
         GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
-        GraphicsDevice graphicDevice = ge.getDefaultScreenDevice();
+        for (GraphicsDevice graphicDevice : ge.getScreenDevices()) {
         if (!graphicDevice.isDisplayChangeSupported()) {
             System.err.println("Display mode change is not supported on this host. Test is considered passed.");
-            return;
+                continue;
         }
         DisplayMode defaultDisplayMode = graphicDevice.getDisplayMode();
         checkDisplayMode(defaultDisplayMode);
         graphicDevice.setDisplayMode(defaultDisplayMode);
 

@@ -58,10 +56,11 @@
 
         if (!isDefaultDisplayModeIncluded) {
             throw new RuntimeException("Default display mode is not included");
         }
     }
+    }
 
     static void checkDisplayMode(DisplayMode displayMode) {
         if (displayMode == null || displayMode.getWidth() <= 1 || displayMode.getHeight() <= 1) {
             throw new RuntimeException("invalid display mode");
         }
< prev index next >