X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fschemes%2FScoreMatrixPrinter.java;h=f00ac8d9f7c5f048b74d9e4f34bd3f5beed4ade3;hb=fddf3084802b37e5cee17829e32692a4aac3e60d;hp=e15c30b0d6557aca0ff314c0257a91b363424b86;hpb=59d682209891099d46b960509907c79e3fb276fe;p=jalview.git

diff --git a/test/jalview/schemes/ScoreMatrixPrinter.java b/test/jalview/schemes/ScoreMatrixPrinter.java
index e15c30b..f00ac8d 100644
--- a/test/jalview/schemes/ScoreMatrixPrinter.java
+++ b/test/jalview/schemes/ScoreMatrixPrinter.java
@@ -1,45 +1,56 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8)
- * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
  * Jalview is free software: you can redistribute it and/or
  * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
  *  
  * Jalview is distributed in the hope that it will be useful, but 
  * WITHOUT ANY WARRANTY; without even the implied warranty 
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
  * PURPOSE.  See the GNU General Public License for more details.
  * 
- * You should have received a copy of the GNU General Public License along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
 package jalview.schemes;
 
-import java.util.Map;
+import jalview.api.analysis.ScoreModelI;
 
-import org.junit.Test;
+import java.util.Map;
 
+import org.testng.annotations.Test;
 
-public class ScoreMatrixPrinter 
+public class ScoreMatrixPrinter
 {
-  @Test
+  @Test(groups ={ "Functional" })
   public void printAllMatrices()
   {
-    for (Map.Entry<String,ScoreMatrix> sm:((Map<String, ScoreMatrix>) ResidueProperties.scoreMatrices).entrySet())
+    for (Map.Entry<String, ScoreModelI> sm : ResidueProperties.scoreMatrices
+            .entrySet())
     {
-      System.out.println("Matrix "+sm.getKey());
+      System.out.println("Matrix " + sm.getKey());
       System.out.println(sm.getValue().toString());
     }
   }
-  @Test
+
+  @Test(groups ={ "Functional" })
   public void printHTMLMatrices()
   {
-    for (Map.Entry<String,ScoreMatrix> sm:((Map<String, ScoreMatrix>) ResidueProperties.scoreMatrices).entrySet())
+    for (Map.Entry<String, ScoreModelI> _sm : ResidueProperties.scoreMatrices
+            .entrySet())
     {
-      System.out.println("Matrix "+sm.getKey());
-      System.out.println(sm.getValue().outputMatrix(true));
+      if (_sm.getValue() instanceof ScoreMatrix)
+      {
+        ScoreMatrix sm = (ScoreMatrix) _sm.getValue();
+        System.out.println("Matrix " + _sm.getKey());
+        System.out.println(sm.outputMatrix(true));
+      }
     }
   }