JAL-244 attempt to fix broken test - still needs to be fixed!

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

diff --git a/test/jalview/gui/AlignmentPanelTest.java b/test/jalview/gui/AlignmentPanelTest.java
index a6bce20..0e2bf54 100644 (file)
--- a/test/jalview/gui/AlignmentPanelTest.java
+++ b/test/jalview/gui/AlignmentPanelTest.java
@@ -24,6 +24,7 @@ import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotEquals;
 import static org.testng.Assert.assertNotNull;
 
+import java.awt.Container;
 import java.awt.Dimension;
 import java.awt.Font;
 import java.awt.FontMetrics;
@@ -50,22 +51,26 @@ public class AlignmentPanelTest
   @BeforeMethod(alwaysRun = true)
   public void setUp() throws InvocationTargetException, InterruptedException
   {
-    Jalview.main(new String[] { "-nonews", "-props",
-        "test/jalview/testProps.jvprops" });
+    Jalview.main(
+            new String[]
+            { "--nonews", "--props", "test/jalview/testProps.jvprops" });
 
     Cache.applicationProperties.setProperty("SHOW_IDENTITY",
             Boolean.TRUE.toString());
     af = new FileLoader().LoadFileWaitTillLoaded("examples/uniref50.fa",
             DataSourceType.FILE);
-    
+
     /*
      * ensure the panel has been repainted and so ViewportRanges set
      */
-    SwingUtilities.invokeAndWait(new Runnable() {
-               @Override
-               public void run() {
-                   af.repaint();
-               }});
+    SwingUtilities.invokeAndWait(new Runnable()
+    {
+      @Override
+      public void run()
+      {
+        af.repaint();
+      }
+    });
 
     /*
      * wait for Consensus thread to complete
@@ -128,8 +133,8 @@ public class AlignmentPanelTest
     scrollpos = 130;
     af.getViewport().showAllHiddenColumns();
     af.alignPanel.setScrollValues(scrollpos, 5);
-    assertEquals(ranges.getEndRes(), af.getViewport()
-            .getAlignment().getWidth() - 1);
+    assertEquals(ranges.getEndRes(),
+            af.getViewport().getAlignment().getWidth() - 1);
 
     // now hide some columns, and scroll to position within <width>
     // distance of the end of the alignment
@@ -137,9 +142,11 @@ public class AlignmentPanelTest
     // columns
     af.getViewport().hideColumns(30, 50);
     af.alignPanel.setScrollValues(scrollpos, 5);
-    assertEquals(ranges.getEndRes(), af.getViewport()
-            .getAlignment().getWidth() - 1 - 21); // 21 is the number of hidden
-                                                  // columns
+    assertEquals(ranges.getEndRes(),
+            af.getViewport().getAlignment().getWidth() - 1 - 21); // 21 is the
+                                                                  // number of
+                                                                  // hidden
+                                                                  // columns
   }
 
   /**
@@ -169,8 +176,8 @@ public class AlignmentPanelTest
   }
 
   /**
-   * Test the variant of calculateIdWidth that only recomputes the width if it is
-   * not already saved in the viewport (initial value is -1)
+   * Test the variant of calculateIdWidth that only recomputes the width if it
+   * is not already saved in the viewport (initial value is -1)
    */
   @Test(groups = "Functional")
   public void testCalculateIdWidth_noArgs()
@@ -202,6 +209,7 @@ public class AlignmentPanelTest
   /**
    * Test the variant of calculateIdWidth that computes the longest of any
    * sequence name or annotation label width
+   * FIXME: test needs updating for JAL-244 and JAL-4091
    */
   @Test(groups = "Functional")
   public void testCalculateIdWidth_withMaxWidth()
@@ -212,13 +220,20 @@ public class AlignmentPanelTest
     av.setShowAnnotation(false);
     av.setIdWidth(18);
 
+    FontMetrics fmfor = new Container()
+            .getFontMetrics(new Font(af.viewport.font.getName(),
+                    Font.ITALIC, af.viewport.font.getSize()));
+
     /*
      * note 4 pixels 'padding' are added to the longest seq name/annotation label
      */
     Dimension d = af.alignPanel.calculateIdWidth(2000);
+    // Assumption ID_WIDTH_PADDING == 4
+    int expwidth = 3 + fmfor.stringWidth("Conservation");
+
     assertEquals(d.width, 166); // 4 + pixel width of "Q93Z60_ARATH/1-118"
     assertEquals(d.height, 12); // fixed value (not used?)
-    assertEquals(av.getIdWidth(), 18); // not changed by this method
+    assertEquals(av.getIdWidth(), expwidth); // not changed by this method
 
     /*
      * make the longest sequence name longer
@@ -237,12 +252,12 @@ public class AlignmentPanelTest
      */
     AlignmentAnnotation aa = av.getAlignment().getAlignmentAnnotation()[0];
     aa.label = "THIS IS A VERY LONG LABEL INDEED";
-    FontMetrics fmfor = af.alignPanel
-            .getFontMetrics(af.alignPanel.getAlabels().getFont());
-    // Assumption ID_WIDTH_PADDING == 4
-    int expwidth = 4 + fmfor.stringWidth(aa.label);
     d = af.alignPanel.calculateIdWidth(2000);
-    assertEquals(d.width, expwidth); // 228 == ID_WIDTH_PADDING + pixel width of "THIS IS A VERY LONG LABEL INDEED"
+    // Assumption ID_WIDTH_PADDING == 3
+    expwidth = 3 + fmfor.stringWidth(aa.label);
+
+    assertEquals(d.width, expwidth); // 228 == ID_WIDTH_PADDING + pixel width of
+                                     // "THIS IS A VERY LONG LABEL INDEED"
     assertEquals(d.height, 12);
 
     /*
@@ -284,41 +299,43 @@ public class AlignmentPanelTest
     Cache.setProperty("FIGURE_AUTOIDWIDTH", Boolean.TRUE.toString());
     assertEquals(115, af.alignPanel.getVisibleIdWidth(false));
   }
- 
+
   @Test(groups = "Functional")
   public void testSetOverviewTitle()
   {
     OverviewPanel ov1 = this.af.openOverviewPanel(true);
     String alignFrameTitle = af.getTitle();
     assertEquals(ov1.getTitle(), "Overview " + alignFrameTitle);
-    
+
     /*
      * on New View, existing overview should get " Original" added to title
      * and new view's overview should get " View 1" added
      */
     af.newView_actionPerformed(null);
-    assertEquals(ov1.getTitle(), "Overview " + alignFrameTitle + " Original");
+    assertEquals(ov1.getTitle(),
+            "Overview " + alignFrameTitle + " Original");
     OverviewPanel ov2 = this.af.openOverviewPanel(true);
     assertEquals(ov2.getTitle(), "Overview " + alignFrameTitle + " View 1");
   }
-  
+
   @Test(groups = "Functional")
   public void testSetOverviewTitle_automaticOverview()
   {
-    Cache.setProperty("SHOW_OVERVIEW",  "true");
+    Cache.setProperty("SHOW_OVERVIEW", "true");
     AlignFrame alignFrame = new FileLoader().LoadFileWaitTillLoaded(
             "examples/uniref50.fa", DataSourceType.FILE);
     OverviewPanel ov1 = alignFrame.alignPanel.getOverviewPanel();
     assertNotNull(ov1);
     String alignFrameTitle = alignFrame.getTitle();
     assertEquals(ov1.getTitle(), "Overview " + alignFrameTitle);
-    
+
     /*
      * on New View, existing overview should get " Original" added to title
      * and new view's automatic overview should have " View 1" added
      */
     alignFrame.newView_actionPerformed(null);
-    assertEquals(ov1.getTitle(), "Overview " + alignFrameTitle + " Original");
+    assertEquals(ov1.getTitle(),
+            "Overview " + alignFrameTitle + " Original");
     OverviewPanel ov2 = alignFrame.alignPanel.getOverviewPanel();
     assertNotNull(ov2);
     assertEquals(ov2.getTitle(), "Overview " + alignFrameTitle + " View 1");