stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8327924: Simplify TrayIconScalingTest.java

Browse Source 
Reviewed-by: honkar, prr
This commit is contained in:
Alexey Ivanov 2024-03-21 16:02:17 +00:00
parent 16ed191329
commit 1496b5de90
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
test/jdk/java/awt/TrayIcon/TrayIconScalingTest.java
View File

@ -85,28 +85,27 @@ public class TrayIconScalingTest {
System.out.println("SystemTray is not supported");
return;
}
PassFailJFrame passFailJFrame = PassFailJFrame.builder()
.title("TrayIcon Test Instructions")
.instructions(INSTRUCTIONS)
.testTimeOut(8)
.rows(25)
.columns(70)
.screenCapture()
.build();
createAndShowGUI();
// does not have a test window,
// hence only the instruction frame is positioned
PassFailJFrame.positionTestWindow(null,
PassFailJFrame.Position.HORIZONTAL);
createAndShowTrayIcon();
try {
passFailJFrame.awaitAndCheck();
PassFailJFrame.builder()
.title("TrayIcon Test Instructions")
.instructions(INSTRUCTIONS)
.testTimeOut(8)
.rows(25)
.columns(70)
.screenCapture()
.build()
.awaitAndCheck();
} finally {
tray.remove(icon);
if (tray != null) {
tray.remove(icon);
}
}
}
private static void createAndShowGUI() {
private static void createAndShowTrayIcon() {
ArrayList<Image> imageList = new ArrayList<>();
for (int size = 16; size <= 48; size += 4) {
imageList.add(createIcon(size));
@ -120,7 +119,7 @@ public class TrayIconScalingTest {
try {
tray.add(icon);
} catch (AWTException e) {
throw new RuntimeException("Error while adding icon to system tray");
throw new RuntimeException("Error while adding icon to system tray", e);
}
}