X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fanalysis%2FAnnotationSorterTest.java;h=11c42ed45594ed3a837955a965a3f42c88e0bf70;hb=173c541c3bdef7cee4f72a76cc8e23e8902a8614;hp=9dd297256eab89b662058fe4aaf17f3d9916af42;hpb=8f118c154e74caaef6bec19acd0466904ac424d4;p=jalview.git

diff --git a/test/jalview/analysis/AnnotationSorterTest.java b/test/jalview/analysis/AnnotationSorterTest.java
index 9dd2972..11c42ed 100644
--- a/test/jalview/analysis/AnnotationSorterTest.java
+++ b/test/jalview/analysis/AnnotationSorterTest.java
@@ -27,16 +27,26 @@ import jalview.datamodel.Alignment;
 import jalview.datamodel.AlignmentAnnotation;
 import jalview.datamodel.Sequence;
 import jalview.datamodel.SequenceI;
+import jalview.gui.JvOptionPane;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 public class AnnotationSorterTest
 {
+
+  @BeforeClass(alwaysRun = true)
+  public void setUpJvOptionPane()
+  {
+    JvOptionPane.setInteractiveMode(false);
+    JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+  }
+
   private static final int NUM_SEQS = 6;
 
   private static final int NUM_ANNS = 7;
@@ -281,9 +291,9 @@ public class AnnotationSorterTest
     testee.sort(annotations, SequenceAnnotationOrder.LABEL_AND_SEQUENCE);
     long endTime = System.currentTimeMillis();
     final long elapsed = endTime - startTime;
-    System.out.println("Timing test for presorted " + numSeqs
-            + " sequences and " + numAnns + " annotations took " + elapsed
-            + "ms");
+    System.out.println(
+            "Timing test for presorted " + numSeqs + " sequences and "
+                    + numAnns + " annotations took " + elapsed + "ms");
   }
 
   /**
@@ -325,9 +335,9 @@ public class AnnotationSorterTest
     testee.sort(annotations, SequenceAnnotationOrder.SEQUENCE_AND_LABEL);
     long endTime = System.currentTimeMillis();
     final long elapsed = endTime - startTime;
-    System.out.println("Timing test for unsorted " + numSeqs
-            + " sequences and " + numAnns + " annotations took " + elapsed
-            + "ms");
+    System.out.println(
+            "Timing test for unsorted " + numSeqs + " sequences and "
+                    + numAnns + " annotations took " + elapsed + "ms");
   }
 
   /**
@@ -359,8 +369,8 @@ public class AnnotationSorterTest
     Alignment alignment = buildAlignment(numSeqs);
     AlignmentAnnotation[] annotations = buildAnnotations(numAnns);
 
-    String[] labels = new String[] { "label1", "label2", "label3",
-        "label4", "label5", "label6" };
+    String[] labels = new String[] { "label1", "label2", "label3", "label4",
+        "label5", "label6" };
 
     /*
      * Set the annotations in sequence order with randomly assigned labels.
@@ -378,9 +388,9 @@ public class AnnotationSorterTest
     testee.sort(annotations, SequenceAnnotationOrder.LABEL_AND_SEQUENCE);
     long endTime = System.currentTimeMillis();
     long elapsed = endTime - startTime;
-    System.out.println("Sort by label for semisorted " + numSeqs
-            + " sequences and " + numAnns + " annotations took " + elapsed
-            + "ms");
+    System.out.println(
+            "Sort by label for semisorted " + numSeqs + " sequences and "
+                    + numAnns + " annotations took " + elapsed + "ms");
 
     // now resort by sequence
     startTime = System.currentTimeMillis();
@@ -396,8 +406,8 @@ public class AnnotationSorterTest
     testee.sort(annotations, SequenceAnnotationOrder.LABEL_AND_SEQUENCE);
     endTime = System.currentTimeMillis();
     elapsed = endTime - startTime;
-    System.out.println("Resort by label for semisorted " + numSeqs
-            + " sequences and " + numAnns + " annotations took " + elapsed
-            + "ms");
+    System.out.println(
+            "Resort by label for semisorted " + numSeqs + " sequences and "
+                    + numAnns + " annotations took " + elapsed + "ms");
   }
 }