git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
85f619b
..
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(" -", " 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" })
}
@Test(groups = { "Functional" })
@@
-70,8
+71,8
@@
public class AlignSeqTest
{
AlignSeq as = new AlignSeq(new Sequence("s1", "PFY"), new Sequence(
"s2", "RQW"), AlignSeq.PEP);
{
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, -1, 24,
- -1, 23, -1 };
+ 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));
}
String s = "aArRnNzZxX *.-?";
assertArrayEquals(expected, as.indexEncode(s));
}