X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fanalysis%2Fscoremodels%2FScoreModelsTest.java;fp=test%2Fjalview%2Fanalysis%2Fscoremodels%2FScoreModelsTest.java;h=2ebbe5c72562fa9c12ccab400b2c169783459811;hb=3b42127c52b4e7c7fa3b11948db8b5cc9a8a3721;hp=03c4b840dbd52c9aaabdeef8e59c5e7b0a5498fd;hpb=7c9fbca0e2d9be5fd05e1c89f24f81d558bf6849;p=jalview.git

diff --git a/test/jalview/analysis/scoremodels/ScoreModelsTest.java b/test/jalview/analysis/scoremodels/ScoreModelsTest.java
index 03c4b84..2ebbe5c 100644
--- a/test/jalview/analysis/scoremodels/ScoreModelsTest.java
+++ b/test/jalview/analysis/scoremodels/ScoreModelsTest.java
@@ -24,9 +24,7 @@ public class ScoreModelsTest
     assertTrue(models.hasNext());
 
     /*
-     * models are served in alphabetical order of name
-     * it so happens the 3 ScoreMatrix models precede the two
-     * others
+     * models are served in order of addition
      */
     ScoreModelI sm = models.next();
     assertTrue(sm instanceof ScoreMatrix);
@@ -35,20 +33,26 @@ public class ScoreModelsTest
 
     sm = models.next();
     assertTrue(sm instanceof ScoreMatrix);
-    assertEquals(sm.getName(), "DNA");
-    assertEquals(((ScoreMatrix) sm).getPairwiseScore('c', 'x'), 1f);
+    assertEquals(sm.getName(), "PAM250");
+    assertEquals(((ScoreMatrix) sm).getPairwiseScore('R', 'C'), -4f);
 
     sm = models.next();
     assertTrue(sm instanceof ScoreMatrix);
-    assertEquals(sm.getName(), "PAM250");
-    assertEquals(((ScoreMatrix) sm).getPairwiseScore('R', 'C'), -4f);
+    assertEquals(sm.getName(), "Identity (SeqSpace)");
+    assertEquals(((ScoreMatrix) sm).getPairwiseScore('R', 'C'), 0f);
+    assertEquals(((ScoreMatrix) sm).getPairwiseScore('R', 'r'), 1f);
 
     sm = models.next();
-    assertFalse(sm instanceof ScoreMatrix);
-    assertEquals(sm.getName(), "PID");
+    assertTrue(sm instanceof ScoreMatrix);
+    assertEquals(sm.getName(), "DNA");
+    assertEquals(((ScoreMatrix) sm).getPairwiseScore('c', 'x'), 1f);
 
     sm = models.next();
     assertFalse(sm instanceof ScoreMatrix);
     assertEquals(sm.getName(), "Sequence Feature Similarity");
+
+    sm = models.next();
+    assertFalse(sm instanceof ScoreMatrix);
+    assertEquals(sm.getName(), "PID");
   }
 }