JAL-3453 test changes needed to allow tests to proceed unheeded by

dialogs.

diff --git a/test/jalview/schemes/ColourSchemesTest.java b/test/jalview/schemes/ColourSchemesTest.java
index 06be31e..527796f 100644 (file)
--- a/test/jalview/schemes/ColourSchemesTest.java
+++ b/test/jalview/schemes/ColourSchemesTest.java
@@ -165,6 +165,7 @@ public class ColourSchemesTest
     /*
      * use read-only test properties file
      */
+    Desktop.getInstanceOnly();
     Cache.loadProperties("test/jalview/io/testProps.jvprops");
     Jalview.main(new String[] { "-nonews" });
   }

diff --git a/test/jalview/schemes/PIDColourSchemeTest.java b/test/jalview/schemes/PIDColourSchemeTest.java
index fa4b5d9..ff28267 100644 (file)
--- a/test/jalview/schemes/PIDColourSchemeTest.java
+++ b/test/jalview/schemes/PIDColourSchemeTest.java
@@ -5,6 +5,7 @@ import static org.testng.Assert.assertEquals;
 import jalview.datamodel.SequenceI;
 import jalview.gui.AlignFrame;
 import jalview.gui.AlignViewport;
+import jalview.gui.Desktop;
 import jalview.io.DataSourceType;
 import jalview.io.FileLoader;
 
@@ -38,6 +39,7 @@ public class PIDColourSchemeTest
   @Test(groups = "Functional")
   public void testFindColour()
   {
+    Desktop.getInstanceOnly();
     ColourSchemeI scheme = new PIDColourScheme();
 
     /*
@@ -67,6 +69,7 @@ public class PIDColourSchemeTest
   @Test(groups = "Functional")
   public void testFindColour_ignoreGaps()
   {
+    Desktop.getInstanceOnly();
     /*
      * AAAAA
      * AAAAA

diff --git a/test/jalview/ws/dbsources/RemoteFormatTest.java b/test/jalview/ws/dbsources/RemoteFormatTest.java
index 1e4573d..840f439 100644 (file)
--- a/test/jalview/ws/dbsources/RemoteFormatTest.java
+++ b/test/jalview/ws/dbsources/RemoteFormatTest.java
@@ -17,6 +17,7 @@ import jalview.fts.api.FTSRestClientI;
 import jalview.fts.core.FTSRestRequest;
 import jalview.fts.core.FTSRestResponse;
 import jalview.fts.service.uniprot.UniProtFTSRestClient;
+import jalview.gui.Desktop;
 import jalview.ws.SequenceFetcher;
 import jalview.ws.seqfetcher.DbSourceProxy;
 
@@ -44,6 +45,7 @@ public class RemoteFormatTest
   @BeforeTest(alwaysRun = true)
   public void setUp() throws Exception
   {
+    Desktop.getInstanceOnly();
     Cache.loadProperties("test/jalview/io/testProps.jvprops");
     // ensure 'add annotation from structure' is selected
     Cache.setPropertyNoSave("STRUCT_FROM_PDB",
@@ -72,6 +74,9 @@ public class RemoteFormatTest
           throws Exception
   {
     System.out.println("Fetching " + accessionId + " from " + dbSource);
+    System.err.println(
+            "BH 2019.10.06 note see JAL-2114 JUL 2016 for why this test fails.");
+
     List<DbSourceProxy> sps = sf.getSourceProxy(dbSource);
     assertFalse(sps.isEmpty());
     AlignmentI al = sps.get(0).getSequenceRecords(accessionId);

diff --git a/test/jalview/ws/jabaws/RNAStructExportImport.java b/test/jalview/ws/jabaws/RNAStructExportImport.java
index 889c003..67f94b2 100644 (file)
--- a/test/jalview/ws/jabaws/RNAStructExportImport.java
+++ b/test/jalview/ws/jabaws/RNAStructExportImport.java
@@ -26,6 +26,7 @@ import static org.testng.AssertJUnit.assertTrue;
 import jalview.bin.Cache;
 import jalview.datamodel.AlignmentAnnotation;
 import jalview.datamodel.AlignmentI;
+import jalview.gui.Desktop;
 import jalview.gui.JvOptionPane;
 import jalview.io.AnnotationFile;
 import jalview.io.DataSourceType;
@@ -87,8 +88,8 @@ public class RNAStructExportImport
   {
     Cache.loadProperties("test/jalview/io/testProps.jvprops");
     Cache.initLogger();
+    Desktop.getInstanceOnly();
     disc = JalviewJabawsTestUtils.getJabawsDiscoverer(false);
-
     while (disc.isRunning())
     {
       // don't get services until discoverer has finished
@@ -259,6 +260,7 @@ public class RNAStructExportImport
   @Test(groups = { "Network" })
   public void testRnaalifoldSettingsRecovery()
   {
+    Desktop.getInstanceOnly();
     List<Argument> opts = new ArrayList<>();
     for (Argument rg : (List<Argument>) rnaalifoldws.getRunnerConfig()
             .getArguments())