X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fdatamodel%2FMatchTest.java;h=e7d04d77db078134587f20e5778666ef97bda5c4;hb=5a352aa2f3330ae269d9b70c4a7374c2518bfb2e;hp=65c894f6545d24a49c7cae360862f96142bd3bbc;hpb=52402128d98c6744eb6348dd788fe6e8cd34575c;p=jalview.git diff --git a/test/jalview/datamodel/MatchTest.java b/test/jalview/datamodel/MatchTest.java index 65c894f..e7d04d7 100644 --- a/test/jalview/datamodel/MatchTest.java +++ b/test/jalview/datamodel/MatchTest.java @@ -24,27 +24,27 @@ import static org.testng.AssertJUnit.assertEquals; import static org.testng.AssertJUnit.assertFalse; import static org.testng.AssertJUnit.assertTrue; -import jalview.datamodel.SearchResults.Match; +import jalview.gui.JvOptionPane; +import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; public class MatchTest { - @Test(groups = { "Functional" }) - public void testToString() + @BeforeClass(alwaysRun = true) + public void setUpJvOptionPane() { - SequenceI seq = new Sequence("", "abcdefghijklm"); - SearchResultMatchI m = new SearchResults().new Match(seq, 3, 5); - assertEquals("2cde", m.toString()); + JvOptionPane.setInteractiveMode(false); + JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION); } @Test(groups = { "Functional" }) - public void testGetCharacters() + public void testToString() { - SequenceI seq = new Sequence("", "abcdefghijklm"); + SequenceI seq = new Sequence("Seq1", "abcdefghijklm"); SearchResultMatchI m = new SearchResults().new Match(seq, 3, 5); - assertEquals("cde", m.getCharacters()); + assertEquals("Seq1/3-5", m.toString()); } @Test(groups = { "Functional" })