X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=test%2Fjalview%2Fio%2FAnnotationFileIOTest.java;h=c3aa13e8fd4d97d7aba67c4b69e30e875e50c151;hb=e67e5f3a5b922e8a7729a0e9e9b174f46b11456c;hp=f88fc4759aab8e7ee562110de3e9e415b2e157c0;hpb=7d67fb613ec026dc9a265e351e7fab542e3f1d61;p=jalview.git diff --git a/test/jalview/io/AnnotationFileIOTest.java b/test/jalview/io/AnnotationFileIOTest.java index f88fc47..c3aa13e 100644 --- a/test/jalview/io/AnnotationFileIOTest.java +++ b/test/jalview/io/AnnotationFileIOTest.java @@ -25,17 +25,26 @@ import static org.testng.AssertJUnit.assertTrue; import jalview.datamodel.AlignmentI; import jalview.datamodel.ColumnSelection; +import jalview.gui.JvOptionPane; import jalview.io.AnnotationFile.ViewDef; import java.io.File; import java.util.Hashtable; import org.testng.Assert; +import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; public class AnnotationFileIOTest { + @BeforeClass(alwaysRun = true) + public void setUpJvOptionPane() + { + JvOptionPane.setInteractiveMode(false); + JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION); + } + static String TestFiles[][] = { { "Test example annotation import/export", "examples/uniref50.fa", "examples/testdata/example_annot_file.jva" }, @@ -61,7 +70,7 @@ public class AnnotationFileIOTest } } - public static AlignmentI readAlignmentFile(File f) + AlignmentI readAlignmentFile(File f) { System.out.println("Reading file: " + f); String ff = f.getPath(); @@ -97,9 +106,7 @@ public class AnnotationFileIOTest * - label for IO class used to write and read back in the data from * f */ - - // @Test(groups ={ "Functional" }) - public static void testAnnotationFileIO(String testname, File f, + void testAnnotationFileIO(String testname, File f, File annotFile) { System.out.println("Test: " + testname + "\nReading annotation file '" @@ -117,6 +124,7 @@ public class AnnotationFileIOTest DataSourceType.FILE)); AnnotationFile aff = new AnnotationFile(); + // ViewDef is not used by Jalview ViewDef v = aff.new ViewDef(null, al.getHiddenSequences(), cs, new Hashtable()); String anfileout = new AnnotationFile().printAnnotations(