JAL-4217 move CommandsTest to testTask3 involving structure image export and random...

[jalview.git] / test / jalview / bin / HiDPISettingTest2.java

diff --git a/test/jalview/bin/HiDPISettingTest2.java b/test/jalview/bin/HiDPISettingTest2.java
index 9851b09..6812bce 100644 (file)
--- a/test/jalview/bin/HiDPISettingTest2.java
+++ b/test/jalview/bin/HiDPISettingTest2.java
@@ -30,6 +30,7 @@ import java.io.InputStreamReader;
 import java.util.concurrent.TimeUnit;
 
 import org.testng.Assert;
+import org.testng.SkipException;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
@@ -37,6 +38,7 @@ import org.testng.annotations.Test;
 import io.github.classgraph.ClassGraph;
 import io.github.classgraph.ScanResult;
 import jalview.gui.Desktop;
+import jalview.util.Platform;
 
 public class HiDPISettingTest2
 {
@@ -127,7 +129,7 @@ public class HiDPISettingTest2
     String classpath = getClassPath();
     String cmd = java_exe + " " + " -classpath " + classpath + " " + jvmArgs
             + " jalview.bin.Jalview " + " "
-            + "-props test/jalview/bin/hidpiTestProps.jvprops " + appArgs;
+            + "--props=test/jalview/bin/hidpiTestProps.jvprops " + appArgs;
     Process proc = null;
     Worker worker = null;
     try
@@ -160,9 +162,16 @@ public class HiDPISettingTest2
   @Test(groups = { "Functional" }, dataProvider = "hidpiScaleArguments")
   public void testHiDPISettings(int scale)
   {
+    if (!Platform.isLinux())
+    {
+      throw new SkipException(
+              "Not linux platform, not testing actual scaling with "
+                      + HiDPISetting.scalePropertyName);
+    }
+
     String jvmArgs = HiDPISetting.getScalePropertyArg(scale);
 
-    String appArgs = " -open examples/uniref50.fa -nosplash -nonews -noquestionnaire -nousagestats -nowebservicediscovery";
+    String appArgs = " --open examples/uniref50.fa --nosplash --nonews --noquestionnaire --nousagestats --nowebservicediscovery";
 
     Worker worker = getJalviewDesktopRunner(jvmArgs, appArgs);
     assertNotNull(worker, "worker is null");
@@ -174,7 +183,7 @@ public class HiDPISettingTest2
     {
       while ((ln = worker.getErrorReader().readLine()) != null)
       {
-        if (++count > 100)
+        if (++count > 150)
         {
           break;
         }