Merge branch 'feature/JAL-3063JAXB' into features/pca_jaxb_datasetrefs_JAL-3171_JAL...

[jalview.git] / test / jalview / analysis / scoremodels / ScoreModelsTest.java

diff --git a/test/jalview/analysis/scoremodels/ScoreModelsTest.java b/test/jalview/analysis/scoremodels/ScoreModelsTest.java
index 03513f1..5e44d3d 100644 (file)
--- a/test/jalview/analysis/scoremodels/ScoreModelsTest.java
+++ b/test/jalview/analysis/scoremodels/ScoreModelsTest.java
@@ -4,10 +4,8 @@ import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 
-import jalview.api.analysis.DistanceScoreModelI;
 import jalview.api.analysis.PairwiseScoreModelI;
 import jalview.api.analysis.ScoreModelI;
-import jalview.api.analysis.SimilarityScoreModelI;
 
 import java.util.Iterator;
 
@@ -19,7 +17,7 @@ public class ScoreModelsTest
    * Verify that the singleton constructor successfully loads Jalview's built-in
    * score models
    */
-  @Test
+  @Test(groups = "Functional")
   public void testConstructor()
   {
     Iterator<ScoreModelI> models = ScoreModels.getInstance().getModels()
@@ -30,38 +28,38 @@ public class ScoreModelsTest
      * models are served in order of addition
      */
     ScoreModelI sm = models.next();
-    assertTrue(sm instanceof SimilarityScoreModelI);
+    assertTrue(sm instanceof SimilarityScoreModel);
     assertTrue(sm instanceof PairwiseScoreModelI);
-    assertFalse(sm instanceof DistanceScoreModelI);
+    assertFalse(sm instanceof DistanceScoreModel);
     assertEquals(sm.getName(), "BLOSUM62");
     assertEquals(((PairwiseScoreModelI) sm).getPairwiseScore('I', 'R'), -3f);
 
     sm = models.next();
-    assertTrue(sm instanceof SimilarityScoreModelI);
+    assertTrue(sm instanceof SimilarityScoreModel);
     assertTrue(sm instanceof PairwiseScoreModelI);
-    assertFalse(sm instanceof DistanceScoreModelI);
+    assertFalse(sm instanceof DistanceScoreModel);
     assertEquals(sm.getName(), "PAM250");
     assertEquals(((PairwiseScoreModelI) sm).getPairwiseScore('R', 'C'), -4f);
 
     sm = models.next();
-    assertTrue(sm instanceof SimilarityScoreModelI);
+    assertTrue(sm instanceof SimilarityScoreModel);
     assertTrue(sm instanceof PairwiseScoreModelI);
-    assertFalse(sm instanceof DistanceScoreModelI);
-    assertEquals(sm.getName(), "PID");
-    assertEquals(((PairwiseScoreModelI) sm).getPairwiseScore('R', 'C'), 0f);
-    assertEquals(((PairwiseScoreModelI) sm).getPairwiseScore('R', 'r'), 1f);
+    assertFalse(sm instanceof DistanceScoreModel);
+    assertEquals(sm.getName(), "DNA");
+    assertEquals(((PairwiseScoreModelI) sm).getPairwiseScore('c', 'x'), 1f);
 
     sm = models.next();
-    assertTrue(sm instanceof SimilarityScoreModelI);
+    assertTrue(sm instanceof SimilarityScoreModel);
     assertTrue(sm instanceof PairwiseScoreModelI);
-    assertFalse(sm instanceof DistanceScoreModelI);
-    assertEquals(sm.getName(), "DNA");
-    assertEquals(((PairwiseScoreModelI) sm).getPairwiseScore('c', 'x'), 1f);
+    assertFalse(sm instanceof DistanceScoreModel);
+    assertEquals(sm.getName(), "PID");
+    assertEquals(((PairwiseScoreModelI) sm).getPairwiseScore('R', 'C'), 0f);
+    assertEquals(((PairwiseScoreModelI) sm).getPairwiseScore('R', 'r'), 1f);
 
     sm = models.next();
-    assertFalse(sm instanceof SimilarityScoreModelI);
+    assertFalse(sm instanceof SimilarityScoreModel);
     assertFalse(sm instanceof PairwiseScoreModelI);
-    assertTrue(sm instanceof DistanceScoreModelI);
+    assertTrue(sm instanceof DistanceScoreModel);
     assertEquals(sm.getName(), "Sequence Feature Similarity");
   }
 
@@ -71,7 +69,7 @@ public class ScoreModelsTest
    * suite. It makes no assertions and is just provided as a utility method for
    * printing out matrices. Relocated here from ScoreMatrixPrinter.
    */
-  @Test
+  @Test(groups = "none")
   public void printAllMatrices_tabDelimited()
   {
     printAllMatrices(false);
@@ -83,7 +81,7 @@ public class ScoreModelsTest
    * suite. It makes no assertions and is just provided as a utility method for
    * printing out matrices. Relocated here from ScoreMatrixPrinter.
    */
-  @Test
+  @Test(groups = "none")
   public void printAllMatrices_asHtml()
   {
     printAllMatrices(true);