X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fio%2FAnnotationFileIOTest.java;h=05ce22dad0f52ac78d33dd49e4d3999d4fe23fb1;hb=84965b0d97f7db54b0855ac7122586d89cac7e46;hp=c3aa13e8fd4d97d7aba67c4b69e30e875e50c151;hpb=22a631d0234218b52b7adeeb28deee5e12026075;p=jalview.git diff --git a/test/jalview/io/AnnotationFileIOTest.java b/test/jalview/io/AnnotationFileIOTest.java index c3aa13e..05ce22d 100644 --- 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 jalview.datamodel.ColumnSelection; +import jalview.datamodel.HiddenColumns; import jalview.gui.JvOptionPane; import jalview.io.AnnotationFile.ViewDef; @@ -70,7 +70,7 @@ public class AnnotationFileIOTest } } - AlignmentI readAlignmentFile(File f) + protected AlignmentI readAlignmentFile(File f) { System.out.println("Reading file: " + f); String ff = f.getPath(); @@ -115,7 +115,7 @@ public class AnnotationFileIOTest try { AlignmentI al = readAlignmentFile(f); - ColumnSelection cs = new ColumnSelection(); + HiddenColumns cs = new HiddenColumns(); assertTrue( "Test " + testname @@ -153,7 +153,8 @@ public class AnnotationFileIOTest 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) {