X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fio%2FAnnotationFileIOTest.java;h=18e008ec823a91c96d5341f95f4ce8d0d0de7813;hb=ae2ecc56066936ccd472081ed5dcae85dd8f05b3;hp=2aed08bd2c8fec0729ef6543c007a4a4aef35550;hpb=597f27e694edb7a0770bc51c902a444dcd4db82c;p=jalview.git
diff --git a/test/jalview/io/AnnotationFileIOTest.java b/test/jalview/io/AnnotationFileIOTest.java
index 2aed08b..18e008e 100644
--- a/test/jalview/io/AnnotationFileIOTest.java
+++ b/test/jalview/io/AnnotationFileIOTest.java
@@ -1,3 +1,23 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
+ * Copyright (C) 2014 The Jalview Authors
+ *
+ * This file is part of Jalview.
+ *
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * Jalview is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
package jalview.io;
import static org.junit.Assert.assertNotNull;
@@ -12,15 +32,27 @@ import org.junit.Test;
public class AnnotationFileIOTest
{
- static String TestFiles[][] = {{ "Test example annotation import/export","examples/uniref50.fa", "examples/testdata/example_annot_file.jva" }
- ,{"Test multiple combine annotation statements import/export","examples/uniref50.fa", "examples/testdata/test_combine_annot.jva"}};
+ static String TestFiles[][] =
+ {
+ { "Test example annotation import/export", "examples/uniref50.fa",
+ "examples/testdata/example_annot_file.jva" },
+ { "Test multiple combine annotation statements import/export",
+ "examples/uniref50.fa",
+ "examples/testdata/test_combine_annot.jva" },
+ {
+ "Test multiple combine annotation statements with sequence_ref import/export",
+ "examples/uniref50.fa", "examples/testdata/uniref50_iupred.jva" },
+ {
+ "Test group only annotation file parsing results in parser indicating annotation was parsed",
+ "examples/uniref50.fa", "examples/testdata/test_grpannot.jva" } };
@Test
public void exampleAnnotationFileIO() throws Exception
{
- for (String[] testPair:TestFiles)
+ for (String[] testPair : TestFiles)
{
- testAnnotationFileIO(testPair[0], new File(testPair[1]), new File(testPair[2]));
+ testAnnotationFileIO(testPair[0], new File(testPair[1]), new File(
+ testPair[2]));
}
}
@@ -34,11 +66,12 @@ public class AnnotationFileIOTest
AlignmentI al = rf.readFile(ff, AppletFormatAdapter.FILE,
new IdentifyFile().Identify(ff, AppletFormatAdapter.FILE));
-
+
// make sure dataset is initialised ? not sure about this
for (int i = 0; i < al.getSequencesArray().length; ++i)
{
- al.getSequenceAt(i).setDatasetSequence(al.getSequenceAt(i).createDatasetSequence());
+ al.getSequenceAt(i).setDatasetSequence(
+ al.getSequenceAt(i).createDatasetSequence());
}
assertNotNull("Couldn't read supplied alignment data.", al);
return al;
@@ -46,9 +79,10 @@ public class AnnotationFileIOTest
{
e.printStackTrace();
}
- fail("Couln't read the alignment in file '"+f.toString()+"'");
+ fail("Couln't read the alignment in file '" + f.toString() + "'");
return null;
}
+
/**
* test alignment data in given file can be imported, exported and reimported
* with no dataloss
@@ -59,25 +93,48 @@ public class AnnotationFileIOTest
* - label for IO class used to write and read back in the data from
* f
*/
- public static void testAnnotationFileIO(String testname, File f, File annotFile)
+ public static void testAnnotationFileIO(String testname, File f,
+ File annotFile)
{
- System.out.println("Test: "+testname+"\nReading annotation file '"+annotFile+"' onto : " + f);
+ System.out.println("Test: " + testname + "\nReading annotation file '"
+ + annotFile + "' onto : " + f);
String af = annotFile.getPath();
try
{
AlignmentI al = readAlignmentFile(f);
-
- assertTrue("Test "+testname+"\nAlignment was not annotated - annotation file not imported.",new AnnotationFile().readAnnotationFile(al, af, FormatAdapter.FILE));
-
- String anfileout = new AnnotationFile().printAnnotations(al.getAlignmentAnnotation(), al.getGroups(), al.getProperties());
- assertTrue("Test "+testname+"\nAlignment annotation file was not regenerated. Null string",anfileout!=null);
- assertTrue("Test "+testname+"\nAlignment annotation file was not regenerated. Empty string",anfileout.length()>"JALVIEW_ANNOTATION".length());
- System.out.println("Output annotation file:\n"+anfileout+"\n< "JALVIEW_ANNOTATION".length());
+
+ System.out.println("Output annotation file:\n" + anfileout
+ + "\n<