X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fext%2Frbvi%2Fchimera%2FChimeraConnect.java;h=a5393ec5d92cebde54cead41e70fcc373531c32c;hb=37de9310bec3501cbc6381e0c3dcb282fcaad812;hp=be4e5ea130eb67c6afd66b21c4724567dc5e431c;hpb=ae216fceddd8539d20fa5425cdaef3da73aba8f0;p=jalview.git

diff --git a/test/jalview/ext/rbvi/chimera/ChimeraConnect.java b/test/jalview/ext/rbvi/chimera/ChimeraConnect.java
index be4e5ea..a5393ec 100644
--- a/test/jalview/ext/rbvi/chimera/ChimeraConnect.java
+++ b/test/jalview/ext/rbvi/chimera/ChimeraConnect.java
@@ -1,38 +1,62 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 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
   }
 
 }