JAL-3253-applet JAL-3423 TestNG/Win

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

diff --git a/test/jalview/gui/SeqCanvasTest.java b/test/jalview/gui/SeqCanvasTest.java
index b2a1209..25c4862 100644 (file)
--- a/test/jalview/gui/SeqCanvasTest.java
+++ b/test/jalview/gui/SeqCanvasTest.java
@@ -48,7 +48,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")
+  @Test(groups = "BHTEST")
   public void testCalculateWrappedGeometry_noAnnotations()
   {
     AlignFrame af = new FileLoader().LoadFileWaitTillLoaded(
@@ -219,7 +219,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")
+  @Test(groups = "BHTEST")
   public void testCalculateWrappedGeometry_withAnnotations()
   {
     AlignFrame af = new FileLoader().LoadFileWaitTillLoaded(
@@ -321,7 +321,7 @@ public class SeqCanvasTest
    * endSeq should be unchanged, but the vertical repeat height should include
    * all sequences.
    */
-  @Test(groups = "Functional")
+  @Test(groups = "BHTEST")
   public void testCalculateWrappedGeometry_fromScrolled()
   {
     AlignFrame af = new FileLoader().LoadFileWaitTillLoaded(
@@ -331,13 +331,24 @@ public class SeqCanvasTest
     assertEquals(al.getWidth(), 157);
     assertEquals(al.getHeight(), 15);
     av.getRanges().setStartEndSeq(0, 3);
+    System.out.println("SCT1 " + av.getRanges().getEndSeq());
     av.setShowAnnotation(false);
     av.setScaleAboveWrapped(true);
 
+    System.out.println("SCT2 " + av.getRanges().getEndSeq());
+
     SeqCanvas testee = af.alignPanel.getSeqPanel().seqCanvas;
 
+    System.out.println("SCT3 " + av.getRanges().getEndSeq());
+
     av.setWrapAlignment(true);
+
+    System.out.println("SCT4 " + av.getRanges().getEndSeq());
+
     av.setFont(new Font("SansSerif", Font.PLAIN, 14), true);
+
+    System.out.println("SCT5 " + av.getRanges().getEndSeq());
+
     int charHeight = av.getCharHeight();
     int charWidth = av.getCharWidth();
     // Windows h=19, w=11.
@@ -348,6 +359,8 @@ public class SeqCanvasTest
     int canvasHeight = 300;
     testee.calculateWrappedGeometry(canvasWidth, canvasHeight);
 
+    System.out.println("SCT6 " + av.getRanges().getEndSeq());
+
     assertEquals(av.getRanges().getEndSeq(), 3); // unchanged
     int repeatingHeight = (int) PA.getValue(testee,
             "wrappedRepeatHeightPx");