X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fext%2Frbvi%2Fchimera%2FChimeraCommandsTest.java;h=ffb886c243252d9ca59f41a5791e28443410f5e8;hb=7d6bf4ac01167499c0f4e07de63edcdd72a6d595;hp=a3e13e8425311630a95b4f0dd3ca93412369ff80;hpb=fddf3084802b37e5cee17829e32692a4aac3e60d;p=jalview.git

diff --git a/test/jalview/ext/rbvi/chimera/ChimeraCommandsTest.java b/test/jalview/ext/rbvi/chimera/ChimeraCommandsTest.java
index a3e13e8..ffb886c 100644
--- a/test/jalview/ext/rbvi/chimera/ChimeraCommandsTest.java
+++ b/test/jalview/ext/rbvi/chimera/ChimeraCommandsTest.java
@@ -1,22 +1,54 @@
+/*
+ * 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.ext.rbvi.chimera;
 
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertTrue;
 
+import jalview.gui.JvOptionPane;
+
 import java.awt.Color;
 import java.util.Arrays;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.SortedMap;
 
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 public class ChimeraCommandsTest
 {
-  @Test(groups ={ "Functional" })
+
+  @BeforeClass(alwaysRun = true)
+  public void setUpJvOptionPane()
+  {
+    JvOptionPane.setInteractiveMode(false);
+    JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+  }
+
+  @Test(groups = { "Functional" })
   public void testAddColourRange()
   {
-    Map<Color, Map<Integer, Map<String, List<int[]>>>> map = new LinkedHashMap<Color, Map<Integer, Map<String, List<int[]>>>>();
+    Map<Color, SortedMap<Integer, Map<String, List<int[]>>>> map = new LinkedHashMap<Color, SortedMap<Integer, Map<String, List<int[]>>>>();
     ChimeraCommands.addColourRange(map, Color.pink, 1, 2, 4, "A");
     ChimeraCommands.addColourRange(map, Color.pink, 1, 8, 8, "A");
     ChimeraCommands.addColourRange(map, Color.pink, 1, 5, 7, "B");
@@ -41,37 +73,31 @@ public class ChimeraCommandsTest
     // inspect positions
     List<int[]> posList = map.get(Color.pink).get(1).get("A");
     assertEquals(2, posList.size());
-    assertTrue(Arrays.equals(new int[]
-      { 2, 4 }, posList.get(0)));
-    assertTrue(Arrays.equals(new int[]
-      { 8, 8 }, posList.get(1)));
+    assertTrue(Arrays.equals(new int[] { 2, 4 }, posList.get(0)));
+    assertTrue(Arrays.equals(new int[] { 8, 8 }, posList.get(1)));
 
     posList = map.get(Color.pink).get(1).get("B");
     assertEquals(1, posList.size());
-    assertTrue(Arrays.equals(new int[]
-      { 5, 7 }, posList.get(0)));
+    assertTrue(Arrays.equals(new int[] { 5, 7 }, posList.get(0)));
 
     posList = map.get(Color.red).get(0).get("B");
     assertEquals(1, posList.size());
-    assertTrue(Arrays.equals(new int[]
-      { 1, 4 }, posList.get(0)));
+    assertTrue(Arrays.equals(new int[] { 1, 4 }, posList.get(0)));
 
     posList = map.get(Color.red).get(1).get("A");
     assertEquals(1, posList.size());
-    assertTrue(Arrays.equals(new int[]
-      { 3, 5 }, posList.get(0)));
+    assertTrue(Arrays.equals(new int[] { 3, 5 }, posList.get(0)));
 
     posList = map.get(Color.orange).get(0).get("C");
     assertEquals(1, posList.size());
-    assertTrue(Arrays.equals(new int[]
-      { 5, 9 }, posList.get(0)));
+    assertTrue(Arrays.equals(new int[] { 5, 9 }, posList.get(0)));
   }
 
-  @Test(groups ={ "Functional" })
+  @Test(groups = { "Functional" })
   public void testBuildColourCommands()
   {
 
-    Map<Color, Map<Integer, Map<String, List<int[]>>>> map = new LinkedHashMap<Color, Map<Integer, Map<String, List<int[]>>>>();
+    Map<Color, SortedMap<Integer, Map<String, List<int[]>>>> map = new LinkedHashMap<Color, SortedMap<Integer, Map<String, List<int[]>>>>();
     ChimeraCommands.addColourRange(map, Color.blue, 0, 2, 5, "A");
     ChimeraCommands.addColourRange(map, Color.blue, 0, 7, 7, "B");
     ChimeraCommands.addColourRange(map, Color.blue, 0, 9, 23, "A");