X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fext%2Frbvi%2Fchimera%2FChimeraConnect.java;fp=test%2Fjalview%2Fext%2Frbvi%2Fchimera%2FChimeraConnect.java;h=de7235b6ad0d24d9e28b81e4b63d6da98f6667d5;hb=de358652f0fe9b535353c8018509d52c2b5e96d5;hp=ad4f9978781a510fc55d4e7f09cc5e12e2811624;hpb=5baa6110829dabd15c3333007042e06ea6449242;p=jalview.git

diff --git a/test/jalview/ext/rbvi/chimera/ChimeraConnect.java b/test/jalview/ext/rbvi/chimera/ChimeraConnect.java
index ad4f997..de7235b 100644
--- a/test/jalview/ext/rbvi/chimera/ChimeraConnect.java
+++ b/test/jalview/ext/rbvi/chimera/ChimeraConnect.java
@@ -1,40 +1,42 @@
 package jalview.ext.rbvi.chimera;
 
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-import java.util.Collection;
-
 import org.junit.Test;
 
 import ext.edu.ucsf.rbvi.strucviz2.ChimeraManager;
-import ext.edu.ucsf.rbvi.strucviz2.ChimeraModel;
 import ext.edu.ucsf.rbvi.strucviz2.StructureManager;
 
 public class ChimeraConnect
 {
 
   @Test
-  public void test()
+  public void testLaunchAndExit()
   {
-    StructureManager csm;
-            ext.edu.ucsf.rbvi.strucviz2.ChimeraManager cm = new ChimeraManager(csm = new ext.edu.ucsf.rbvi.strucviz2.StructureManager(true));
+    final StructureManager structureManager = new StructureManager(true);
+    ChimeraManager cm = new ChimeraManager(structureManager);
     assertTrue("Couldn't launch chimera",
             cm.launchChimera(StructureManager.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());
-      }
-    }
+    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
   }
 
 }