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 'bug/JAL-2034contextchange' into develop
[jalview.git]
/
test
/
jalview
/
io
/
AnnotationFileIOTest.java
diff --git
a/test/jalview/io/AnnotationFileIOTest.java
b/test/jalview/io/AnnotationFileIOTest.java
index
c3aa13e
..
6a00cde
100644
(file)
--- a/
test/jalview/io/AnnotationFileIOTest.java
+++ b/
test/jalview/io/AnnotationFileIOTest.java
@@
-24,7
+24,7
@@
import static org.testng.AssertJUnit.assertNotNull;
import static org.testng.AssertJUnit.assertTrue;
import jalview.datamodel.AlignmentI;
import static org.testng.AssertJUnit.assertTrue;
import jalview.datamodel.AlignmentI;
-import jalview.datamodel.ColumnSelection;
+import jalview.datamodel.HiddenColumns;
import jalview.gui.JvOptionPane;
import jalview.io.AnnotationFile.ViewDef;
import jalview.gui.JvOptionPane;
import jalview.io.AnnotationFile.ViewDef;
@@
-115,7
+115,7
@@
public class AnnotationFileIOTest
try
{
AlignmentI al = readAlignmentFile(f);
try
{
AlignmentI al = readAlignmentFile(f);
- ColumnSelection cs = new ColumnSelection();
+ HiddenColumns cs = new HiddenColumns();
assertTrue(
"Test "
+ testname
assertTrue(
"Test "
+ testname
@@
-153,7
+153,8
@@
public class AnnotationFileIOTest
DataSourceType.PASTE));
// test for consistency in io
DataSourceType.PASTE));
// test for consistency in io
- StockholmFileTest.testAlignmentEquivalence(al, al_new, false);
+ StockholmFileTest.testAlignmentEquivalence(al, al_new, false, false,
+ false);
return;
} catch (Exception e)
{
return;
} catch (Exception e)
{