X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fio%2FAnnotationFileIOTest.java;h=c39cc4a6da848ba8a8d3b4145d27571f51beef52;hb=ee198b3ca3687f18a2ee186f4e7c7330f4ea30f0;hp=625244d82c5a9b7ef79a89ff8ba42c95fe4bbc8f;hpb=26ba864a6c290121fe6cf616794d2d0bea65fb7d;p=jalview.git diff --git a/test/jalview/io/AnnotationFileIOTest.java b/test/jalview/io/AnnotationFileIOTest.java index 625244d..c39cc4a 100644 --- a/test/jalview/io/AnnotationFileIOTest.java +++ b/test/jalview/io/AnnotationFileIOTest.java @@ -69,8 +69,8 @@ public class AnnotationFileIOTest { FormatAdapter rf = new FormatAdapter(); - AlignmentI al = rf.readFile(ff, AppletFormatAdapter.FILE, - new IdentifyFile().identify(ff, AppletFormatAdapter.FILE)); + AlignmentI al = rf.readFile(ff, DataSourceType.FILE, + new IdentifyFile().identify(ff, DataSourceType.FILE)); // make sure dataset is initialised ? not sure about this for (int i = 0; i < al.getSequencesArray().length; ++i) @@ -115,7 +115,7 @@ public class AnnotationFileIOTest + testname + "\nAlignment was not annotated - annotation file not imported.", new AnnotationFile().readAnnotationFile(al, cs, af, - FormatAdapter.FILE)); + DataSourceType.FILE)); AnnotationFile aff = new AnnotationFile(); ViewDef v = aff.new ViewDef(null, al.getHiddenSequences(), cs, @@ -143,7 +143,7 @@ public class AnnotationFileIOTest + testname + "\nregenerated annotation file did not annotate alignment.", new AnnotationFile().readAnnotationFile(al_new, anfileout, - FormatAdapter.PASTE)); + DataSourceType.PASTE)); // test for consistency in io StockholmFileTest.testAlignmentEquivalence(al, al_new, false);