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
revision for JAL-1749 - ensure view 2D structure menu is removed when no structures...
[jalview.git]
/
test
/
jalview
/
io
/
AnnotationFileIOTest.java
diff --git
a/test/jalview/io/AnnotationFileIOTest.java
b/test/jalview/io/AnnotationFileIOTest.java
index
74e6a31
..
a63923a
100644
(file)
--- a/
test/jalview/io/AnnotationFileIOTest.java
+++ b/
test/jalview/io/AnnotationFileIOTest.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1)
- * Copyright (C) 2014 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,9
+20,9
@@
*/
package jalview.io;
*/
package jalview.io;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.testng.AssertJUnit.assertNotNull;
+import static org.testng.AssertJUnit.assertTrue;
+
import jalview.datamodel.AlignmentI;
import jalview.datamodel.ColumnSelection;
import jalview.io.AnnotationFile.ViewDef;
import jalview.datamodel.AlignmentI;
import jalview.datamodel.ColumnSelection;
import jalview.io.AnnotationFile.ViewDef;
@@
-30,7
+30,8
@@
import jalview.io.AnnotationFile.ViewDef;
import java.io.File;
import java.util.Hashtable;
import java.io.File;
import java.util.Hashtable;
-import org.junit.Test;
+import org.testng.Assert;
+import org.testng.annotations.Test;
public class AnnotationFileIOTest
{
public class AnnotationFileIOTest
{
@@
-51,7
+52,7
@@
public class AnnotationFileIOTest
{ "Test hiding/showing of insertions on sequence_ref",
"examples/uniref50.fa", "examples/testdata/uniref50_seqref.jva" } };
{ "Test hiding/showing of insertions on sequence_ref",
"examples/uniref50.fa", "examples/testdata/uniref50_seqref.jva" } };
- @Test
+ @Test(groups ={ "Functional" })
public void exampleAnnotationFileIO() throws Exception
{
for (String[] testPair : TestFiles)
public void exampleAnnotationFileIO() throws Exception
{
for (String[] testPair : TestFiles)
@@
-84,7
+85,7
@@
public class AnnotationFileIOTest
{
e.printStackTrace();
}
{
e.printStackTrace();
}
- fail("Couln't read the alignment in file '" + f.toString() + "'");
+ Assert.fail("Couln't read the alignment in file '" + f.toString() + "'");
return null;
}
return null;
}
@@
-98,6
+99,8
@@
public class AnnotationFileIOTest
* - label for IO class used to write and read back in the data from
* f
*/
* - label for IO class used to write and read back in the data from
* f
*/
+
+ // @Test(groups ={ "Functional" })
public static void testAnnotationFileIO(String testname, File f,
File annotFile)
{
public static void testAnnotationFileIO(String testname, File f,
File annotFile)
{
@@
-144,13
+147,13
@@
public class AnnotationFileIOTest
FormatAdapter.PASTE));
// test for consistency in io
FormatAdapter.PASTE));
// test for consistency in io
- StockholmFileTest.testAlignmentEquivalence(al, al_new);
+ StockholmFileTest.testAlignmentEquivalence(al, al_new, false);
return;
} catch (Exception e)
{
e.printStackTrace();
}
return;
} catch (Exception e)
{
e.printStackTrace();
}
- fail("Test "
+ Assert.fail("Test "
+ testname
+ "\nCouldn't complete Annotation file roundtrip input/output/input test for '"
+ annotFile + "'.");
+ testname
+ "\nCouldn't complete Annotation file roundtrip input/output/input test for '"
+ annotFile + "'.");