JAL-4036 removing the query field code from the dropdown indexes

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

diff --git a/test/jalview/analysis/GroupingTest.java b/test/jalview/analysis/GroupingTest.java
index 9f327c6..d547631 100644 (file)
--- a/test/jalview/analysis/GroupingTest.java
+++ b/test/jalview/analysis/GroupingTest.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.
  * 
@@ -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,14 +53,17 @@ 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 });
+          new SequenceI[]
+          { s1, s2, s3, s4, s5 });
 
   /*
    * test for the case where column selections are not added in
@@ -75,7 +87,8 @@ public class GroupingTest
     }
     SequenceGroup[] seqgroupsString = Grouping.makeGroupsFrom(
             alignment.getSequencesArray(), str,
-            Arrays.asList(new SequenceGroup[] { sg_12, sg_345 }));
+            Arrays.asList(new SequenceGroup[]
+            { sg_12, sg_345 }));
 
     ColumnSelection cs = new ColumnSelection();
     for (int p : positions)
@@ -84,9 +97,10 @@ public class GroupingTest
     }
     SequenceGroup[] seqgroupsColSel = Grouping.makeGroupsFromCols(
             alignment.getSequencesArray(), cs,
-            Arrays.asList(new SequenceGroup[] { sg_12, sg_345 }));
-    AssertJUnit
-            .assertEquals(seqgroupsString.length, seqgroupsColSel.length);
+            Arrays.asList(new SequenceGroup[]
+            { sg_12, sg_345 }));
+    AssertJUnit.assertEquals(seqgroupsString.length,
+            seqgroupsColSel.length);
     for (int p = 0; p < seqgroupsString.length; p++)
     {
       AssertJUnit.assertEquals(seqgroupsString[p].getName(),