JAL-1759 merge from develop

[jalview.git] / test / jalview / ext / rbvi / chimera / JalviewChimeraView.java

diff --git a/test/jalview/ext/rbvi/chimera/JalviewChimeraView.java b/test/jalview/ext/rbvi/chimera/JalviewChimeraView.java
index f2535cb..44b5d58 100644 (file)
--- a/test/jalview/ext/rbvi/chimera/JalviewChimeraView.java
+++ b/test/jalview/ext/rbvi/chimera/JalviewChimeraView.java
@@ -1,19 +1,18 @@
 package jalview.ext.rbvi.chimera;
 
-import static org.junit.Assert.assertTrue;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import static org.testng.AssertJUnit.assertTrue;
 
 import jalview.api.structures.JalviewStructureDisplayI;
-import jalview.datamodel.PDBEntry;
 import jalview.datamodel.SequenceI;
 import jalview.gui.AlignFrame;
 import jalview.gui.StructureViewer;
 import jalview.gui.StructureViewer.ViewerType;
 import jalview.io.FormatAdapter;
 
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
 public class JalviewChimeraView
 {
 
@@ -43,7 +42,7 @@ public class JalviewChimeraView
 
   }
 
-  @Test
+  @Test(groups ={ "Functional" })
   public void testSingleSeqViewJMol()
   {
     String inFile = "examples/1gaq.txt";
@@ -63,14 +62,11 @@ public class JalviewChimeraView
         {
           final StructureViewer structureViewer = new StructureViewer(af
                   .getViewport().getStructureSelectionManager());
-
+          structureViewer.setViewerType(ViewerType.JMOL);
           JalviewStructureDisplayI jmolViewer = structureViewer
-                  .viewStructures(ViewerType.JMOL, af.getCurrentView()
-                          .getAlignPanel(), new PDBEntry[]
-                  { (PDBEntry) dsq.getPDBId().elementAt(q) },
-                          new SequenceI[][]
-                          { new SequenceI[]
-                          { sq } });
+                  .viewStructures(dsq.getPDBId().elementAt(q),
+                          new SequenceI[]
+                  { sq }, af.getCurrentView().getAlignPanel());
           /*
            * Wait for viewer thread to start
            */
@@ -90,7 +86,7 @@ public class JalviewChimeraView
     }
   }
 
-  @Test
+  @Test(groups ={ "Functional" })
   public void testSingleSeqViewChimera()
   {
     String inFile = "examples/1gaq.txt";
@@ -110,14 +106,11 @@ public class JalviewChimeraView
         {
           final StructureViewer structureViewer = new StructureViewer(af
                   .getViewport().getStructureSelectionManager());
-
+          structureViewer.setViewerType(ViewerType.CHIMERA);
           JalviewStructureDisplayI chimeraViewer = structureViewer
-                  .viewStructures(ViewerType.CHIMERA, af.getCurrentView()
-                          .getAlignPanel(), new PDBEntry[]
-                  { (PDBEntry) dsq.getPDBId().elementAt(q) },
-                          new SequenceI[][]
-                          { new SequenceI[]
-                          { sq } });
+                  .viewStructures(dsq.getPDBId().elementAt(q),
+                          new SequenceI[]
+                          { sq }, af.getCurrentView().getAlignPanel());
           /*
            * Wait for viewer thread to start
            */