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-1189 JAL-3130 patch broken tests
[jalview.git]
/
test
/
jalview
/
io
/
RNAMLfileTest.java
diff --git
a/test/jalview/io/RNAMLfileTest.java
b/test/jalview/io/RNAMLfileTest.java
index
2d43b9a
..
ae72de4
100644
(file)
--- a/
test/jalview/io/RNAMLfileTest.java
+++ b/
test/jalview/io/RNAMLfileTest.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2)
- * Copyright (C) 2015 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
*
* This file is part of Jalview.
*
@@
-20,6
+20,8
@@
*/
package jalview.io;
*/
package jalview.io;
+import jalview.gui.JvOptionPane;
+
import java.io.File;
import org.testng.annotations.AfterClass;
import java.io.File;
import org.testng.annotations.AfterClass;
@@
-30,11
+32,18
@@
public class RNAMLfileTest
{
@BeforeClass(alwaysRun = true)
{
@BeforeClass(alwaysRun = true)
+ public void setUpJvOptionPane()
+ {
+ JvOptionPane.setInteractiveMode(false);
+ JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+ }
+
+ @BeforeClass(alwaysRun = true)
public static void setUpBeforeClass() throws Exception
{
}
public static void setUpBeforeClass() throws Exception
{
}
- @AfterClass
+ @AfterClass(alwaysRun = true)
public static void tearDownAfterClass() throws Exception
{
}
public static void tearDownAfterClass() throws Exception
{
}
@@
-43,7
+52,8
@@
public class RNAMLfileTest
public void testRnamlToStockholmIO()
{
StockholmFileTest.testFileIOwithFormat(new File(
public void testRnamlToStockholmIO()
{
StockholmFileTest.testFileIOwithFormat(new File(
- "examples/testdata/rna-alignment.xml"), "STH", -1, -1);
+ "examples/testdata/rna-alignment.xml"), FileFormat.Stockholm,
+ -1, -1, true, true, true);
}
}