From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Wed, 26 Aug 2015 14:25:21 +0000 (+0100)
Subject: JAL-1270 separated Jmol and Chimera tests to avoid concurrency problems
X-Git-Tag: Jalview_2_9~10^2~22
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=5598fe7c3f5a9ac2d1b8b73a2608ebb4097ae94d;p=jalview.git

JAL-1270 separated Jmol and Chimera tests to avoid concurrency problems
---

diff --git a/test/jalview/ext/rbvi/chimera/JalviewChimeraView.java b/test/jalview/ext/rbvi/chimera/JalviewChimeraView.java
index b9cab9c..34e07f2 100644
--- a/test/jalview/ext/rbvi/chimera/JalviewChimeraView.java
+++ b/test/jalview/ext/rbvi/chimera/JalviewChimeraView.java
@@ -16,6 +16,7 @@ import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
+@Test(singleThreaded = true)
 public class JalviewChimeraView
 {
 
@@ -26,7 +27,9 @@ public class JalviewChimeraView
   public static void setUpBeforeClass() throws Exception
   {
     jalview.bin.Jalview.main(new String[]
-    { "-noquestionnaire -nonews -props", "test/src/jalview/ext/rbvi/chimera/testProps.jvprops" });
+ {
+        "-noquestionnaire -nonews -props",
+        "test/jalview/ext/rbvi/chimera/testProps.jvprops" });
   }
 
   /**
@@ -39,54 +42,6 @@ public class JalviewChimeraView
   }
 
   @Test(groups ={ "Functional" })
-  public void testSingleSeqViewJMol()
-  {
-    Cache.setProperty(Preferences.STRUCTURE_DISPLAY, ViewerType.JMOL.name());
-    String inFile = "examples/1gaq.txt";
-    AlignFrame af = new jalview.io.FileLoader().LoadFileWaitTillLoaded(
-            inFile, FormatAdapter.FILE);
-    assertTrue("Didn't read input file " + inFile, af != null);
-    for (SequenceI sq : af.getViewport().getAlignment().getSequences())
-    {
-      SequenceI dsq = sq.getDatasetSequence();
-      while (dsq.getDatasetSequence() != null)
-      {
-        dsq = dsq.getDatasetSequence();
-      }
-      if (dsq.getAllPDBEntries() != null && dsq.getAllPDBEntries().size() > 0)
-      {
-        for (int q = 0; q < dsq.getAllPDBEntries().size(); q++)
-        {
-          final StructureViewer structureViewer = new StructureViewer(af
-                  .getViewport().getStructureSelectionManager());
-          structureViewer.setViewerType(ViewerType.JMOL);
-          JalviewStructureDisplayI jmolViewer = structureViewer
-                  .viewStructures(dsq.getAllPDBEntries().elementAt(q),
-                          new SequenceI[]
-                  { sq }, af.getCurrentView().getAlignPanel());
-          /*
-           * Wait for viewer load thread to complete
-           */
-          try
-          {
-            while (!jmolViewer.getBinding().isFinishedInit())
-            {
-              Thread.sleep(500);
-            }
-          } catch (InterruptedException e)
-          {
-          }
-
-          jmolViewer.closeViewer(true);
-          // todo: break here means only once through this loop?
-          break;
-        }
-        break;
-      }
-    }
-  }
-
-  @Test(groups ={ "Functional" })
   public void testSingleSeqViewChimera()
   {
     Cache.setProperty(Preferences.STRUCTURE_DISPLAY,