X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fdatamodel%2FAlignedCodonIteratorTest.java;h=af9bbb7087012947371bc0c6e28d25828f35999b;hb=57738a1f3c19b1c3a00bd3ac5108f8cd0af32f99;hp=113cb2a363886d1f46ab91354481bf8d614970e1;hpb=c19d2a91ca05e052e3408bf5852d88eb5d0608f1;p=jalview.git

diff --git a/test/jalview/datamodel/AlignedCodonIteratorTest.java b/test/jalview/datamodel/AlignedCodonIteratorTest.java
index 113cb2a..af9bbb7 100644
--- a/test/jalview/datamodel/AlignedCodonIteratorTest.java
+++ b/test/jalview/datamodel/AlignedCodonIteratorTest.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.
  * 
@@ -23,11 +23,13 @@ package jalview.datamodel;
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertFalse;
 
+import jalview.gui.JvOptionPane;
 import jalview.util.MapList;
 
 import java.util.Iterator;
 
 import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 /**
@@ -38,6 +40,14 @@ import org.testng.annotations.Test;
  */
 public class AlignedCodonIteratorTest
 {
+
+  @BeforeClass(alwaysRun = true)
+  public void setUpJvOptionPane()
+  {
+    JvOptionPane.setInteractiveMode(false);
+    JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+  }
+
   /**
    * Test normal case for iterating over aligned codons.
    */
@@ -48,9 +58,9 @@ public class AlignedCodonIteratorTest
     from.createDatasetSequence();
     SequenceI to = new Sequence("Seq1", "-PQ-R-");
     to.createDatasetSequence();
-    MapList map = new MapList(
-            new int[] { 1, 1, 3, 4, 6, 6, 8, 10, 12, 13 },
-            new int[] { 1, 3 }, 3, 1);
+    MapList map = new MapList(new int[] { 1, 1, 3, 4, 6, 6, 8, 10, 12, 13 },
+            new int[]
+            { 1, 3 }, 3, 1);
     Mapping m = new Mapping(to.getDatasetSequence(), map);
 
     Iterator<AlignedCodon> codons = m.getCodonIterator(from, '-');
@@ -76,9 +86,9 @@ public class AlignedCodonIteratorTest
     from.createDatasetSequence();
     SequenceI to = new Sequence("Seq1", "-PQ-TR-");
     to.createDatasetSequence();
-    MapList map = new MapList(
-            new int[] { 1, 1, 3, 4, 6, 6, 8, 10, 12, 13 }, new int[] { 1,
-                2, 4, 4 }, 3, 1);
+    MapList map = new MapList(new int[] { 1, 1, 3, 4, 6, 6, 8, 10, 12, 13 },
+            new int[]
+            { 1, 2, 4, 4 }, 3, 1);
     Mapping m = new Mapping(to.getDatasetSequence(), map);
 
     Iterator<AlignedCodon> codons = m.getCodonIterator(from, '-');
@@ -105,7 +115,8 @@ public class AlignedCodonIteratorTest
     SequenceI to = new Sequence("Seq1", "-PQ-R-");
     to.createDatasetSequence();
     MapList map = new MapList(new int[] { 1, 1, 3, 4, 6, 6, 8, 8 },
-            new int[] { 1, 3 }, 3, 1);
+            new int[]
+            { 1, 3 }, 3, 1);
     Mapping m = new Mapping(to.getDatasetSequence(), map);
 
     Iterator<AlignedCodon> codons = m.getCodonIterator(from, '-');
@@ -132,7 +143,8 @@ public class AlignedCodonIteratorTest
     from.createDatasetSequence();
     SequenceI to = new Sequence("Seq1", "CHYQ");
     to.createDatasetSequence();
-    MapList map = new MapList(new int[] { 1, 12 }, new int[] { 1, 4 }, 3, 1);
+    MapList map = new MapList(new int[] { 1, 12 }, new int[] { 1, 4 }, 3,
+            1);
     Mapping m = new Mapping(to.getDatasetSequence(), map);
 
     Iterator<AlignedCodon> codons = m.getCodonIterator(from, '-');
@@ -161,8 +173,10 @@ public class AlignedCodonIteratorTest
     from.createDatasetSequence();
     SequenceI to = new Sequence("Seq1/10-12", "-PQ-R-");
     to.createDatasetSequence();
-    MapList map = new MapList(new int[] { 7, 7, 9, 10, 12, 12, 14, 16, 18,
-        19 }, new int[] { 10, 12 }, 3, 1);
+    MapList map = new MapList(
+            new int[]
+            { 7, 7, 9, 10, 12, 12, 14, 16, 18, 19 }, new int[] { 10, 12 },
+            3, 1);
     Mapping m = new Mapping(to.getDatasetSequence(), map);
 
     Iterator<AlignedCodon> codons = m.getCodonIterator(from, '-');