X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fgui%2FStructureChooserTest.java;h=4535c93c1b3121e0820e0794d288606bab388e2f;hb=52324cad8ae27137e1dd32261dc55c89444029d8;hp=6e419ddeb2b2f38af29e1f8e2fe301221611d2de;hpb=3ab582bfeeab1563bedf60e97994e63e672d2e31;p=jalview.git diff --git a/test/jalview/gui/StructureChooserTest.java b/test/jalview/gui/StructureChooserTest.java index 6e419dd..4535c93 100644 --- a/test/jalview/gui/StructureChooserTest.java +++ b/test/jalview/gui/StructureChooserTest.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2) - * Copyright (C) 2015 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * @@ -33,11 +33,20 @@ import jalview.jbgui.GStructureChooser.FilterOption; import java.util.Vector; import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; public class StructureChooserTest { + + @BeforeClass(alwaysRun = true) + public void setUpJvOptionPane() + { + JvOptionPane.setInteractiveMode(false); + JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION); + } + Sequence seq; @BeforeMethod(alwaysRun = true) @@ -112,7 +121,7 @@ public class StructureChooserTest StructureChooser sc = new StructureChooser(selectedSeqs, seq, null); sc.populateFilterComboBox(false, false); int optionsSize = sc.getCmbFilterOption().getItemCount(); - assertEquals(3, optionsSize); // if structures are not discovered then don't + assertEquals(2, optionsSize); // if structures are not discovered then don't // populate filter options sc.populateFilterComboBox(true, false); @@ -127,7 +136,7 @@ public class StructureChooserTest assertEquals("Cached PDB Entries", filterOpt.getName()); } - @Test(groups = { "Functional" }) + @Test(groups = { "Network" }) public void fetchStructuresInfoTest() { SequenceI[] selectedSeqs = new SequenceI[] { seq };