X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fgui%2FAlignFrameTest.java;h=af9c045f993e8e20c45e18f4e1cdb814a8dbaf8b;hb=e3f8846ad3af97c5b26e09f7a4e3bcc901f758ca;hp=fed5992fec0b6c0a0571656c1120bd57e3caef4b;hpb=14985603cea28569e295ddabb219da8034f1c7b2;p=jalview.git diff --git a/test/jalview/gui/AlignFrameTest.java b/test/jalview/gui/AlignFrameTest.java index fed5992..af9c045 100644 --- a/test/jalview/gui/AlignFrameTest.java +++ b/test/jalview/gui/AlignFrameTest.java @@ -86,12 +86,12 @@ public class AlignFrameTest assertFalse(alignFrame.hideFeatureColumns("exon", true)); assertTrue(alignFrame.getViewport().getColumnSelection().isEmpty()); assertTrue(alignFrame.getViewport().getAlignment().getHiddenColumns() - .getHiddenRegions() + .getHiddenColumnsCopy() .isEmpty()); assertFalse(alignFrame.hideFeatureColumns("exon", false)); assertTrue(alignFrame.getViewport().getColumnSelection().isEmpty()); assertTrue(alignFrame.getViewport().getAlignment().getHiddenColumns() - .getHiddenRegions() + .getHiddenColumnsCopy() .isEmpty()); /* @@ -101,7 +101,7 @@ public class AlignFrameTest assertTrue(alignFrame.getViewport().getColumnSelection().isEmpty()); List hidden = alignFrame.getViewport().getAlignment() .getHiddenColumns() - .getHiddenRegions(); + .getHiddenColumnsCopy(); assertTrue(hidden.isEmpty()); /* @@ -111,7 +111,7 @@ public class AlignFrameTest */ assertTrue(alignFrame.hideFeatureColumns("Turn", true)); hidden = alignFrame.getViewport().getAlignment().getHiddenColumns() - .getHiddenRegions(); + .getHiddenColumnsCopy(); assertEquals(hidden.size(), 2); assertEquals(hidden.get(0)[0], 1); assertEquals(hidden.get(0)[1], 3); @@ -544,10 +544,11 @@ public class AlignFrameTest assertEquals(af.alignPanel.getViewName(), "View 1"); AlignViewport av2 = af.getViewport(); assertNotSame(av, av2); + assertSame(av2, af.alignPanel.av); rs = av2.getResidueShading(); assertNotSame(av.getResidueShading(), rs); assertEquals(rs.getThreshold(), 10); - assertTrue(rs.conservationApplied()); + assertTrue(rs.conservationApplied(), rs.toString()); assertEquals(rs.getConservationInc(), 20); assertEquals(av2.getAlignment().getGroups().size(), 1); sg = av2.getAlignment().getGroups().get(0);