X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Futil%2FDBRefUtilsTest.java;h=0ef3c2553d40b474601b12f0d65d6326d07fd021;hb=4353b5fc310340ece7067b3872235ab7f844c8c2;hp=c4272b8a15fec8e4ab49fc46168435db3ee1df25;hpb=1b39bb74ab3d7db5e14b5fc0ea7c3be6fa947707;p=jalview.git diff --git a/test/jalview/util/DBRefUtilsTest.java b/test/jalview/util/DBRefUtilsTest.java index c4272b8..0ef3c25 100644 --- a/test/jalview/util/DBRefUtilsTest.java +++ b/test/jalview/util/DBRefUtilsTest.java @@ -32,14 +32,23 @@ import jalview.datamodel.Mapping; import jalview.datamodel.PDBEntry; import jalview.datamodel.Sequence; import jalview.datamodel.SequenceI; +import jalview.gui.JvOptionPane; import java.util.List; +import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; public class DBRefUtilsTest { + @BeforeClass(alwaysRun = true) + public void setUpJvOptionPane() + { + JvOptionPane.setInteractiveMode(false); + JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION); + } + /** * Test the method that selects DBRefEntry items whose source is in a supplied * list @@ -74,16 +83,16 @@ public class DBRefUtilsTest assertSame(ref2, selected[0]); assertSame(ref3, selected[1]); - // case insensitive - sources = new String[] { "Uniprot" }; - selected = DBRefUtils.selectRefs(dbrefs, sources); - assertEquals(2, selected.length); - assertSame(ref2, selected[0]); - assertSame(ref3, selected[1]); - sources = new String[] { "EMBLCDS" }; selected = DBRefUtils.selectRefs(dbrefs, sources); assertNull(selected); + + sources = new String[] { "embl", "uniprot" }; + selected = DBRefUtils.selectRefs(dbrefs, sources); + assertEquals(3, selected.length); + assertSame(ref1, selected[0]); + assertSame(ref2, selected[1]); + assertSame(ref3, selected[2]); } /**