X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Frenderer%2FScaleRendererTest.java;fp=test%2Fjalview%2Frenderer%2FScaleRendererTest.java;h=0af67cddb0ec38a3db3957253e3d113b48a759c5;hb=0efc6021e63ff62bb2e275501586c1900561b303;hp=cf1039fb9f496a1e6997fd8a317f2ee40bd78091;hpb=771d1758a42abc6e3e330dd6c5117734acf0067f;p=jalview.git diff --git a/test/jalview/renderer/ScaleRendererTest.java b/test/jalview/renderer/ScaleRendererTest.java index cf1039f..0af67cd 100644 --- a/test/jalview/renderer/ScaleRendererTest.java +++ b/test/jalview/renderer/ScaleRendererTest.java @@ -26,11 +26,11 @@ public class ScaleRendererTest AlignViewport av = af.getViewport(); /* - * scale has minor ticks at 5 and 15, major at 10 and 20 + * scale has minor ticks at 5, 15, 25, major at 10 and 20 * (these are base 1, ScaleMark holds base 0 values) */ List marks = new ScaleRenderer().calculateMarks(av, 0, 25); - assertEquals(marks.size(), 4); + assertEquals(marks.size(), 5); assertFalse(marks.get(0).major); assertEquals(marks.get(0).column, 4); @@ -48,6 +48,10 @@ public class ScaleRendererTest assertEquals(marks.get(3).column, 19); assertEquals(marks.get(3).text, "20"); + assertFalse(marks.get(4).major); + assertEquals(marks.get(4).column, 24); + assertNull(marks.get(4).text); + /* * now hide columns 9-11 and 18-20 (base 1) * scale marks are now in the same columns as before, but @@ -56,7 +60,7 @@ public class ScaleRendererTest av.hideColumns(8, 10); av.hideColumns(17, 19); marks = new ScaleRenderer().calculateMarks(av, 0, 25); - assertEquals(marks.size(), 4); + assertEquals(marks.size(), 5); assertFalse(marks.get(0).major); assertEquals(marks.get(0).column, 4); assertNull(marks.get(0).text); @@ -69,5 +73,8 @@ public class ScaleRendererTest assertTrue(marks.get(3).major); assertEquals(marks.get(3).column, 19); assertEquals(marks.get(3).text, "26"); // +6 hidden columns + assertFalse(marks.get(4).major); + assertEquals(marks.get(4).column, 24); + assertNull(marks.get(4).text); } }