X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fio%2FAnnotationFileIOTest.java;h=de78aa1e871a7645425962d9ffd53187e2894265;hb=a7169b1c72607f3c9357195b4999869650a2a891;hp=7d6a15fcc13eb8bf9f4014bef90fa92bb3a6d404;hpb=ae3a5e9ecc087f6ada0cee07efde4b0d0ba76a41;p=jalview.git
diff --git a/test/jalview/io/AnnotationFileIOTest.java b/test/jalview/io/AnnotationFileIOTest.java
index 7d6a15f..de78aa1 100644
--- a/test/jalview/io/AnnotationFileIOTest.java
+++ b/test/jalview/io/AnnotationFileIOTest.java
@@ -1,59 +1,79 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1)
- * 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.
*
* 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.
+ * 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 .
+ * 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;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import jalview.datamodel.AlignmentI;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertNotNull;
+import static org.testng.AssertJUnit.assertTrue;
+import java.awt.Color;
import java.io.File;
+import java.util.Hashtable;
+import java.util.List;
+
+import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
-import org.junit.Test;
+import jalview.datamodel.AlignmentI;
+import jalview.datamodel.HiddenColumns;
+import jalview.datamodel.SequenceGroup;
+import jalview.gui.AlignFrame;
+import jalview.gui.JvOptionPane;
+import jalview.io.AnnotationFile.ViewDef;
public class AnnotationFileIOTest
{
- static String TestFiles[][] =
+ @BeforeClass(alwaysRun = true)
+ public void setUpJvOptionPane()
{
- { "Test example annotation import/export", "examples/uniref50.fa",
- "examples/testdata/example_annot_file.jva" },
+ JvOptionPane.setInteractiveMode(false);
+ JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+ }
+
+ 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",
+ { "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 group only annotation file parsing results in parser indicating annotation was parsed",
+ "examples/uniref50.fa", "examples/testdata/test_grpannot.jva" },
+ { "Test hiding/showing of insertions on sequence_ref",
+ "examples/uniref50.fa",
+ "examples/testdata/uniref50_seqref.jva" } };
- @Test
+ @Test(groups = { "Functional" })
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]));
}
}
- public static AlignmentI readAlignmentFile(File f)
+ protected AlignmentI readAlignmentFile(File f)
{
System.out.println("Reading file: " + f);
String ff = f.getPath();
@@ -61,13 +81,13 @@ 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)
{
- al.getSequenceAt(i).setDatasetSequence(al.getSequenceAt(i).createDatasetSequence());
+ al.getSequenceAt(i).createDatasetSequence();
}
assertNotNull("Couldn't read supplied alignment data.", al);
return al;
@@ -75,9 +95,11 @@ public class AnnotationFileIOTest
{
e.printStackTrace();
}
- fail("Couln't read the alignment in file '"+f.toString()+"'");
+ Assert.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
@@ -88,32 +110,95 @@ 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)
+ 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<Seq1\nQRSIL\n>Seq2\nFTHND\n>Seq3\nRPVSL\n",
+ DataSourceType.PASTE);
+ long t2 = System.currentTimeMillis();
+ System.err.println("t0: " + (t2 - t1));
+ // seq1 and seq3 are in distinct groups both named Group1
+ String annotationFile = "JALVIEW_ANNOTATION\nSEQUENCE_GROUP\tGroup1\t*\t*\t1\n"
+ + "SEQUENCE_GROUP\tGroup2\t*\t*\t2\n"
+ + "SEQUENCE_GROUP\tGroup1\t*\t*\t3\n"
+ + "PROPERTIES\tGroup1\toutlineColour=blue\tidColour=red\n";
+ new AnnotationFile().annotateAlignmentView(af.getViewport(),
+ annotationFile, DataSourceType.PASTE);
+
+ AlignmentI al = af.getViewport().getAlignment();
+ List groups = al.getGroups();
+ assertEquals(3, groups.size());
+ SequenceGroup sg = groups.get(0);
+ assertEquals("Group1", sg.getName());
+ assertTrue(sg.contains(al.getSequenceAt(0)));
+ assertEquals(Color.BLUE, sg.getOutlineColour());
+ assertEquals(Color.RED, sg.getIdColour());
+ sg = groups.get(1);
+ assertEquals("Group2", sg.getName());
+ assertTrue(sg.contains(al.getSequenceAt(1)));
+
+ /*
+ * the bug fix: a second group of the same name is also given properties
+ */
+ sg = groups.get(2);
+ assertEquals("Group1", sg.getName());
+ assertTrue(sg.contains(al.getSequenceAt(2)));
+ assertEquals(Color.BLUE, sg.getOutlineColour());
+ assertEquals(Color.RED, sg.getIdColour());
}
}