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
JAL-2089 patch broken merge to master for Release 2.10.0b1
[jalview.git]
/
test
/
jalview
/
analysis
/
TestAlignSeq.java
diff --git
a/test/jalview/analysis/TestAlignSeq.java
b/test/jalview/analysis/TestAlignSeq.java
index
81bcf86
..
43ebd63
100644
(file)
--- a/
test/jalview/analysis/TestAlignSeq.java
+++ b/
test/jalview/analysis/TestAlignSeq.java
@@
-46,7
+46,7
@@
public class TestAlignSeq
/**
* @throws java.lang.Exception
*/
/**
* @throws java.lang.Exception
*/
- @BeforeMethod
+ @BeforeMethod(alwaysRun = true)
public void setUp() throws Exception
{
s1 = new Sequence("Seq1", "ASDFAQQQRRRSSS");
public void setUp() throws Exception
{
s1 = new Sequence("Seq1", "ASDFAQQQRRRSSS");
@@
-59,14
+59,13
@@
public class TestAlignSeq
}
}
- @Test
+ @Test(groups = { "Functional" })
/**
* simple test that mapping from alignment corresponds identical positions.
*/
public void testGetMappingForS1()
{
/**
* simple test that mapping from alignment corresponds identical positions.
*/
public void testGetMappingForS1()
{
- AlignSeq as = AlignSeq
- .doGlobalNWAlignment(s1, s2, AlignSeq.PEP);
+ AlignSeq as = AlignSeq.doGlobalNWAlignment(s1, s2, AlignSeq.PEP);
System.out.println("s1: " + as.getAStr1());
System.out.println("s2: " + as.getAStr2());
System.out.println("s1: " + as.getAStr1());
System.out.println("s2: " + as.getAStr2());
@@
-86,7
+85,7
@@
public class TestAlignSeq
}
}
}
}
- @Test
+ @Test(groups = { "Functional" })
public void testExtractGaps()
{
assertNull(AlignSeq.extractGaps(null, null));
public void testExtractGaps()
{
assertNull(AlignSeq.extractGaps(null, null));
@@
-96,7
+95,7
@@
public class TestAlignSeq
assertEquals("ABCD", AlignSeq.extractGaps(" .-", ". -A-B.C D."));
}
assertEquals("ABCD", AlignSeq.extractGaps(" .-", ". -A-B.C D."));
}
- @Test
+ @Test(groups = { "Functional" })
public void testPrintAlignment()
{
AlignSeq as = AlignSeq.doGlobalNWAlignment(s1, s3, AlignSeq.PEP);
public void testPrintAlignment()
{
AlignSeq as = AlignSeq.doGlobalNWAlignment(s1, s3, AlignSeq.PEP);
@@
-120,7
+119,7
@@
public class TestAlignSeq
String expected = "Score = 320\nLength of alignment = 10\nSequence Seq1 : 3 - 18 (Sequence length = 14)\nSequence Seq1 : 1 - 10 (Sequence length = 10)\n\n"
+ "Seq1 SDFAQQQRRR\n"
+ " ||||||| \n"
String expected = "Score = 320\nLength of alignment = 10\nSequence Seq1 : 3 - 18 (Sequence length = 14)\nSequence Seq1 : 1 - 10 (Sequence length = 10)\n\n"
+ "Seq1 SDFAQQQRRR\n"
+ " ||||||| \n"
- + "Seq1 SDFAQQQSSS\n\n" + "Percentage ID = 70.00\n\n";
+ + "Seq1 SDFAQQQSSS\n\n" + "Percentage ID = 70.00\n";
assertEquals(expected, baos.toString());
}
}
assertEquals(expected, baos.toString());
}
}