Merge remote-tracking branch 'origin/bug/JAL-3141_Messages_discrepancy_fix' into...

[jalview.git] / test / jalview / analysis / AlignSeqTest.java

diff --git a/test/jalview/analysis/AlignSeqTest.java b/test/jalview/analysis/AlignSeqTest.java
index c12f544..bd827f9 100644 (file)
--- a/test/jalview/analysis/AlignSeqTest.java
+++ b/test/jalview/analysis/AlignSeqTest.java
@@ -52,6 +52,7 @@ public class AlignSeqTest
     assertEquals(AlignSeq.extractGaps(" -", " AC-G.T"), "ACG.T");
     assertEquals(AlignSeq.extractGaps(" -.", " AC-G.T ."), "ACGT");
     assertEquals(AlignSeq.extractGaps("-", " AC-G.T"), " ACG.T");
+    assertEquals(AlignSeq.extractGaps("-. ", " -. .-"), "");
   }
 
   @Test(groups = { "Functional" })
@@ -60,7 +61,7 @@ public class AlignSeqTest
     AlignSeq as = new AlignSeq(new Sequence("s1", "TTAG"), new Sequence(
             "s2", "ACGT"), AlignSeq.DNA);
     int[] expected = new int[] { 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6,
-        7, 7, 8, 8, 9, 9, 10, -1, 11, -1 };
+        7, 7, 8, 8, 9, 9, -1, -1, 10, -1 };
     String s = "aAcCgGtTuUiIxXrRyYnN .-?";
     assertArrayEquals(expected, as.indexEncode(s));
   }
@@ -70,7 +71,7 @@ public class AlignSeqTest
   {
     AlignSeq as = new AlignSeq(new Sequence("s1", "PFY"), new Sequence(
             "s2", "RQW"), AlignSeq.PEP);
-    int[] expected = new int[] { 0, 0, 1, 1, 2, 2, 21, 21, 22, 22, 23, 24,
+    int[] expected = new int[] { 0, 0, 1, 1, 2, 2, 21, 21, 22, 22, -1, 23,
         -1, -1, -1 };
     String s = "aArRnNzZxX *.-?";
     assertArrayEquals(expected, as.indexEncode(s));