Merge branch 'j2s/develop-toc' into j2s/develop

[jalview.git] / test / jalview / gui / FontChooserTest.java

diff --git a/test/jalview/gui/FontChooserTest.java b/test/jalview/gui/FontChooserTest.java
index d724fac..8da11b8 100644 (file)
--- a/test/jalview/gui/FontChooserTest.java
+++ b/test/jalview/gui/FontChooserTest.java
@@ -4,7 +4,7 @@ import java.awt.Canvas;
 import java.awt.Font;
 import java.awt.FontMetrics;
 
-import org.junit.Test;
+import org.testng.annotations.Test;
 
 public class FontChooserTest
 {
@@ -15,15 +15,16 @@ public class FontChooserTest
    * available, plain) fonts and point sizes that would be rejected by Jalview's
    * FontChooser as having an I-width of less than 1.0.
    */
-  @Test
+  @Test(groups ={ "Functional" })
   public void dumpInvalidFonts()
   {
     String[] fonts = java.awt.GraphicsEnvironment
             .getLocalGraphicsEnvironment().getAvailableFontFamilyNames();
+    final Canvas canvas = new Canvas();
     for (int pointSize = 1;; pointSize++)
     {
       System.out.println(System.lineSeparator()
-              + "Fonts with insufficient width at " + pointSize + "pt:");
+              + "Plain fonts with sub-pixel width at " + pointSize + "pt:");
       if (pointSize == 1)
       {
         System.out.println("All except:");
@@ -32,7 +33,7 @@ public class FontChooserTest
       for (String fontname : fonts)
       {
         Font newFont = new Font(fontname, Font.PLAIN, pointSize);
-        FontMetrics fontm = new Canvas().getFontMetrics(newFont);
+        FontMetrics fontm = canvas.getFontMetrics(newFont);
         double iw = fontm.getStringBounds("I", null).getWidth();
         final boolean tooSmall = iw < 1d;
         if (tooSmall)