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 'features/JAL-653_gffalignments' into features/JAL-653_JAL-1766_htslib_r...
[jalview.git]
/
test
/
jalview
/
io
/
AnnotationFileIOTest.java
diff --git
a/test/jalview/io/AnnotationFileIOTest.java
b/test/jalview/io/AnnotationFileIOTest.java
index
3d4e841
..
0e066c2
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.2)
- * 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.
*
@@
-115,13
+115,12
@@
public class AnnotationFileIOTest
new AnnotationFile().readAnnotationFile(al, cs, af,
FormatAdapter.FILE));
new AnnotationFile().readAnnotationFile(al, cs, af,
FormatAdapter.FILE));
- ViewDef[] v = new ViewDef[1];
AnnotationFile aff = new AnnotationFile();
AnnotationFile aff = new AnnotationFile();
- v[0] = aff.new ViewDef(null, al.getHiddenSequences(), cs,
+ ViewDef v = aff.new ViewDef(null, al.getHiddenSequences(), cs,
new Hashtable());
String anfileout = new AnnotationFile().printAnnotations(
al.getAlignmentAnnotation(), al.getGroups(),
new Hashtable());
String anfileout = new AnnotationFile().printAnnotations(
al.getAlignmentAnnotation(), al.getGroups(),
- al.getProperties(), v);
+ al.getProperties(), null, al, v);
assertTrue(
"Test "
+ testname
assertTrue(
"Test "
+ testname
@@
-145,7
+144,7
@@
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)
{
return;
} catch (Exception e)
{