X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Futil%2FComparisonTest.java;h=f95587940f15ad6a904b928cc3fa9fc278649f87;hb=c6e8e8ccd10f21698226ae37196cd9680e6804a0;hp=bce34d4f3e59f71e1ea8e30ba98eccc207bcb71f;hpb=9c7541fa7c2cb51dc138a070d6be131b5d8f68a5;p=jalview.git

diff --git a/test/jalview/util/ComparisonTest.java b/test/jalview/util/ComparisonTest.java
index bce34d4..f955879 100644
--- 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));
   }
 }