X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fgui%2FSeqCanvasTest.java;fp=test%2Fjalview%2Fgui%2FSeqCanvasTest.java;h=aa50301f215b39d30dbc83773f62bb9613ab9307;hb=afbff636fa2dfa01daa1f4ec4e8a936e61e3cf16;hp=84d2b79fed9a8ce83078ce6a03db6e19beaabc99;hpb=c6df3928336440918d23b4e7cb579f134e2f48dd;p=jalview.git

diff --git a/test/jalview/gui/SeqCanvasTest.java b/test/jalview/gui/SeqCanvasTest.java
index 84d2b79..aa50301 100644
--- a/test/jalview/gui/SeqCanvasTest.java
+++ b/test/jalview/gui/SeqCanvasTest.java
@@ -31,7 +31,6 @@ import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertTrue;
 
-
 import jalview.bin.Cache;
 import jalview.datamodel.AlignmentI;
 import jalview.datamodel.SearchResults;
@@ -86,13 +85,15 @@ public class SeqCanvasTest
     int canvasWidth = 400;
     int canvasHeight = 300;
     int residueColumns = (canvasWidth - 2 * labelWidth) / charWidth;
-    int wrappedWidth = testee.calculateWrappedGeometry(canvasWidth, canvasHeight);
+    int wrappedWidth = testee.calculateWrappedGeometry(canvasWidth,
+            canvasHeight);
     assertEquals(wrappedWidth, residueColumns);
     assertEquals(PA.getValue(testee, "labelWidthWest"), labelWidth);
     assertEquals(PA.getValue(testee, "labelWidthEast"), labelWidth);
     assertEquals(PA.getValue(testee, "wrappedSpaceAboveAlignment"),
             2 * charHeight);
-    int repeatingHeight = (int) PA.getValue(testee, "wrappedRepeatHeightPx");
+    int repeatingHeight = (int) PA.getValue(testee,
+            "wrappedRepeatHeightPx");
     assertEquals(repeatingHeight, charHeight * (2 + al.getHeight()));
     assertEquals(PA.getValue(testee, "wrappedVisibleWidths"), 1);
 
@@ -225,7 +226,7 @@ public class SeqCanvasTest
     AlignmentI al = av.getAlignment();
     assertEquals(al.getWidth(), 157);
     assertEquals(al.getHeight(), 15);
-  
+
     av.setWrapAlignment(true);
     av.getRanges().setStartEndSeq(0, 14);
     av.setFont(new Font("SansSerif", Font.PLAIN, 14), true);
@@ -233,9 +234,9 @@ public class SeqCanvasTest
     int charWidth = av.getCharWidth();
     assertEquals(charHeight, 17);
     assertEquals(charWidth, 12);
-  
+
     SeqCanvas testee = af.alignPanel.getSeqPanel().seqCanvas;
-  
+
     /*
      * first with scales above, left, right
      */
@@ -255,17 +256,19 @@ public class SeqCanvasTest
     int canvasWidth = 400;
     int canvasHeight = 300;
     int residueColumns = (canvasWidth - 2 * labelWidth) / charWidth;
-    int wrappedWidth = testee.calculateWrappedGeometry(canvasWidth, canvasHeight);
+    int wrappedWidth = testee.calculateWrappedGeometry(canvasWidth,
+            canvasHeight);
     assertEquals(wrappedWidth, residueColumns);
     assertEquals(PA.getValue(testee, "labelWidthWest"), labelWidth);
     assertEquals(PA.getValue(testee, "labelWidthEast"), labelWidth);
     assertEquals(PA.getValue(testee, "wrappedSpaceAboveAlignment"),
             2 * charHeight);
-    int repeatingHeight = (int) PA.getValue(testee, "wrappedRepeatHeightPx");
+    int repeatingHeight = (int) PA.getValue(testee,
+            "wrappedRepeatHeightPx");
     assertEquals(repeatingHeight, charHeight * (2 + al.getHeight())
             + SeqCanvas.SEQS_ANNOTATION_GAP + annotationHeight);
     assertEquals(PA.getValue(testee, "wrappedVisibleWidths"), 1);
-  
+
     /*
      * repeat height is 17 * (2 + 15) = 289 + 3 + annotationHeight = 510
      * make canvas height 2 of these plus 3 charHeights 
@@ -275,7 +278,7 @@ public class SeqCanvasTest
             + 2 * (annotationHeight + SeqCanvas.SEQS_ANNOTATION_GAP);
     testee.calculateWrappedGeometry(canvasWidth, canvasHeight);
     assertEquals(PA.getValue(testee, "wrappedVisibleWidths"), 3);
-  
+
     /*
      * reduce canvas height by 1 pixel - should not be enough height
      * to draw 3 widths
@@ -283,14 +286,14 @@ public class SeqCanvasTest
     canvasHeight -= 1;
     testee.calculateWrappedGeometry(canvasWidth, canvasHeight);
     assertEquals(PA.getValue(testee, "wrappedVisibleWidths"), 2);
-  
+
     /*
      * turn off scale above - can now fit in 2 and a bit widths
      */
     av.setScaleAboveWrapped(false);
     testee.calculateWrappedGeometry(canvasWidth, canvasHeight);
     assertEquals(PA.getValue(testee, "wrappedVisibleWidths"), 3);
-  
+
     /*
      * reduce height to enough for 2 widths and not quite a third
      * i.e. two repeating heights + spacer + sequence - 1 pixel
@@ -352,7 +355,7 @@ public class SeqCanvasTest
             Boolean.TRUE.toString());
     af = new FileLoader().LoadFileWaitTillLoaded("examples/uniref50.fa",
             DataSourceType.FILE);
-  
+
     /*
      * wait for Consensus thread to complete
      */
@@ -366,6 +369,7 @@ public class SeqCanvasTest
       }
     } while (af.getViewport().getCalcManager().isWorking());
   }
+
   @Test(groups = "Functional")
   public void testClear_HighlightAndSelection()
   {