X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fio%2FJalviewExportPropertiesTests.java;fp=test%2Fjalview%2Fio%2FJalviewExportPropertiesTests.java;h=06d177dca2bb622cd659499746aeef8d5063b325;hb=2595e9d4ee0dbbd3406a98c4e49a61ccde806479;hp=164c259bb130cbb8253a387fa3479c730769009b;hpb=e20075ba805d744d7cc4976e2b8d5e5840fb0a8d;p=jalview.git diff --git a/test/jalview/io/JalviewExportPropertiesTests.java b/test/jalview/io/JalviewExportPropertiesTests.java index 164c259..06d177d 100644 --- a/test/jalview/io/JalviewExportPropertiesTests.java +++ b/test/jalview/io/JalviewExportPropertiesTests.java @@ -24,6 +24,7 @@ import static org.testng.AssertJUnit.assertTrue; import jalview.datamodel.SequenceGroup; import jalview.gui.AlignFrame; +import jalview.gui.JvOptionPane; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; @@ -39,6 +40,13 @@ import org.testng.annotations.Test; public class JalviewExportPropertiesTests { + @BeforeClass(alwaysRun = true) + public void setUpJvOptionPane() + { + JvOptionPane.setInteractiveMode(false); + JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION); + } + /** * @throws java.lang.Exception */ @@ -66,7 +74,7 @@ public class JalviewExportPropertiesTests assertTrue("Couldn't set gap character to '.'", ".".equals("" + jalview.bin.Cache.getProperty("GAP_SYMBOL"))); AlignFrame af = new jalview.io.FileLoader().LoadFileWaitTillLoaded( - "examples/uniref50.fa", FormatAdapter.FILE); + "examples/uniref50.fa", DataSourceType.FILE); assertTrue("Didn't read in the example file correctly.", af != null); assertTrue("Didn't set the gap character correctly", af.getViewport() .getAlignment().getSequenceAt(0).getCharAt(5) == '.'); @@ -78,7 +86,7 @@ public class JalviewExportPropertiesTests sg.setEndRes(7); af.getViewport().setSelectionGroup(sg); String fseqs = new FormatAdapter(af.alignPanel).formatSequences( - "FASTA", af.alignPanel, true); + FileFormat.Fasta, af.alignPanel, true); assertTrue("Couldn't find '.' in the exported region\n" + fseqs, fseqs.indexOf(".") > -1); }