Bamboo text #35 - simpler logic; avoids impossible repaint, validation?

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

diff --git a/test/jalview/gui/SeqCanvasTest.java b/test/jalview/gui/SeqCanvasTest.java
index 3877429..0e14a6b 100644 (file)
--- a/test/jalview/gui/SeqCanvasTest.java
+++ b/test/jalview/gui/SeqCanvasTest.java
@@ -51,7 +51,7 @@ public class SeqCanvasTest
    * Test the method that computes wrapped width in residues, height of wrapped
    * widths in pixels, and the number of widths visible
    */
-  @Test(groups = "Functional", priority = 0)
+  @Test(groups = "Functional")
   public void testCalculateWrappedGeometry_noAnnotations()
   {
     AlignFrame af = new FileLoader().LoadFileWaitTillLoaded(
@@ -222,7 +222,7 @@ public class SeqCanvasTest
    * Test the method that computes wrapped width in residues, height of wrapped
    * widths in pixels, and the number of widths visible
    */
-  @Test(groups = "Functional", priority = 1)
+  @Test(groups = "Functional")
   public void testCalculateWrappedGeometry_withAnnotations()
   {
     AlignFrame af = new FileLoader().LoadFileWaitTillLoaded(
@@ -324,7 +324,7 @@ public class SeqCanvasTest
    * endSeq should be unchanged, but the vertical repeat height should include
    * all sequences.
    */
-  @Test(groups = "Functional", priority = 2)
+  @Test(groups = "Functional")
   public void testCalculateWrappedGeometry_fromScrolled()
   {
     AlignFrame af = new FileLoader().LoadFileWaitTillLoaded(
@@ -335,25 +335,28 @@ public class SeqCanvasTest
     assertEquals(al.getHeight(), 15);
 
     ViewportRanges ranges = av.getRanges();
-    System.out.println(av.getRanges() + " just before setting end to 3");
     ranges.setStartEndSeq(0, 3);
-    System.out.println(av.getRanges() + " just after setting end to 3");
+    System.out.println(ranges);
     av.setShowAnnotation(false);
     av.setScaleAboveWrapped(true);
 
+    System.out.println(ranges);
     SeqCanvas testee = af.alignPanel.getSeqPanel().seqCanvas;
     av.setWrapAlignment(true);
+    System.out.println(ranges);
     av.setFont(new Font("SansSerif", Font.PLAIN, 14), true);
     int charHeight = av.getCharHeight();
     int charWidth = av.getCharWidth();
+    System.out.println(ranges);
     // Windows h=19, w=11.
     assertEquals(charHeight, !Platform.isWin() ? 17 : 19);
     assertEquals(charWidth, !Platform.isWin() ? 12 : 11);
+    System.out.println(ranges);
     
     int canvasWidth = 400;
     int canvasHeight = 300;
     testee.calculateWrappedGeometry(canvasWidth, canvasHeight);
-    System.out.println(ranges + " just before assert");
+    System.out.println(ranges);
     assertEquals(ranges.getEndSeq(), 3); // unchanged
     int repeatingHeight = (int) PA.getValue(testee,
             "wrappedRepeatHeightPx");