JAL-1805 test envirionment separation

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

diff --git a/test/jalview/ext/rbvi/chimera/ChimeraConnect.java b/test/jalview/ext/rbvi/chimera/ChimeraConnect.java
index 658c9c6..e7f95a0 100644 (file)
--- a/test/jalview/ext/rbvi/chimera/ChimeraConnect.java
+++ b/test/jalview/ext/rbvi/chimera/ChimeraConnect.java
@@ -1,39 +1,42 @@
 package jalview.ext.rbvi.chimera;
 
-import static org.junit.Assert.*;
+import static org.testng.AssertJUnit.assertFalse;
+import static org.testng.AssertJUnit.assertTrue;
 
-import java.util.Arrays;
-import java.util.Collection;
+import org.testng.annotations.Test;
 
-import org.junit.Test;
-
-import ext.edu.ucsf.rbvi.strucviz2.*;
+import ext.edu.ucsf.rbvi.strucviz2.ChimeraManager;
+import ext.edu.ucsf.rbvi.strucviz2.StructureManager;
 
 public class ChimeraConnect
 {
 
-  @Test
-  public void test()
+  @Test(groups ={ "Functional" })
+  public void testLaunchAndExit()
   {
-    StructureManager csm; 
-            ext.edu.ucsf.rbvi.strucviz2.ChimeraManager cm = new ChimeraManager(csm = new ext.edu.ucsf.rbvi.strucviz2.StructureManager(true));
-    assertTrue("Couldn't launch chimera",cm.launchChimera(csm.getChimeraPaths()));
-    
-    int n=0;
-    while (n++<100)
-    {
-      try { 
-        Thread.sleep(1000);
-      } catch (Exception q)
-      {
-        
-      }
-      Collection<ChimeraModel> cms = cm.getChimeraModels();
-      for (ChimeraModel cmod :cms) {
-        System.out.println(cmod.getModelName());
-      }
-    }
+    final StructureManager structureManager = new StructureManager(true);
+    ChimeraManager cm = new ChimeraManager(structureManager);
+    assertTrue("Couldn't launch chimera",
+            cm.launchChimera(StructureManager.getChimeraPaths()));
+    assertTrue(cm.isChimeraLaunched()); // Chimera process is alive
+    // int n=0;
+    // not sure of the point of this is unless the tester is loading models
+    // manually?
+    // while (n++ < 100)
+    // {
+    // try {
+    // Thread.sleep(1000);
+    // } catch (Exception q)
+    // {
+    //
+    // }
+    // Collection<ChimeraModel> cms = cm.getChimeraModels();
+    // for (ChimeraModel cmod :cms) {
+    // System.out.println(cmod.getModelName());
+    // }
+    // }
     cm.exitChimera();
+    assertFalse(cm.isChimeraLaunched()); // Chimera process has ended
   }
 
 }