git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-2346 always run setup!
[jalview.git]
/
test
/
jalview
/
ws
/
jabaws
/
DisorderAnnotExportImport.java
diff --git
a/test/jalview/ws/jabaws/DisorderAnnotExportImport.java
b/test/jalview/ws/jabaws/DisorderAnnotExportImport.java
index
8ab5763
..
2d317e4
100644
(file)
--- a/
test/jalview/ws/jabaws/DisorderAnnotExportImport.java
+++ b/
test/jalview/ws/jabaws/DisorderAnnotExportImport.java
@@
-26,6
+26,7
@@
import static org.testng.AssertJUnit.assertTrue;
import jalview.bin.Cache;
import jalview.datamodel.AlignmentAnnotation;
import jalview.datamodel.AlignmentI;
import jalview.bin.Cache;
import jalview.datamodel.AlignmentAnnotation;
import jalview.datamodel.AlignmentI;
+import jalview.gui.JvOptionPane;
import jalview.io.AnnotationFile;
import jalview.io.DataSourceType;
import jalview.io.FileFormat;
import jalview.io.AnnotationFile;
import jalview.io.DataSourceType;
import jalview.io.FileFormat;
@@
-46,6
+47,14
@@
import org.testng.annotations.Test;
@Test(groups = { "External" })
public class DisorderAnnotExportImport
{
@Test(groups = { "External" })
public class DisorderAnnotExportImport
{
+
+ @BeforeClass(alwaysRun = true)
+ public void setUpJvOptionPane()
+ {
+ JvOptionPane.setInteractiveMode(false);
+ JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+ }
+
public static String testseqs = "examples/uniref50.fa";
public static Jws2Discoverer disc;
public static String testseqs = "examples/uniref50.fa";
public static Jws2Discoverer disc;
@@
-129,7
+138,7
@@
public class DisorderAnnotExportImport
{
try
{
{
try
{
- String aligfileout = FileFormat.Pfam.getAlignmentFile().print(
+ String aligfileout = FileFormat.Pfam.getWriter(al).print(
al.getSequencesArray(), true);
String anfileout = new AnnotationFile()
.printAnnotationsForAlignment(al);
al.getSequencesArray(), true);
String anfileout = new AnnotationFile()
.printAnnotationsForAlignment(al);