JAL-2089 patch broken merge to master for Release 2.10.0b1

[jalview.git] / test / jalview / analysis / GroupingTest.java

diff --git a/test/jalview/analysis/GroupingTest.java b/test/jalview/analysis/GroupingTest.java
index 3afa6e5..cea8ae4 100644 (file)
--- a/test/jalview/analysis/GroupingTest.java
+++ b/test/jalview/analysis/GroupingTest.java
@@ -44,19 +44,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 +77,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)
     {