X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fio%2FFormatAdapterTest.java;h=b500266ae1b7da55936db89bf54cb995da822d83;hb=55d8ed2824ef1e2f5a8ea30f43d14980119f8c43;hp=1cabc1578ef2951fe4f3d957d623e32e60dfc097;hpb=7d67fb613ec026dc9a265e351e7fab542e3f1d61;p=jalview.git diff --git a/test/jalview/io/FormatAdapterTest.java b/test/jalview/io/FormatAdapterTest.java index 1cabc15..b500266 100644 --- a/test/jalview/io/FormatAdapterTest.java +++ b/test/jalview/io/FormatAdapterTest.java @@ -26,17 +26,26 @@ import static org.testng.AssertJUnit.fail; import jalview.datamodel.AlignmentI; import jalview.datamodel.SequenceI; +import jalview.gui.JvOptionPane; import java.io.IOException; import java.util.ArrayList; import java.util.List; +import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; public class FormatAdapterTest { + @BeforeClass(alwaysRun = true) + public void setUpJvOptionPane() + { + JvOptionPane.setInteractiveMode(false); + JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION); + } + /** * Test saving and re-reading in a specified format * @@ -123,7 +132,7 @@ public class FormatAdapterTest static Object[][] getFormats() { List both = new ArrayList(); - for (FileFormat format : FileFormat.values()) + for (FileFormatI format : FileFormats.getInstance().getFormats()) { if (format.isReadable() && format.isWritable() && format.isTextFormat())