X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fanalysis%2FGroupingTest.java;h=184f9fb5968e24651153ff1fc4c42206840a0857;hb=0a37e3b824b46b026916e124b42400590242d145;hp=3afa6e547f1feb69b843c66d9d12b0ecbc5fb334;hpb=fefc840cd97faf34b69ca387e8a38e3b9c79b92f;p=jalview.git diff --git a/test/jalview/analysis/GroupingTest.java b/test/jalview/analysis/GroupingTest.java index 3afa6e5..184f9fb 100644 --- a/test/jalview/analysis/GroupingTest.java +++ b/test/jalview/analysis/GroupingTest.java @@ -26,14 +26,23 @@ import jalview.datamodel.ColumnSelection; import jalview.datamodel.Sequence; import jalview.datamodel.SequenceGroup; import jalview.datamodel.SequenceI; +import jalview.gui.JvOptionPane; import java.util.Arrays; import org.testng.AssertJUnit; +import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; public class GroupingTest { + @BeforeClass(alwaysRun = true) + public void setUpJvOptionPane() + { + JvOptionPane.setInteractiveMode(false); + JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION); + } + Sequence s1 = new Sequence("s1", "AAAADDDDEEEE"); Sequence s2 = new Sequence("s2", "AAAADDDDEEEE"); @@ -44,19 +53,24 @@ public class GroupingTest Sequence s5 = new Sequence("s5", "AAAADDEDTTEE"); - SequenceGroup sg_12 = new SequenceGroup(Arrays.asList(new SequenceI[] { s1, - s2 }), "Group1", null, false, false, false, 0, 5); + SequenceGroup sg_12 = new SequenceGroup(Arrays.asList(new SequenceI[] { + s1, s2 }), "Group1", null, false, false, false, 0, 5); - SequenceGroup sg_345 = new SequenceGroup(Arrays.asList(new SequenceI[] { s3, - s4, s5 }), "Group2", null, false, false, false, 0, 5); + SequenceGroup sg_345 = new SequenceGroup(Arrays.asList(new SequenceI[] { + s3, s4, s5 }), "Group2", null, false, false, false, 0, 5); AlignmentI alignment = new Alignment( new SequenceI[] { s1, s2, s3, s4, s5 }); + /* + * test for the case where column selections are not added in + * left to right order + */ + int[] positions = new int[] { 7, 9, 1 }; + @Test(groups = { "Functional" }) public void testMakeGroupsWithBoth() { - int[] positions = new int[] { 1, 7, 9 }; String[] str = new String[alignment.getHeight()]; int seq = 0; for (SequenceI s : alignment.getSequences()) @@ -72,11 +86,6 @@ public class GroupingTest alignment.getSequencesArray(), str, Arrays.asList(new SequenceGroup[] { sg_12, sg_345 })); - /* - * test for the case where column selections are not added in - * left to right order - */ - positions = new int[] { 7, 9, 1 }; ColumnSelection cs = new ColumnSelection(); for (int p : positions) {