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-2527 move default colours for applet / application out of gui.Preferences so...
[jalview.git]
/
test
/
jalview
/
io
/
IdentifyFileTest.java
diff --git
a/test/jalview/io/IdentifyFileTest.java
b/test/jalview/io/IdentifyFileTest.java
index
0a3ff94
..
dd4f6ba
100644
(file)
--- a/
test/jalview/io/IdentifyFileTest.java
+++ b/
test/jalview/io/IdentifyFileTest.java
@@
-24,13
+24,23
@@
import static org.testng.AssertJUnit.assertFalse;
import static org.testng.AssertJUnit.assertSame;
import static org.testng.AssertJUnit.assertTrue;
import static org.testng.AssertJUnit.assertSame;
import static org.testng.AssertJUnit.assertTrue;
+import jalview.gui.JvOptionPane;
+
import org.testng.Assert;
import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
public class IdentifyFileTest
{
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
public class IdentifyFileTest
{
+ @BeforeClass(alwaysRun = true)
+ public void setUpJvOptionPane()
+ {
+ JvOptionPane.setInteractiveMode(false);
+ JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+ }
+
@Test(groups = { "Functional" }, dataProvider = "identifyFiles")
public void testIdentify(String data, FileFormatI expectedFileType)
throws FileFormatException
@Test(groups = { "Functional" }, dataProvider = "identifyFiles")
public void testIdentify(String data, FileFormatI expectedFileType)
throws FileFormatException
@@
-100,7
+110,8
@@
public class IdentifyFileTest
{
"examples/testdata/cullpdb_pc25_res3.0_R0.3_d150729_chains9361.fasta.15316",
FileFormat.Fasta },
{
"examples/testdata/cullpdb_pc25_res3.0_R0.3_d150729_chains9361.fasta.15316",
FileFormat.Fasta },
-
+ { "resources/scoreModel/pam250.scm", FileFormat.ScoreMatrix },
+ { "resources/scoreModel/blosum80.scm", FileFormat.ScoreMatrix }
// { "examples/testdata/test.amsa", "AMSA" },
// { "examples/test.jnet", "JnetFile" },
};
// { "examples/testdata/test.amsa", "AMSA" },
// { "examples/test.jnet", "JnetFile" },
};