From 445fed6ffadf67619312eef879720009f4e1f910 Mon Sep 17 00:00:00 2001 From: kiramt Date: Tue, 26 Sep 2017 12:10:52 +0100 Subject: [PATCH 1/1] JAL-2740 additional unit testing --- test/jalview/gui/AnnotationColumnChooserTest.java | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/test/jalview/gui/AnnotationColumnChooserTest.java b/test/jalview/gui/AnnotationColumnChooserTest.java index a9b973e..06478d5 100644 --- a/test/jalview/gui/AnnotationColumnChooserTest.java +++ b/test/jalview/gui/AnnotationColumnChooserTest.java @@ -20,6 +20,7 @@ */ package jalview.gui; +import static org.testng.Assert.assertFalse; import static org.testng.AssertJUnit.assertEquals; import jalview.analysis.AnnotationSorter.SequenceAnnotationOrder; @@ -152,5 +153,24 @@ public class AnnotationColumnChooserTest regions = currentHidden.getHiddenColumnsCopy(); assertEquals(regions.get(0)[0], 10); assertEquals(regions.get(0)[1], 20); + + // check works with empty hidden columns as old columns + oldhidden = new HiddenColumns(); + acc.setOldHiddenColumns(oldhidden); + acc.reset(); + currentHidden = af.getViewport().getAlignment().getHiddenColumns(); + assertFalse(currentHidden.hasHiddenColumns()); + + // check works with empty hidden columns as new columns + oldhidden.hideColumns(10, 20); + acc.setOldHiddenColumns(oldhidden); + currentHidden = af.getViewport().getAlignment().getHiddenColumns(); + assertFalse(currentHidden.hasHiddenColumns()); + + acc.reset(); + currentHidden = af.getViewport().getAlignment().getHiddenColumns(); + regions = currentHidden.getHiddenColumnsCopy(); + assertEquals(regions.get(0)[0], 10); + assertEquals(regions.get(0)[1], 20); } } -- 1.7.10.2