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-2226 transfer chain annotation when calcId, label and description are distinct...
[jalview.git]
/
test
/
jalview
/
io
/
ScoreMatrixFileTest.java
diff --git
a/test/jalview/io/ScoreMatrixFileTest.java
b/test/jalview/io/ScoreMatrixFileTest.java
index
1aa191a
..
254feaa
100644
(file)
--- a/
test/jalview/io/ScoreMatrixFileTest.java
+++ b/
test/jalview/io/ScoreMatrixFileTest.java
@@
-13,11
+13,18
@@
import jalview.analysis.scoremodels.ScoreModels;
import java.io.IOException;
import java.net.MalformedURLException;
import java.io.IOException;
import java.net.MalformedURLException;
+import org.testng.annotations.AfterMethod;
import org.testng.annotations.Test;
public class ScoreMatrixFileTest
{
import org.testng.annotations.Test;
public class ScoreMatrixFileTest
{
+ @AfterMethod(alwaysRun=true)
+ public void tearDownAfterTest()
+ {
+ ScoreModels.getInstance().reset();
+ }
+
/**
* Test a successful parse of a (small) score matrix file
*
/**
* Test a successful parse of a (small) score matrix file
*
@@
-484,7
+491,7
@@
public class ScoreMatrixFileTest
public void testParse_ncbiFormat() throws MalformedURLException,
IOException
{
public void testParse_ncbiFormat() throws MalformedURLException,
IOException
{
- assertNull(ScoreModels.getInstance().forName("MyNewTest"));
+ assertNull(ScoreModels.getInstance().getScoreModel("MyNewTest", null));
String data = "ScoreMatrix MyNewTest\n" + "\tA\tB\tC\n"
+ "A\t1.0\t2.0\t3.0\n" + "B\t4.0\t5.0\t6.0\n"
String data = "ScoreMatrix MyNewTest\n" + "\tA\tB\tC\n"
+ "A\t1.0\t2.0\t3.0\n" + "B\t4.0\t5.0\t6.0\n"
@@
-494,8
+501,8
@@
public class ScoreMatrixFileTest
parser.parse();
parser.parse();
- ScoreMatrix sm = (ScoreMatrix) ScoreModels.getInstance().forName(
- "MyNewTest");
+ ScoreMatrix sm = (ScoreMatrix) ScoreModels.getInstance().getScoreModel(
+ "MyNewTest", null);
assertNotNull(sm);
assertEquals(sm.getName(), "MyNewTest");
assertEquals(parser.getMatrixName(), "MyNewTest");
assertNotNull(sm);
assertEquals(sm.getName(), "MyNewTest");
assertEquals(parser.getMatrixName(), "MyNewTest");