JAL-2808 JAL-3032 drop tabbed layout for Colours and Filters

[jalview.git] / test / jalview / io / ScoreMatrixFileTest.java

diff --git a/test/jalview/io/ScoreMatrixFileTest.java b/test/jalview/io/ScoreMatrixFileTest.java
index a98b2d6..97349b5 100644 (file)
--- a/test/jalview/io/ScoreMatrixFileTest.java
+++ b/test/jalview/io/ScoreMatrixFileTest.java
@@ -310,7 +310,6 @@ public class ScoreMatrixFileTest
     assertFalse(sm.isDNA());
     assertTrue(sm.isProtein());
     assertEquals(20, sm.getSize());
-    assertEquals(sm.getGapIndex(), -1);
 
     assertEquals(sm.getPairwiseScore('A', 'A'), 7f);
     assertEquals(sm.getPairwiseScore('A', 'R'), -3f);
@@ -342,7 +341,6 @@ public class ScoreMatrixFileTest
   
     assertNotNull(sm);
     assertEquals(sm.getSize(), 3);
-    assertEquals(sm.getGapIndex(), -1);
     assertEquals(sm.getName(), "MyTest");
     assertEquals(sm.getDescription(), "My description");
     assertEquals(sm.getPairwiseScore('A', 'A'), 1.0f);
@@ -486,7 +484,7 @@ public class ScoreMatrixFileTest
   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"
@@ -496,8 +494,8 @@ public class ScoreMatrixFileTest
 
     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");