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
Merge branch 'develop' into bug/JAL-2255_seq-fetcher-broken-on-linux
[jalview.git]
/
test
/
jalview
/
datamodel
/
AlignmentAnnotationTests.java
diff --git
a/test/jalview/datamodel/AlignmentAnnotationTests.java
b/test/jalview/datamodel/AlignmentAnnotationTests.java
index
1aff519
..
a2c6256
100644
(file)
--- a/
test/jalview/datamodel/AlignmentAnnotationTests.java
+++ b/
test/jalview/datamodel/AlignmentAnnotationTests.java
@@
-24,12
+24,23
@@
import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertNull;
import jalview.analysis.AlignSeq;
import static org.testng.AssertJUnit.assertNull;
import jalview.analysis.AlignSeq;
+import jalview.gui.JvOptionPane;
import jalview.io.AppletFormatAdapter;
import jalview.io.AppletFormatAdapter;
+import jalview.io.FileFormat;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
public class AlignmentAnnotationTests
{
import org.testng.annotations.Test;
public class AlignmentAnnotationTests
{
+
+ @BeforeClass(alwaysRun = true)
+ public void setUpJvOptionPane()
+ {
+ JvOptionPane.setInteractiveMode(false);
+ JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+ }
+
@Test(groups = { "Functional" })
public void testCopyConstructor()
{
@Test(groups = { "Functional" })
public void testCopyConstructor()
{
@@
-119,7
+130,8
@@
public class AlignmentAnnotationTests
alSeq2.setEnd(sqTo.getStart() + align.getSeq2End() - 1);
alSeq2.setDatasetSequence(sqTo);
System.out.println(new AppletFormatAdapter()
alSeq2.setEnd(sqTo.getStart() + align.getSeq2End() - 1);
alSeq2.setDatasetSequence(sqTo);
System.out.println(new AppletFormatAdapter()
- .formatSequences("STH", new Alignment(new SequenceI[] { sqFrom,
+.formatSequences(
+ FileFormat.Stockholm, new Alignment(new SequenceI[] { sqFrom,
alSeq1, sqTo, alSeq2 }), true));
Mapping mp = align.getMappingFromS1(false);
alSeq1, sqTo, alSeq2 }), true));
Mapping mp = align.getMappingFromS1(false);
@@
-143,7
+155,8
@@
public class AlignmentAnnotationTests
AlignmentI all = new Alignment(new SequenceI[] { alSeq1, alSeq2 });
all.addAnnotation(almap1);
all.addAnnotation(almap2);
AlignmentI all = new Alignment(new SequenceI[] { alSeq1, alSeq2 });
all.addAnnotation(almap1);
all.addAnnotation(almap2);
- System.out.println(new AppletFormatAdapter().formatSequences("STH",
+ System.out.println(new AppletFormatAdapter().formatSequences(
+ FileFormat.Stockholm,
all, true));
for (int p = 0; p < alSeq1.getLength(); p++)
all, true));
for (int p = 0; p < alSeq1.getLength(); p++)
@@
-280,4
+293,4
@@
public class AlignmentAnnotationTests
ann.getDefaultRnaHelixSymbol(i));
}
}
ann.getDefaultRnaHelixSymbol(i));
}
}
-}
\ No newline at end of file
+}