X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fgui%2FAlignFrameTest.java;h=3e82547e7ab30739f863ebdee26b148fc437920d;hb=6f812eb434553c97cccaaaefa35da54afc72bb79;hp=1ee25c7ecb27f69996fbe1c901a146b82b9aa37c;hpb=baa077bd19420018433d78927aad3ad139e47351;p=jalview.git diff --git a/test/jalview/gui/AlignFrameTest.java b/test/jalview/gui/AlignFrameTest.java index 1ee25c7..3e82547 100644 --- a/test/jalview/gui/AlignFrameTest.java +++ b/test/jalview/gui/AlignFrameTest.java @@ -20,6 +20,7 @@ */ package jalview.gui; +import static org.junit.Assert.assertNotEquals; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertNotSame; @@ -31,13 +32,14 @@ import jalview.bin.Cache; import jalview.bin.Jalview; import jalview.datamodel.Alignment; import jalview.datamodel.AlignmentI; +import jalview.datamodel.HiddenColumns; import jalview.datamodel.Sequence; import jalview.datamodel.SequenceFeature; import jalview.datamodel.SequenceGroup; import jalview.datamodel.SequenceI; import jalview.io.DataSourceType; import jalview.io.FileLoader; -import jalview.io.Jalview2xmlTests; +import jalview.project.Jalview2xmlTests; import jalview.renderer.ResidueShaderI; import jalview.schemes.BuriedColourScheme; import jalview.schemes.FeatureColour; @@ -48,7 +50,7 @@ import jalview.schemes.TurnColourScheme; import jalview.util.MessageManager; import java.awt.Color; -import java.util.List; +import java.util.Iterator; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; @@ -60,7 +62,53 @@ public class AlignFrameTest AlignFrame af; @BeforeClass(alwaysRun = true) - public void setUpJvOptionPane() + public static void setUpBeforeClass() throws Exception + { + setUpJvOptionPane(); + /* + * use read-only test properties file + */ + Cache.loadProperties("test/jalview/io/testProps.jvprops"); + Jalview.main(new String[] { "-nonews" }); + } + + @AfterMethod(alwaysRun = true) + public void tearDown() + { + Desktop.instance.closeAll_actionPerformed(null); + } + + /** + * configure (read-only) properties for test to ensure Consensus is computed for + * colour Above PID testing + */ + @BeforeMethod(alwaysRun = true) + public void setUp() + { + Cache.loadProperties("test/jalview/io/testProps.jvprops"); + Cache.applicationProperties.setProperty("SHOW_IDENTITY", + Boolean.TRUE.toString()); + af = new FileLoader().LoadFileWaitTillLoaded("examples/uniref50.fa", + DataSourceType.FILE); + + /* + * wait for Consensus thread to complete + */ + synchronized (this) + { + while (af.getViewport().getConsensusSeq() == null) + { + try + { + wait(50); + } catch (InterruptedException e) + { + } + } + } + } + + public static void setUpJvOptionPane() { JvOptionPane.setInteractiveMode(false); JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION); @@ -92,37 +140,43 @@ public class AlignFrameTest */ assertFalse(alignFrame.hideFeatureColumns("exon", true)); assertTrue(alignFrame.getViewport().getColumnSelection().isEmpty()); - assertTrue(alignFrame.getViewport().getAlignment().getHiddenColumns() - .getHiddenColumnsCopy().isEmpty()); + + assertEquals(alignFrame.getViewport().getAlignment().getHiddenColumns() + .getNumberOfRegions(), 0); + assertFalse(alignFrame.hideFeatureColumns("exon", false)); assertTrue(alignFrame.getViewport().getColumnSelection().isEmpty()); - assertTrue(alignFrame.getViewport().getAlignment().getHiddenColumns() - .getHiddenColumnsCopy().isEmpty()); + + assertEquals(alignFrame.getViewport().getAlignment().getHiddenColumns() + .getNumberOfRegions(), 0); /* * hiding a feature in all columns does nothing */ assertFalse(alignFrame.hideFeatureColumns("Metal", true)); assertTrue(alignFrame.getViewport().getColumnSelection().isEmpty()); - List hidden = alignFrame.getViewport().getAlignment() - .getHiddenColumns().getHiddenColumnsCopy(); - assertTrue(hidden.isEmpty()); + + assertEquals(alignFrame.getViewport().getAlignment().getHiddenColumns() + .getNumberOfRegions(), 0); + /* * threshold Metal to hide features where score < 5 * seq1 feature in columns 1-5 is hidden * seq2 feature in columns 6-10 is shown */ - FeatureColourI fc = new FeatureColour(Color.red, Color.blue, 0f, 10f); + FeatureColourI fc = new FeatureColour(null, Color.red, Color.blue, null, + 0f, 10f); fc.setAboveThreshold(true); fc.setThreshold(5f); alignFrame.getFeatureRenderer().setColour("Metal", fc); assertTrue(alignFrame.hideFeatureColumns("Metal", true)); - hidden = alignFrame.getViewport().getAlignment().getHiddenColumns() - .getHiddenColumnsCopy(); - assertEquals(hidden.size(), 1); - assertEquals(hidden.get(0)[0], 5); - assertEquals(hidden.get(0)[1], 9); + HiddenColumns hidden = alignFrame.getViewport().getAlignment().getHiddenColumns(); + assertEquals(hidden.getNumberOfRegions(), 1); + Iterator regions = hidden.iterator(); + int[] next = regions.next(); + assertEquals(next[0], 5); + assertEquals(next[1], 9); /* * hide a feature present in some columns @@ -131,59 +185,16 @@ public class AlignFrameTest */ alignFrame.getViewport().showAllHiddenColumns(); assertTrue(alignFrame.hideFeatureColumns("Turn", true)); - hidden = alignFrame.getViewport().getAlignment().getHiddenColumns() - .getHiddenColumnsCopy(); - assertEquals(hidden.size(), 2); - assertEquals(hidden.get(0)[0], 1); - assertEquals(hidden.get(0)[1], 3); - assertEquals(hidden.get(1)[0], 6); - assertEquals(hidden.get(1)[1], 8); - } - - @BeforeClass(alwaysRun = true) - public static void setUpBeforeClass() throws Exception - { - /* - * use read-only test properties file - */ - Cache.loadProperties("test/jalview/io/testProps.jvprops"); - Jalview.main(new String[] { "-nonews" }); - } - - @AfterMethod(alwaysRun = true) - public void tearDown() - { - Desktop.instance.closeAll_actionPerformed(null); - } - - /** - * configure (read-only) properties for test to ensure Consensus is computed - * for colour Above PID testing - */ - @BeforeMethod(alwaysRun = true) - public void setUp() - { - Cache.loadProperties("test/jalview/io/testProps.jvprops"); - Cache.applicationProperties.setProperty("SHOW_IDENTITY", - Boolean.TRUE.toString()); - af = new FileLoader().LoadFileWaitTillLoaded("examples/uniref50.fa", - DataSourceType.FILE); - - /* - * wait for Consensus thread to complete - */ - synchronized (this) - { - while (af.getViewport().getConsensusSeq() == null) - { - try - { - wait(50); - } catch (InterruptedException e) - { - } - } - } + regions = alignFrame.getViewport().getAlignment() + .getHiddenColumns().iterator(); + assertEquals(alignFrame.getViewport().getAlignment().getHiddenColumns() + .getNumberOfRegions(), 2); + next = regions.next(); + assertEquals(next[0], 1); + assertEquals(next[1], 3); + next = regions.next(); + assertEquals(next[0], 6); + assertEquals(next[1], 8); } /** @@ -590,4 +601,26 @@ public class AlignFrameTest sp.valueChanged(22); assertEquals(av2.getResidueShading().getConservationInc(), 22); } + + /** + * Verify that making a New View preserves the dataset reference for the + * alignment. Otherwise, see a 'duplicate jar entry' reference when trying to + * save alignments with multiple views, and codon mappings will not be shared + * across all panels in a split frame. + * + * @see Jalview2xmlTests#testStoreAndRecoverColourThresholds() + */ + @Test(groups = "Functional") + public void testNewView_dsRefPreserved() + { + AlignViewport av = af.getViewport(); + AlignmentI al = av.getAlignment(); + AlignmentI original_ds = al.getDataset(); + af.newView_actionPerformed(null); + assertNotEquals("New view didn't select the a new panel", av, + af.getViewport()); + org.testng.Assert.assertEquals(original_ds, + af.getViewport().getAlignment().getDataset(), + "Dataset was not preserved in new view"); + } }