X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fanalysis%2Fscoremodels%2FScoreModelsTest.java;h=9684cf2e568748dc0cdaa4ca4f56e8d5410218f8;hb=f6a84063f10ea1ae9898310c541961cd1d53dd8a;hp=c4c3edb729350a364c9b232f7fb5c85cb6a6578a;hpb=7f5ab7d1f58d870622968e0e6a430f33403b8e4f;p=jalview.git

diff --git a/test/jalview/analysis/scoremodels/ScoreModelsTest.java b/test/jalview/analysis/scoremodels/ScoreModelsTest.java
index c4c3edb..9684cf2 100644
--- a/test/jalview/analysis/scoremodels/ScoreModelsTest.java
+++ b/test/jalview/analysis/scoremodels/ScoreModelsTest.java
@@ -4,11 +4,11 @@ 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.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
 import java.util.Iterator;
 
 import org.testng.annotations.Test;
@@ -19,7 +19,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,45 +30,39 @@ 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(), "Identity (SeqSpace)");
-    assertEquals(((PairwiseScoreModelI) sm).getPairwiseScore('R', 'C'), 0f);
-    assertEquals(((PairwiseScoreModelI) sm).getPairwiseScore('R', 'r'), 1f);
-
-    sm = models.next();
-    assertTrue(sm instanceof SimilarityScoreModelI);
-    assertTrue(sm instanceof PairwiseScoreModelI);
-    assertFalse(sm instanceof DistanceScoreModelI);
+    assertFalse(sm instanceof DistanceScoreModel);
     assertEquals(sm.getName(), "DNA");
     assertEquals(((PairwiseScoreModelI) sm).getPairwiseScore('c', 'x'), 1f);
 
     sm = models.next();
-    assertFalse(sm instanceof SimilarityScoreModelI);
-    assertFalse(sm instanceof PairwiseScoreModelI);
-    assertTrue(sm instanceof DistanceScoreModelI);
-    assertEquals(sm.getName(), "Sequence Feature Similarity");
+    assertTrue(sm instanceof SimilarityScoreModel);
+    assertTrue(sm instanceof PairwiseScoreModelI);
+    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);
-    assertEquals(sm.getName(), "PID");
+    assertTrue(sm instanceof DistanceScoreModel);
+    assertEquals(sm.getName(), "Sequence Feature Similarity");
   }
 
   /**
@@ -77,7 +71,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);
@@ -89,7 +83,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);
@@ -110,4 +104,17 @@ public class ScoreModelsTest
       }
     }
   }
+
+  @Test(groups = "Functional")
+  public void testInstantiate()
+          throws InstantiationException, IllegalAccessException,
+          NoSuchMethodException, SecurityException,
+          IllegalArgumentException, InvocationTargetException
+  {
+    Class<? extends Object> c = ScoreModels.class;
+    Constructor<? extends Object> con = c.getDeclaredConstructor();
+    con.setAccessible(true);
+    Object o = con.newInstance();
+    System.out.println(o);
+  }
 }