JAL-1632 JAL-2416 load score matrices from file, as float[][]

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

diff --git a/test/jalview/util/ComparisonTest.java b/test/jalview/util/ComparisonTest.java
index bce34d4..f955879 100644 (file)
--- a/test/jalview/util/ComparisonTest.java
+++ b/test/jalview/util/ComparisonTest.java
@@ -26,12 +26,21 @@ import static org.testng.AssertJUnit.assertTrue;
 
 import jalview.datamodel.Sequence;
 import jalview.datamodel.SequenceI;
+import jalview.gui.JvOptionPane;
 
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 public class ComparisonTest
 {
 
+  @BeforeClass(alwaysRun = true)
+  public void setUpJvOptionPane()
+  {
+    JvOptionPane.setInteractiveMode(false);
+    JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+  }
+
   @Test(groups = { "Functional" })
   public void testIsGap()
   {
@@ -190,14 +199,14 @@ public class ComparisonTest
   }
 
   @Test(groups = { "Functional" })
-  public void compareCharsTest()
+  public void testIsSameResidue()
   {
-    assertTrue(Comparison.compareChars('a', 'a', false));
-    assertTrue(Comparison.compareChars('a', 'a', true));
-    assertTrue(Comparison.compareChars('A', 'a', false));
-    assertTrue(Comparison.compareChars('a', 'A', false));
+    assertTrue(Comparison.isSameResidue('a', 'a', false));
+    assertTrue(Comparison.isSameResidue('a', 'a', true));
+    assertTrue(Comparison.isSameResidue('A', 'a', false));
+    assertTrue(Comparison.isSameResidue('a', 'A', false));
 
-    assertFalse(Comparison.compareChars('a', 'A', true));
-    assertFalse(Comparison.compareChars('A', 'a', true));
+    assertFalse(Comparison.isSameResidue('a', 'A', true));
+    assertFalse(Comparison.isSameResidue('A', 'a', true));
   }
 }