From f441428059711eb4f7bb958a08887e271e155db9 Mon Sep 17 00:00:00 2001 From: Jim Procter Date: Tue, 23 Oct 2018 11:06:47 +0100 Subject: [PATCH] JAL-3026 JAL-3063 patch jalview.project.Jalview2XmlTests with updates in jalview.io.Jalview2XmlTests due to changed way of accessing result of call to result of AlignFrame.saveAlignment --- test/jalview/project/Jalview2xmlTests.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/test/jalview/project/Jalview2xmlTests.java b/test/jalview/project/Jalview2xmlTests.java index f0fc3fd..1443950 100644 --- a/test/jalview/project/Jalview2xmlTests.java +++ b/test/jalview/project/Jalview2xmlTests.java @@ -110,7 +110,8 @@ public class Jalview2xmlTests extends Jalview2xmlBase assertTrue( af.getViewport().getGlobalColourScheme() instanceof RNAHelicesColour, "Couldn't apply RNA helices colourscheme"); - assertTrue(af.saveAlignment(tfile, FileFormat.Jalview), + af.saveAlignment(tfile, FileFormat.Jalview); + assertTrue(af.isSaveAlignmentSuccessful(), "Failed to store as a project."); af.closeMenuItem_actionPerformed(true); af = null; @@ -146,7 +147,8 @@ public class Jalview2xmlTests extends Jalview2xmlBase .getAlignment(), af.getViewport().getGlobalColourScheme() .getSchemeName()), "Recognise T-Coffee score from string"); - assertTrue(af.saveAlignment(tfile, FileFormat.Jalview), + af.saveAlignment(tfile, FileFormat.Jalview); + assertTrue(af.isSaveAlignmentSuccessful(), "Failed to store as a project."); af.closeMenuItem_actionPerformed(true); af = null; @@ -191,7 +193,8 @@ public class Jalview2xmlTests extends Jalview2xmlBase sg.addSequence(af.getViewport().getAlignment().getSequenceAt(1), false); sg.addSequence(af.getViewport().getAlignment().getSequenceAt(2), true); af.alignPanel.alignmentChanged(); - assertTrue(af.saveAlignment(tfile, FileFormat.Jalview), + af.saveAlignment(tfile, FileFormat.Jalview); + assertTrue(af.isSaveAlignmentSuccessful(), "Failed to store as a project."); af.closeMenuItem_actionPerformed(true); af = null; @@ -966,7 +969,8 @@ public class Jalview2xmlTests extends Jalview2xmlBase File tfile = File.createTempFile("JalviewTest", ".jvp"); tfile.deleteOnExit(); String filePath = tfile.getAbsolutePath(); - assertTrue(af.saveAlignment(filePath, FileFormat.Jalview), + af.saveAlignment(filePath, FileFormat.Jalview); + assertTrue(af.isSaveAlignmentSuccessful(), "Failed to store as a project."); /* -- 1.7.10.2