X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fio%2FStockholmFileTest.java;h=4028913c7a30763d38a6e41adba6264e0884cb06;hb=e67e5f3a5b922e8a7729a0e9e9b174f46b11456c;hp=bdd311be5cb0e8f2e4c24a119c44448ccb76b284;hpb=8b27085fa7fc5f2877e078421284c2636b85b8c6;p=jalview.git diff --git a/test/jalview/io/StockholmFileTest.java b/test/jalview/io/StockholmFileTest.java index bdd311b..4028913 100644 --- a/test/jalview/io/StockholmFileTest.java +++ b/test/jalview/io/StockholmFileTest.java @@ -30,17 +30,26 @@ import jalview.datamodel.AlignmentI; import jalview.datamodel.Annotation; import jalview.datamodel.SequenceFeature; import jalview.datamodel.SequenceI; +import jalview.gui.JvOptionPane; import java.io.File; import java.util.BitSet; import java.util.HashMap; import java.util.Map; +import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; public class StockholmFileTest { + @BeforeClass(alwaysRun = true) + public void setUpJvOptionPane() + { + JvOptionPane.setInteractiveMode(false); + JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION); + } + static String PfamFile = "examples/PF00111_seed.stk", RfamFile = "examples/RF00031_folded.stk"; @@ -103,7 +112,7 @@ public class StockholmFileTest // make sure dataset is initialised ? not sure about this for (int i = 0; i < al.getSequencesArray().length; ++i) { - al.getSequenceAt(i).setDatasetSequence(al.getSequenceAt(i)); + al.getSequenceAt(i).createDatasetSequence(); } String outputfile = rf.formatSequences(ioformat, al, true); System.out.println("Output file in '" + ioformat + "':\n" @@ -228,7 +237,7 @@ public class StockholmFileTest } assertEquals( "Generated and imported alignment have different annotation sets", - aa_new_size, aa_original_size); + aa_original_size, aa_new_size); // check sequences, annotation and features SequenceI[] seq_original = new SequenceI[al.getSequencesArray().length]; @@ -281,8 +290,7 @@ public class StockholmFileTest assertEquals("different number of features", seq_original[i].getSequenceFeatures().length, - seq_new[in] - .getSequenceFeatures().length); + seq_new[in].getSequenceFeatures().length); for (int feat = 0; feat < seq_original[i].getSequenceFeatures().length; feat++) {