Skip to content

Commit

Permalink
8328368: Convert java/awt/image/multiresolution/MultiDisplayTest/Mult…
Browse files Browse the repository at this point in the history
…iDisplayTest.java applet test to main

Backport-of: ba05c6d
  • Loading branch information
GoeLin committed Jan 10, 2025
1 parent 4dab8ba commit 36481dd
Show file tree
Hide file tree
Showing 2 changed files with 78 additions and 116 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2024, 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
Expand All @@ -21,63 +21,99 @@
* questions.
*/

import java.awt.Color;
import java.awt.Dialog;
import java.awt.Font;
import java.awt.Frame;
import java.awt.Graphics;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.awt.image.BaseMultiResolutionImage;
import java.awt.image.BufferedImage;

/*
@test
@bug 8142861 8143062 8147016
@summary Check if multiresolution image behaves properly
on HiDPI + non-HiDPI display pair.
@author a.stepanov
@library /test/lib
@build jdk.test.lib.Platform
@run applet/manual=yesno MultiDisplayTest.html
*/


import java.applet.Applet;
import java.awt.*;
import java.awt.event.*;
import java.awt.image.*;
import javax.swing.JButton;

import jdk.test.lib.Platform;
import jtreg.SkippedException;

public class MultiDisplayTest extends Applet {
/*
* @test
* @bug 8142861 8143062 8147016
* @library /java/awt/regtesthelpers /test/lib
* @build PassFailJFrame jdk.test.lib.Platform
* @requires (os.family == "windows" | os.family == "mac")
* @summary Check if multiresolution image behaves properly
* on HiDPI + non-HiDPI display pair.
* @run main/manual MultiDisplayTest
*/

private static final int W = 200, H = 200;
public class MultiDisplayTest {
private static final String INSTRUCTIONS =
"""
The test requires two-display configuration, where
private static final BaseMultiResolutionImage IMG =
new BaseMultiResolutionImage(new BufferedImage[]{
generateImage(1, Color.BLACK), generateImage(2, Color.BLUE)});
- 1st display is operating in HiDPI mode;
- 2nd display is non-HiDPI.
private static boolean checkOS() {
return Platform.isWindows() || Platform.isOSX();
}
In other cases please simply push "Pass".
public void init() { this.setLayout(new BorderLayout()); }
To run test please push "Start".
public void start() {
Then drag parent / child to different displays and check
that the proper image is shown for every window
(must be "black 1x" for non-HiDPI and "blue 2x" for HiDPI).
Button b = new Button("Start");
b.setEnabled(checkOS());
Please try to drag both parent and child,
do it fast several times and check if no artefacts occur.
b.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
Try to switch display resolution (high to low and back).
ParentFrame p = new ParentFrame();
new ChildDialog(p);
}
});
For Mac OS X please check also the behavior for
translucent windows appearing on the 2nd (non-active) display
and Mission Control behavior.
Close the Child & Parent windows.
In case if no issues occur please push "Pass", otherwise "Fail".
""";

private static final int W = 200;
private static final int H = 200;

add(b, BorderLayout.CENTER);
private static final BaseMultiResolutionImage IMG =
new BaseMultiResolutionImage(new BufferedImage[]{
generateImage(1, Color.BLACK), generateImage(2, Color.BLUE)});

validate();
setVisible(true);
public static void main(String[] args) throws Exception {
if (!checkOS()) {
throw new SkippedException("Invalid OS." +
"Please run test on either Windows or MacOS");
}
PassFailJFrame
.builder()
.title("MultiDisplayTest Instructions")
.instructions(INSTRUCTIONS)
.rows((int) INSTRUCTIONS.lines().count() + 2)
.columns(40)
.splitUIBottom(MultiDisplayTest::createAndShowGUI)
.build()
.awaitAndCheck();
}

public static JButton createAndShowGUI() {
JButton b = new JButton("Start");
b.addActionListener(e -> {
ParentFrame p = new ParentFrame();
new ChildDialog(p);
});
return b;
}

private static BufferedImage generateImage(int scale, Color c) {
private static boolean checkOS() {
return Platform.isWindows() || Platform.isOSX();
}

private static BufferedImage generateImage(int scale, Color c) {
BufferedImage image = new BufferedImage(
scale * W, scale * H, BufferedImage.TYPE_INT_RGB);
Graphics g = image.getGraphics();
Expand All @@ -87,19 +123,13 @@ private static BufferedImage generateImage(int scale, Color c) {
g.setColor(Color.WHITE);
Font f = g.getFont();
g.setFont(new Font(f.getName(), Font.BOLD, scale * 48));
g.drawChars((scale + "X").toCharArray(), 0, 2, scale * W / 2, scale * H / 2);

g.drawChars((scale + "X").toCharArray(), 0, 2,
scale * W / 2, scale * H / 2);
return image;
}

private static class ParentFrame extends Frame {

public ParentFrame() {
EventQueue.invokeLater(this::CreateUI);
}

private void CreateUI() {

addWindowListener(new WindowAdapter() {
@Override
public void windowClosing(WindowEvent e) { dispose(); }
Expand All @@ -118,14 +148,8 @@ public void paint(Graphics gr) {
}

private static class ChildDialog extends Dialog {

public ChildDialog(Frame f) {
super(f);
EventQueue.invokeLater(this::CreateUI);
}

private void CreateUI() {

addWindowListener(new WindowAdapter() {
@Override
public void windowClosing(WindowEvent e) { dispose(); }
Expand Down

This file was deleted.

0 comments on commit 36481dd

Please sign in to comment.