X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fschemes%2FScoreMatrixPrinter.java;h=a743163be3885243a90c27c11ba50c55d2d56ce9;hb=24680a271861e9309a2241c8884874656ac111b1;hp=d058c244b7bcd3f790868af942299ebdf62c4e0b;hpb=47168f025aefdaa044802bd5f8f510ffe43a4808;p=jalview.git

diff --git a/test/jalview/schemes/ScoreMatrixPrinter.java b/test/jalview/schemes/ScoreMatrixPrinter.java
index d058c24..a743163 100644
--- a/test/jalview/schemes/ScoreMatrixPrinter.java
+++ b/test/jalview/schemes/ScoreMatrixPrinter.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * 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.
  * 
@@ -21,32 +21,44 @@
 package jalview.schemes;
 
 import jalview.api.analysis.ScoreModelI;
+import jalview.gui.JvOptionPane;
 
 import java.util.Map;
 
-import org.junit.Test;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
 
-
-public class ScoreMatrixPrinter 
+public class ScoreMatrixPrinter
 {
-  @Test
+
+  @BeforeClass(alwaysRun = true)
+  public void setUpJvOptionPane()
+  {
+    JvOptionPane.setInteractiveMode(false);
+    JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+  }
+
+  @Test(groups = { "Functional" })
   public void printAllMatrices()
   {
-    for (Map.Entry<String,ScoreModelI> sm: 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,ScoreModelI> _sm: ResidueProperties.scoreMatrices.entrySet())
+    for (Map.Entry<String, ScoreModelI> _sm : ResidueProperties.scoreMatrices
+            .entrySet())
     {
       if (_sm.getValue() instanceof ScoreMatrix)
       {
         ScoreMatrix sm = (ScoreMatrix) _sm.getValue();
-        System.out.println("Matrix "+_sm.getKey());
+        System.out.println("Matrix " + _sm.getKey());
         System.out.println(sm.outputMatrix(true));
       }
     }