X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fgui%2FAlignmentPanelTest.java;fp=test%2Fjalview%2Fgui%2FAlignmentPanelTest.java;h=caa4e2294c433ed8979c5213548bc70c28332af1;hb=e83ce5d8ef826fc0b509a51f154abdf734501077;hp=c1896bce26e2c87224968cb917e8220c9b43b0cd;hpb=786475501a15799d7c4058dbf74e4bf896d03736;p=jalview.git

diff --git a/test/jalview/gui/AlignmentPanelTest.java b/test/jalview/gui/AlignmentPanelTest.java
index c1896bc..caa4e22 100644
--- a/test/jalview/gui/AlignmentPanelTest.java
+++ b/test/jalview/gui/AlignmentPanelTest.java
@@ -23,10 +23,13 @@ package jalview.gui;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotEquals;
 import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
 
+import java.awt.Container;
 import java.awt.Dimension;
 import java.awt.Font;
 import java.awt.FontMetrics;
+import java.awt.event.MouseEvent;
 import java.lang.reflect.InvocationTargetException;
 
 import javax.swing.SwingUtilities;
@@ -41,6 +44,7 @@ import jalview.datamodel.AlignmentAnnotation;
 import jalview.datamodel.SequenceI;
 import jalview.io.DataSourceType;
 import jalview.io.FileLoader;
+import jalview.util.Platform;
 import jalview.viewmodel.ViewportRanges;
 
 public class AlignmentPanelTest
@@ -52,7 +56,7 @@ public class AlignmentPanelTest
   {
     Jalview.main(
             new String[]
-            { "-nonews", "-props", "test/jalview/testProps.jvprops" });
+            { "--nonews", "--props", "test/jalview/testProps.jvprops" });
 
     Cache.applicationProperties.setProperty("SHOW_IDENTITY",
             Boolean.TRUE.toString());
@@ -207,9 +211,10 @@ public class AlignmentPanelTest
 
   /**
    * Test the variant of calculateIdWidth that computes the longest of any
-   * sequence name or annotation label width
+   * sequence name or annotation label width FIXME: JAL-4291: test needs
+   * updating for JAL-244 and JAL-4091
    */
-  @Test(groups = "Functional")
+  @Test(groups = "Functional", enabled = false)
   public void testCalculateIdWidth_withMaxWidth()
   {
     AlignViewportI av = af.alignPanel.getAlignViewport();
@@ -218,13 +223,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
@@ -243,11 +255,10 @@ 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);
+    // 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);
@@ -264,12 +275,16 @@ public class AlignmentPanelTest
   @Test(groups = { "Functional", "Not-bamboo" })
   public void testGetVisibleWidth()
   {
+    double scaling = jalview.gui.JvSwingUtilsTest.getScaling(af.alignPanel);
     /*
      * width for onscreen rendering is IDPanel width
      */
     int w = af.alignPanel.getVisibleIdWidth(true);
     assertEquals(w, af.alignPanel.getIdPanel().getWidth());
-    assertEquals(w, 115);
+
+    // different scaling (1.0, 2.0) gives different results
+    int expectedWidth = scaling == 1.0 ? 112 : Platform.isMac() ? 115 : 107;
+    assertEquals(w, expectedWidth);
 
     /*
      * width for offscreen rendering is the same
@@ -289,7 +304,58 @@ public class AlignmentPanelTest
      * preference for auto id width overrides fixed width
      */
     Cache.setProperty("FIGURE_AUTOIDWIDTH", Boolean.TRUE.toString());
-    assertEquals(115, af.alignPanel.getVisibleIdWidth(false));
+    w = af.alignPanel.getVisibleIdWidth(false);
+    // allow some leeway for different OS renderings
+    assertTrue(w > 105 && w < 120);
+    // different scaling (1.0, 2.0) gives different results
+    assertEquals(w, expectedWidth);
+  }
+
+  @Test(groups = { "Functional", "Not-bamboo" })
+  public void testresetIdWidth()
+  {
+    double scaling = jalview.gui.JvSwingUtilsTest.getScaling(af.alignPanel);
+    /*
+     * width for onscreen rendering is IDPanel width
+     */
+    int w = af.alignPanel.getVisibleIdWidth(true);
+    int actual = af.alignPanel.getIdPanel().getWidth();
+    assertEquals(w, actual);
+    // allow some leeway for different OS renderings
+    assertTrue(w > 105 && w < 120);
+    // different scaling (1.0, 2.0) gives different results
+    int expectedWidth = scaling == 1.0 ? 112 : Platform.isMac() ? 115 : 107;
+    assertEquals(w, expectedWidth);
+
+    // manually adjust
+    af.viewport.setIdWidth(200);
+    // fake mouse drag sets manuallyAdjusted to true (0,0 not moving mouse)
+    MouseEvent drag = new MouseEvent(af.alignPanel,
+            MouseEvent.MOUSE_DRAGGED, System.currentTimeMillis(), 0, 0, 0,
+            MouseEvent.BUTTON1, false);
+    af.alignPanel.idwidthAdjuster.mouseDragged(drag);
+    af.alignPanel.paintComponent(af.alignPanel.getGraphics());
+    w = af.alignPanel.calculateIdWidth().width;
+    assertTrue(
+            af.alignPanel.getIdPanel().getIdCanvas().isManuallyAdjusted());
+    actual = af.alignPanel.getIdPanel().getWidth();
+    assertEquals(w, actual);
+
+    af.viewport.setIdWidth(-1);
+    af.alignPanel.calculateIdWidth();
+    af.alignPanel.getIdPanel().getIdCanvas().setManuallyAdjusted(false);
+    w = af.alignPanel.calculateIdWidth().width;
+    af.alignPanel.paintComponent(af.alignPanel.getGraphics());
+
+    actual = af.alignPanel.getIdPanel().getWidth();
+    assertEquals(w, actual);
+
+    // setting a negative IdWidth and then running calculateIdWidth resets width
+    // to optimal id width
+    // allow some leeway for different OS renderings
+    assertTrue(w > 105 && w < 120);
+    // different scaling (1.0, 2.0) gives different results
+    assertEquals(w, expectedWidth);
   }
 
   @Test(groups = "Functional")