From c53c009b7b31a886e20c913801940c24a2c652c6 Mon Sep 17 00:00:00 2001 From: Ben Soares Date: Wed, 15 Mar 2023 01:00:21 +0000 Subject: [PATCH] JAL-3833 fixed HiDPI test for macOS --- test/jalview/bin/HiDPISettingTest1.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/test/jalview/bin/HiDPISettingTest1.java b/test/jalview/bin/HiDPISettingTest1.java index 137d3e1..4561ff4 100644 --- a/test/jalview/bin/HiDPISettingTest1.java +++ b/test/jalview/bin/HiDPISettingTest1.java @@ -32,6 +32,7 @@ import jalview.gui.Desktop; import jalview.gui.JvOptionPane; import jalview.io.DataSourceType; import jalview.io.FileLoader; +import jalview.util.Platform; /* * Testing a HiDPI display is difficult without running in a HiDPI display. @@ -107,20 +108,22 @@ public class HiDPISettingTest1 setMockScreen(1920, 1080, 96); assertEquals(HiDPISetting.getScalePropertyArg(), null); + // currently HiDPISetting only operates for Linux + // 4K screen -- scale by 2 setMockScreen(3180, 2160, 80); assertEquals(HiDPISetting.getScalePropertyArg(), - "-D" + scalePropertyName + "=2"); + Platform.isLinux() ? "-D" + scalePropertyName + "=2" : null); // 4K screen with high dpi -- scale by 3 setMockScreen(3180, 2160, 450); assertEquals(HiDPISetting.getScalePropertyArg(), - "-D" + scalePropertyName + "=3"); + Platform.isLinux() ? "-D" + scalePropertyName + "=3" : null); // stupidly big screen -- scale by 8 setMockScreen(19200, 10800, 72); assertEquals(HiDPISetting.getScalePropertyArg(), - "-D" + scalePropertyName + "=8"); + Platform.isLinux() ? "-D" + scalePropertyName + "=8" : null); } } -- 1.7.10.2