From: Jim Procter Date: Wed, 2 Sep 2015 10:58:05 +0000 (+0100) Subject: JAL-1772 non-functional test added. not doing any more work for 2.9 release X-Git-Tag: Release_2_10_0~514^2~2 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=cce9e4df53a94d9e7f841d25a6063c597f7a2ab9;p=jalview.git JAL-1772 non-functional test added. not doing any more work for 2.9 release --- diff --git a/test/jalview/io/Jalview2xmlTests.java b/test/jalview/io/Jalview2xmlTests.java index 2afcdc2..982be0c 100644 --- a/test/jalview/io/Jalview2xmlTests.java +++ b/test/jalview/io/Jalview2xmlTests.java @@ -30,6 +30,7 @@ import jalview.datamodel.SequenceGroup; import jalview.datamodel.SequenceI; import jalview.gui.AlignFrame; import jalview.gui.Desktop; +import jalview.gui.Jalview2XML; import jalview.schemes.AnnotationColourGradient; import jalview.schemes.ColourSchemeI; @@ -347,4 +348,68 @@ public class Jalview2xmlTests .getViewStyle())); } + + /** + * test store and recovery of expanded views - + * currently this is disabled since the + * Desktop.explodeViews method doesn't seem + * to result in the views being expanded to + * distinct align frames when executed programmatically. + * @throws Exception + */ + @Test(groups = { "Functional" }, enabled = false) + public void testStoreAndRecoverExpandedviews() throws Exception + { + AlignFrame af = new jalview.io.FileLoader() + .LoadFileWaitTillLoaded( + "examples/exampleFile_2_7.jar", FormatAdapter.FILE); + assertTrue("Didn't read in the example file correctly.", af != null); + String afid = af.getViewport().getSequenceSetId(); + { + final AlignFrame xaf = af; + af = null; + new Thread(new Runnable() + { + @Override + public void run() + { + Desktop.instance.explodeViews(xaf); + } + }).start(); + Thread.sleep(1000); + } + // int times = 0; + // while (++times < 5 && Desktop.getAlignFrames().length < ) + // { + // Thread.sleep(300); + // } + int oldviews = Desktop.getAlignFrames().length; + Assert.assertEquals( + Desktop.getAlignFrames().length, + Desktop.getAlignmentPanels(afid).length); + File tfile = File.createTempFile("testStoreAndRecoverExpanded", ".jvp"); + try + { + new Jalview2XML(false).saveState(tfile); + } catch (Error e) + { + Assert.fail("Didn't save the expanded view state", e); + } catch (Exception e) + { + Assert.fail("Didn't save the expanded view state", e); + } + Desktop.instance.closeAll_actionPerformed(null); + if (Desktop.getAlignFrames() != null) + { + Assert.assertEquals(Desktop.getAlignFrames().length, 0); + } + af = new jalview.io.FileLoader().LoadFileWaitTillLoaded( + tfile.getAbsolutePath(), FormatAdapter.FILE); + Assert.assertNotNull(af); + Assert.assertEquals(Desktop.getAlignFrames().length, + Desktop.getAlignmentPanels(af.getViewport().getSequenceSetId()).length); + Assert.assertEquals(oldviews, + Desktop.getAlignmentPanels(af.getViewport().getSequenceSetId()).length); + } + }