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-2662 Updated README
[jalview.git]
/
test
/
jalview
/
io
/
ScoreMatrixFileTest.java
diff --git
a/test/jalview/io/ScoreMatrixFileTest.java
b/test/jalview/io/ScoreMatrixFileTest.java
index
1aa191a
..
97349b5
100644
(file)
--- a/
test/jalview/io/ScoreMatrixFileTest.java
+++ b/
test/jalview/io/ScoreMatrixFileTest.java
@@
-484,7
+484,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
+494,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");