X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fgui%2FAnnotationColumnChooserTest.java;h=912cd2779c8fb46f7bfe9e114de280ef1cd5aefa;hb=4f30214e8098748469c6a4269ac2ed6c5750e4b0;hp=06478d5f7a92427e5d5c4f4a74d4a9233d46213f;hpb=445fed6ffadf67619312eef879720009f4e1f910;p=jalview.git diff --git a/test/jalview/gui/AnnotationColumnChooserTest.java b/test/jalview/gui/AnnotationColumnChooserTest.java index 06478d5..912cd27 100644 --- a/test/jalview/gui/AnnotationColumnChooserTest.java +++ b/test/jalview/gui/AnnotationColumnChooserTest.java @@ -35,7 +35,7 @@ import jalview.io.FileFormat; import jalview.io.FormatAdapter; import java.io.IOException; -import java.util.List; +import java.util.Iterator; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; @@ -141,18 +141,21 @@ public class AnnotationColumnChooserTest HiddenColumns currentHidden = af.getViewport().getAlignment() .getHiddenColumns(); - List regions = currentHidden.getHiddenColumnsCopy(); - assertEquals(regions.get(0)[0], 0); - assertEquals(regions.get(0)[1], 3); - assertEquals(regions.get(1)[0], 22); - assertEquals(regions.get(1)[1], 25); + Iterator regions = currentHidden.iterator(); + int[] next = regions.next(); + assertEquals(0, next[0]); + assertEquals(3, next[1]); + next = regions.next(); + assertEquals(22, next[0]); + assertEquals(25, next[1]); // now reset hidden columns acc.reset(); currentHidden = af.getViewport().getAlignment().getHiddenColumns(); - regions = currentHidden.getHiddenColumnsCopy(); - assertEquals(regions.get(0)[0], 10); - assertEquals(regions.get(0)[1], 20); + regions = currentHidden.iterator(); + next = regions.next(); + assertEquals(10, next[0]); + assertEquals(20, next[1]); // check works with empty hidden columns as old columns oldhidden = new HiddenColumns(); @@ -169,8 +172,9 @@ public class AnnotationColumnChooserTest acc.reset(); currentHidden = af.getViewport().getAlignment().getHiddenColumns(); - regions = currentHidden.getHiddenColumnsCopy(); - assertEquals(regions.get(0)[0], 10); - assertEquals(regions.get(0)[1], 20); + regions = currentHidden.iterator(); + next = regions.next(); + assertEquals(10, next[0]); + assertEquals(20, next[1]); } }