X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fext%2Frbvi%2Fchimera%2FChimeraConnect.java;h=99394dc3e6113a64d58d17a4ed339a80b6ee5714;hb=8e75819afe8c00b2046fff54c2ff21175ec7d7a1;hp=ad4f9978781a510fc55d4e7f09cc5e12e2811624;hpb=be32c14cd8e48fe0a207cd7030cb9cd46f894678;p=jalview.git
diff --git a/test/jalview/ext/rbvi/chimera/ChimeraConnect.java b/test/jalview/ext/rbvi/chimera/ChimeraConnect.java
index ad4f997..99394dc 100644
--- a/test/jalview/ext/rbvi/chimera/ChimeraConnect.java
+++ b/test/jalview/ext/rbvi/chimera/ChimeraConnect.java
@@ -1,40 +1,72 @@
+/*
+ * 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 .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
package jalview.ext.rbvi.chimera;
-import static org.junit.Assert.assertTrue;
+import static org.testng.AssertJUnit.assertFalse;
+import static org.testng.AssertJUnit.assertTrue;
-import java.util.Collection;
+import jalview.gui.JvOptionPane;
-import org.junit.Test;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.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()
+ @BeforeClass(alwaysRun = true)
+ public void setUpJvOptionPane()
{
- StructureManager csm;
- ext.edu.ucsf.rbvi.strucviz2.ChimeraManager cm = new ChimeraManager(csm = new ext.edu.ucsf.rbvi.strucviz2.StructureManager(true));
+ JvOptionPane.setInteractiveMode(false);
+ JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+ }
+
+ @Test(groups = { "External" })
+ public void testLaunchAndExit()
+ {
+ 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 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 cms = cm.getChimeraModels();
+ // for (ChimeraModel cmod :cms) {
+ // System.out.println(cmod.getModelName());
+ // }
+ // }
cm.exitChimera();
+ assertFalse(cm.isChimeraLaunched()); // Chimera process has ended
}
}