X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fanalysis%2FConservationTest.java;h=fb58655be2316b2dd4c39b6c93fde563494dd435;hb=c794c5033adeee182b03a5ea92c0a7495a29661f;hp=c419687a84fd3877f11f6fcc8e5c4e3d83b4a7eb;hpb=9f6812a0b52a027056dff1425d20f674d114e55c;p=jalview.git

diff --git a/test/jalview/analysis/ConservationTest.java b/test/jalview/analysis/ConservationTest.java
index c419687..fb58655 100644
--- a/test/jalview/analysis/ConservationTest.java
+++ b/test/jalview/analysis/ConservationTest.java
@@ -1,3 +1,23 @@
+/*
+ * 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.analysis;
 
 import static org.testng.Assert.assertEquals;
@@ -5,16 +25,26 @@ import static org.testng.Assert.assertTrue;
 
 import jalview.datamodel.Sequence;
 import jalview.datamodel.SequenceI;
+import jalview.gui.JvOptionPane;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 public class ConservationTest
 {
+
+  @BeforeClass(alwaysRun = true)
+  public void setUpJvOptionPane()
+  {
+    JvOptionPane.setInteractiveMode(false);
+    JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+  }
+
   @Test(groups = "Functional")
   public void testRecordConservation()
   {
@@ -48,7 +78,7 @@ public class ConservationTest
     seqs.add(new Sequence("seq3", "VG-Y"));
     seqs.add(new Sequence("seq4", "VGNW"));
 
-    Conservation cons = new Conservation("", 3, seqs, 0, 50);
+    Conservation cons = new Conservation("", seqs, 0, 50);
     int[] counts = cons.countConservationAndGaps(0);
     assertEquals(counts[0], 1); // conserved
     assertEquals(counts[1], 1); // gap count