X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fgui%2FSeqCanvasTest.java;h=801c778438b5a4fa2b86a492df49205cbbbf63bb;hb=fcb944cdd9de849c89f0a8744ae6e56e22de9c1e;hp=25c486271c3b406f9f11b36b5087bba0bd6f8c58;hpb=cc75fb7e201de35734cd3f1f5f8020b971ebdd92;p=jalview.git diff --git a/test/jalview/gui/SeqCanvasTest.java b/test/jalview/gui/SeqCanvasTest.java index 25c4862..801c778 100644 --- 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 = "BHTEST") + @Test(groups = "Functional") 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 = "BHTEST") + @Test(groups = "Functional") 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 = "BHTEST") + @Test(groups = "Functional") public void testCalculateWrappedGeometry_fromScrolled() { AlignFrame af = new FileLoader().LoadFileWaitTillLoaded( @@ -331,24 +331,12 @@ 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. @@ -359,8 +347,6 @@ 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");