JAL-4024 only render partially when new view overlaps with last rendered annotation...

[jalview.git] / test / jalview / util / DnaUtilsTest.java

diff --git a/test/jalview/util/DnaUtilsTest.java b/test/jalview/util/DnaUtilsTest.java
index fbc95ad..35b4592 100644 (file)
--- a/test/jalview/util/DnaUtilsTest.java
+++ b/test/jalview/util/DnaUtilsTest.java
@@ -1,16 +1,47 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 package jalview.util;
 
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertNull;
 import static org.testng.AssertJUnit.fail;
 
+import jalview.gui.JvOptionPane;
+
 import java.text.ParseException;
 import java.util.List;
 
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 public class DnaUtilsTest
 {
+
+  @BeforeClass(alwaysRun = true)
+  public void setUpJvOptionPane()
+  {
+    JvOptionPane.setInteractiveMode(false);
+    JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+  }
+
   /**
    * Tests for parsing an ENA/GenBank location specifier
    * 
@@ -71,8 +102,8 @@ public class DnaUtilsTest
     /*
      * join of two complements
      */
-    ranges = DnaUtils
-            .parseLocation("join(complement(4918..5163),complement(2691..4571))");
+    ranges = DnaUtils.parseLocation(
+            "join(complement(4918..5163),complement(2691..4571))");
     assertEquals(2, ranges.size());
     assertEquals(5163, ranges.get(0)[0]);
     assertEquals(4918, ranges.get(0)[1]);
@@ -127,7 +158,8 @@ public class DnaUtilsTest
      * complement may not enclose multiple ranges 
      * parsing fails for the same reason
      */
-    checkForParseException("join(complement(36618..36700,4000..4200),86988..87064)");
+    checkForParseException(
+            "join(complement(36618..36700,4000..4200),86988..87064)");
   }
 
   /**