X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=test%2Fjalview%2Fschemes%2FScoreMatrixPrinter.java;h=80241fb75e5621d2b8a9b8ac313ed40bb655632d;hb=7e82c1426d70a5072fa6fc0eb869e22a11775cd7;hp=a472951e33053abaa4c5665ad6156c767e48b092;hpb=865a855a4ca87eadb3e5ff284ed32ed307d9c34b;p=jalview.git

diff --git a/test/jalview/schemes/ScoreMatrixPrinter.java b/test/jalview/schemes/ScoreMatrixPrinter.java
index a472951..80241fb 100644
--- a/test/jalview/schemes/ScoreMatrixPrinter.java
+++ b/test/jalview/schemes/ScoreMatrixPrinter.java
@@ -1,46 +1,63 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1)
- * Copyright (C) 2014 The Jalview Authors
+ * 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 jalview.gui.JvOptionPane;
 
-import org.junit.Test;
+import java.util.Map;
 
+import org.testng.annotations.BeforeClass;
 
-public class ScoreMatrixPrinter 
+public class ScoreMatrixPrinter
 {
-  @Test
+
+  @BeforeClass(alwaysRun = true)
+  public void setUpJvOptionPane()
+  {
+    JvOptionPane.setInteractiveMode(false);
+    JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+  }
+
   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
+
   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));
+      }
     }
   }