X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=test%2Fjalview%2Fext%2Frbvi%2Fchimera%2FChimeraConnect.java;h=b07a622db8cf156c0c97f24967d8d8a64af740b0;hb=9dabc02511e3a334a5749a504f57f69d6c9017bd;hp=658c9c69287114f01c559245c6fe84afc953cec0;hpb=d0daeb9399f3effac613d8df8431eaebf01a851a;p=jalview.git diff --git a/test/jalview/ext/rbvi/chimera/ChimeraConnect.java b/test/jalview/ext/rbvi/chimera/ChimeraConnect.java index 658c9c6..b07a622 100644 --- a/test/jalview/ext/rbvi/chimera/ChimeraConnect.java +++ b/test/jalview/ext/rbvi/chimera/ChimeraConnect.java @@ -1,39 +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.*; +import static org.testng.AssertJUnit.assertFalse; +import static org.testng.AssertJUnit.assertTrue; -import java.util.Arrays; -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.*; +import ext.edu.ucsf.rbvi.strucviz2.ChimeraManager; +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)); - assertTrue("Couldn't launch chimera",cm.launchChimera(csm.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()); - } - } + 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(false))); + 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 } }