From: Jim Procter <jprocter@issues.jalview.org>
Date: Thu, 11 Apr 2019 13:52:20 +0000 (+0100)
Subject: Merge branch 'develop' into task/JAL-3130_Java_11_investigations-getdown_src
X-Git-Tag: Release_2_11_0~17^2~7^2~43
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=b74e75812b411ed8838f2c57d84fa1b328bbefe5;p=jalview.git

Merge branch 'develop' into task/JAL-3130_Java_11_investigations-getdown_src
---

b74e75812b411ed8838f2c57d84fa1b328bbefe5
diff --cc test/jalview/bin/CommandLineOperations.java
index 483bb8b,c7b1d53..ace1868
--- a/test/jalview/bin/CommandLineOperations.java
+++ b/test/jalview/bin/CommandLineOperations.java
@@@ -257,14 -262,16 +263,14 @@@ public class CommandLineOperation
        worker.interrupt();
        Thread.currentThread().interrupt();
        worker.process.destroy();
 -      Assert.fail("Jalview did not exit after "
 -              + type
 +      Assert.fail("Jalview did not exit after " + type
                + " generation (try running test again to verify - timeout at "
 -              + SETUP_TIMEOUT + "ms). ["
 -              + harg + "]");
 +              + timeout + "ms). [" + harg + "]");
      }
-     new File(fileName).delete();
+     file.delete();
    }
  
-   @DataProvider(name = "allInputOpearationsData")
+   @DataProvider(name = "allInputOperationsData")
    public Object[][] getHeadlessModeInputParams()
    {
      return new Object[][] {
@@@ -299,46 -304,54 +303,53 @@@
    @DataProvider(name = "headlessModeOutputOperationsData")
    public static Object[][] getHeadlessModeOutputParams()
    {
--    return new Object[][] {
--        { "nodisplay -open examples/uniref50.fa", " -eps",
-             "test_uniref50_out.eps", true, MINFILESIZE_BIG, TEST_TIMEOUT },
 -            "test/jalview/bin/test_uniref50_out.eps", true, MINFILESIZE_BIG,
 -            TEST_TIMEOUT },
++    return new Object[][] { { "nodisplay -open examples/uniref50.fa",
++        " -eps", "test/jalview/bin/test_uniref50_out.eps", true,
++        MINFILESIZE_BIG, TEST_TIMEOUT },
          { "nodisplay -open examples/uniref50.fa", " -eps",
-             "test_uniref50_out.eps", false, MINFILESIZE_BIG, TEST_TIMEOUT },
+             "test/jalview/bin/test_uniref50_out.eps", false,
+             MINFILESIZE_BIG, TEST_TIMEOUT },
          { "nogui -open examples/uniref50.fa", " -eps",
-             "test_uniref50_out.eps", true, MINFILESIZE_BIG, TEST_TIMEOUT },
+             "test/jalview/bin/test_uniref50_out.eps", true, MINFILESIZE_BIG,
+             TEST_TIMEOUT },
          { "nogui -open examples/uniref50.fa", " -eps",
-             "test_uniref50_out.eps", false, MINFILESIZE_BIG, TEST_TIMEOUT },
+             "test/jalview/bin/test_uniref50_out.eps", false,
+             MINFILESIZE_BIG, TEST_TIMEOUT },
          { "headless -open examples/uniref50.fa", " -eps",
-             "test_uniref50_out.eps", true, MINFILESIZE_BIG, TEST_TIMEOUT },
+             "test/jalview/bin/test_uniref50_out.eps", true, MINFILESIZE_BIG,
+             TEST_TIMEOUT },
          { "headless -open examples/uniref50.fa", " -svg",
-             "test_uniref50_out.svg", false, MINFILESIZE_BIG, TEST_TIMEOUT },
+             "test/jalview/bin/test_uniref50_out.svg", false,
+             MINFILESIZE_BIG, TEST_TIMEOUT },
          { "headless -open examples/uniref50.fa", " -png",
-             "test_uniref50_out.png", true, MINFILESIZE_BIG, TEST_TIMEOUT },
+             "test/jalview/bin/test_uniref50_out.png", true, MINFILESIZE_BIG,
+             TEST_TIMEOUT },
          { "headless -open examples/uniref50.fa", " -html",
-             "test_uniref50_out.html", true, MINFILESIZE_BIG, TEST_TIMEOUT },
+             "test/jalview/bin/test_uniref50_out.html", true,
+             MINFILESIZE_BIG, TEST_TIMEOUT },
          { "headless -open examples/uniref50.fa", " -fasta",
 -            "test/jalview/bin/test_uniref50_out.mfa", true,
 -            MINFILESIZE_SMALL, TEST_TIMEOUT },
 +            "test_uniref50_out.mfa", true, MINFILESIZE_SMALL,
 +            TEST_TIMEOUT },
          { "headless -open examples/uniref50.fa", " -clustal",
 -            "test/jalview/bin/test_uniref50_out.aln", true,
 -            MINFILESIZE_SMALL, TEST_TIMEOUT },
 +            "test_uniref50_out.aln", true, MINFILESIZE_SMALL,
 +            TEST_TIMEOUT },
          { "headless -open examples/uniref50.fa", " -msf",
 -            "test/jalview/bin/test_uniref50_out.msf", true,
 -            MINFILESIZE_SMALL, TEST_TIMEOUT },
 +            "test_uniref50_out.msf", true, MINFILESIZE_SMALL,
 +            TEST_TIMEOUT },
          { "headless -open examples/uniref50.fa", " -pileup",
 -            "test/jalview/bin/test_uniref50_out.aln", true,
 -            MINFILESIZE_SMALL, TEST_TIMEOUT },
 +            "test_uniref50_out.aln", true, MINFILESIZE_SMALL,
 +            TEST_TIMEOUT },
          { "headless -open examples/uniref50.fa", " -pir",
 -            "test/jalview/bin/test_uniref50_out.pir", true,
 -            MINFILESIZE_SMALL, TEST_TIMEOUT },
 +            "test_uniref50_out.pir", true, MINFILESIZE_SMALL,
 +            TEST_TIMEOUT },
          { "headless -open examples/uniref50.fa", " -pfam",
 -            "test/jalview/bin/test_uniref50_out.pfam", true,
 -            MINFILESIZE_SMALL, TEST_TIMEOUT },
 +            "test_uniref50_out.pfam", true, MINFILESIZE_SMALL,
 +            TEST_TIMEOUT },
          { "headless -open examples/uniref50.fa", " -blc",
 -            "test/jalview/bin/test_uniref50_out.blc", true,
 -            MINFILESIZE_SMALL, TEST_TIMEOUT },
 +            "test_uniref50_out.blc", true, MINFILESIZE_SMALL,
 +            TEST_TIMEOUT },
          { "headless -open examples/uniref50.fa", " -jalview",
 -            "test/jalview/bin/test_uniref50_out.jvp", true,
 -            MINFILESIZE_SMALL, TEST_TIMEOUT }, };
 +            "test_uniref50_out.jvp", true, MINFILESIZE_SMALL,
 +            TEST_TIMEOUT }, };
    }
  }
diff --cc test/jalview/util/PlatformTest.java
index 2e5a786,5052894..617bf42
--- a/test/jalview/util/PlatformTest.java
+++ b/test/jalview/util/PlatformTest.java
@@@ -26,7 -26,8 +26,8 @@@ import static org.testng.Assert.assertT
  import jalview.gui.JvOptionPane;
  
  import java.awt.Button;
 -import java.awt.Event;
+ import java.awt.Toolkit;
 +import java.awt.event.InputEvent;
  import java.awt.event.MouseEvent;
  
  import org.testng.annotations.BeforeClass;