X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fgui%2FAlignmentPanelTest.java;h=0f254dca738368e16b26b601c7b09fb46fc408d2;hb=c3d723759ba265ecdd89ddef7d59ebc9f33de784;hp=2d7e3dc38aee2ef00869dae3f6b90140a4b9759e;hpb=3659ecfe7bb17dd25a0a6b5c94a7d9dab4525136;p=jalview.git

diff --git a/test/jalview/gui/AlignmentPanelTest.java b/test/jalview/gui/AlignmentPanelTest.java
index 2d7e3dc..0f254dc 100644
--- a/test/jalview/gui/AlignmentPanelTest.java
+++ b/test/jalview/gui/AlignmentPanelTest.java
@@ -23,6 +23,7 @@ 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.Dimension;
 import java.awt.Font;
@@ -291,41 +292,66 @@ public class AlignmentPanelTest
     Cache.setProperty("FIGURE_AUTOIDWIDTH", Boolean.TRUE.toString());
     assertEquals(115, af.alignPanel.getVisibleIdWidth(false));
   }
- 
+  @Test(groups = { "Functional", "Not-bamboo" })
+  public void testresetIdWidth()
+  {
+    /*
+     * width for onscreen rendering is IDPanel width
+     */
+    int w = af.alignPanel.getVisibleIdWidth(true);
+    assertEquals(w, af.alignPanel.getIdPanel().getWidth());
+    assertEquals(w, 115);
+
+    // manually adjust 
+    af.viewport.setIdWidth(200);
+    w = af.alignPanel.calculateIdWidth().width;
+    assertTrue(af.alignPanel.getIdPanel().getIdCanvas().isManuallyAdjusted());
+    assertEquals(w, af.alignPanel.getIdPanel().getWidth());
+
+    af.viewport.setIdWidth(-1);
+    af.alignPanel.getIdPanel().getIdCanvas().setManuallyAdjusted(false);
+    w = af.alignPanel.calculateIdWidth().width;
+    
+    assertEquals(w, af.alignPanel.getIdPanel().getWidth());
+
+    assertNotEquals(w,115);
+  }
   @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");