X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fio%2FStockholmFileTest.java;h=12a8e9c79c63cdce191285f29791623f7a9c9717;hb=3412b273e964fb1a9d22564b04a5f0c827ec2461;hp=13385143325b1bbb05d1a9d860712dd0aacb5696;hpb=a8c9bb134b3146ff69f70dc34cf8951f3a8b139c;p=jalview.git diff --git a/test/jalview/io/StockholmFileTest.java b/test/jalview/io/StockholmFileTest.java index 1338514..12a8e9c 100644 --- a/test/jalview/io/StockholmFileTest.java +++ b/test/jalview/io/StockholmFileTest.java @@ -1,20 +1,42 @@ +/* + * 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. + * + * 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; -import static org.junit.Assert.assertTrue; -import jalview.datamodel.Alignment; -import jalview.datamodel.AlignmentAnnotation; -import jalview.datamodel.AlignmentI; -import jalview.datamodel.Annotation; -import jalview.datamodel.SequenceFeature; -import jalview.datamodel.SequenceI; +import static org.testng.AssertJUnit.assertEquals; +import static org.testng.AssertJUnit.assertNotNull; +import static org.testng.AssertJUnit.assertTrue; import java.io.File; import java.util.BitSet; import java.util.HashMap; import java.util.Map; -import org.junit.Test; +import org.testng.annotations.Test; + +import jalview.datamodel.Alignment; +import jalview.datamodel.AlignmentAnnotation; +import jalview.datamodel.AlignmentI; +import jalview.datamodel.Annotation; +import jalview.datamodel.SequenceFeature; +import jalview.datamodel.SequenceI; public class StockholmFileTest { @@ -25,11 +47,13 @@ public class StockholmFileTest @Test public void pfamFileIO() throws Exception { - testFileIOwithFormat(new File(PfamFile), "STH"); + testFileIOwithFormat(new File(PfamFile), "STH", -1, 0); } + @Test public void pfamFileDataExtraction() throws Exception - { AppletFormatAdapter af = new AppletFormatAdapter(); + { + AppletFormatAdapter af = new AppletFormatAdapter(); AlignmentI al = af.readFile(PfamFile, af.FILE, new IdentifyFile().Identify(PfamFile, af.FILE)); int numpdb = 0; @@ -48,7 +72,7 @@ public class StockholmFileTest @Test public void rfamFileIO() throws Exception { - testFileIOwithFormat(new File(RfamFile), "STH"); + testFileIOwithFormat(new File(RfamFile), "STH", 2, 1); } /** @@ -61,7 +85,9 @@ public class StockholmFileTest * - label for IO class used to write and read back in the data from * f */ - public static void testFileIOwithFormat(File f, String ioformat) + + public static void testFileIOwithFormat(File f, String ioformat, + int naliannot, int nminseqann) { System.out.println("Reading file: " + f); String ff = f.getPath(); @@ -80,7 +106,8 @@ public class StockholmFileTest al.getSequenceAt(i).setDatasetSequence(al.getSequenceAt(i)); } String outputfile = rf.formatSequences(ioformat, al, true); - System.out.println("Output file in '"+ioformat+"':\n"+outputfile+"\n< -1) + { + assertEquals("Number of alignment annotations", naliannot, + numaliannot); + } + + assertTrue( + "Number of sequence associated annotations wasn't at least " + + nminseqann, numsqswithali >= nminseqann); + } catch (Exception e) { e.printStackTrace(); @@ -110,9 +159,11 @@ public class StockholmFileTest * @param al_input * 'secondary' or generated alignment from some datapreserving * transformation + * @param ignoreFeatures + * when true, differences in seuqence feature annotation are ignored. */ public static void testAlignmentEquivalence(AlignmentI al, - AlignmentI al_input) + AlignmentI al_input, boolean ignoreFeatures) { assertNotNull("Original alignment was null", al); assertNotNull("Generated alignment was null", al_input); @@ -135,32 +186,48 @@ public class StockholmFileTest // we might want to revise this in future int aa_new_size = (aa_new == null ? 0 : aa_new.length), aa_original_size = (aa_original == null ? 0 : aa_original.length); - Map orig_groups=new HashMap(),new_groups=new HashMap(); + Map orig_groups = new HashMap(), new_groups = new HashMap(); if (aa_new != null && aa_original != null) { for (int i = 0; i < aa_original.length; i++) { - if (aa_new.length>i) { - assertTrue("Different alignment annotation at position "+i, - equalss(aa_original[i], aa_new[i])); + if (aa_new.length > i) + { + assertTrue("Different alignment annotation at position " + i, + equalss(aa_original[i], aa_new[i])); // compare graphGroup or graph properties - needed to verify JAL-1299 - assertTrue("Graph type not identical.",aa_original[i].graph==aa_new[i].graph); - assertTrue("Visibility not identical.", aa_original[i].visible==aa_new[i].visible); - assertTrue("Threshold line not identical.", aa_original[i].threshold==null ? aa_new[i].threshold==null : aa_original[i].threshold.equals(aa_new[i].threshold)); + assertTrue("Graph type not identical.", + aa_original[i].graph == aa_new[i].graph); + assertTrue("Visibility not identical.", + aa_original[i].visible == aa_new[i].visible); + assertTrue( + "Threshold line not identical.", + aa_original[i].threshold == null ? aa_new[i].threshold == null + : aa_original[i].threshold + .equals(aa_new[i].threshold)); // graphGroup may differ, but pattern should be the same - Integer o_ggrp=new Integer(aa_original[i].graphGroup+2),n_ggrp=new Integer(aa_new[i].graphGroup+2); - BitSet orig_g=orig_groups.get(o_ggrp),new_g=new_groups.get(n_ggrp); - if (orig_g==null) { - orig_groups.put(o_ggrp,orig_g= new BitSet()); + Integer o_ggrp = new Integer(aa_original[i].graphGroup + 2), n_ggrp = new Integer( + aa_new[i].graphGroup + 2); + BitSet orig_g = orig_groups.get(o_ggrp), new_g = new_groups + .get(n_ggrp); + if (orig_g == null) + { + orig_groups.put(o_ggrp, orig_g = new BitSet()); } - if (new_g==null) { - new_groups.put(n_ggrp, new_g=new BitSet()); + if (new_g == null) + { + new_groups.put(n_ggrp, new_g = new BitSet()); } - assertTrue("Graph Group pattern differs at annotation "+i, orig_g.equals(new_g)); - orig_g.set(i); new_g.set(i); - } else { - System.err.println("No matching annotation row for "+aa_original[i].toString()); + assertTrue("Graph Group pattern differs at annotation " + i, + orig_g.equals(new_g)); + orig_g.set(i); + new_g.set(i); + } + else + { + System.err.println("No matching annotation row for " + + aa_original[i].toString()); } } } @@ -198,8 +265,10 @@ public class StockholmFileTest + " are not equal", ss_original.equals(ss_new)); assertTrue( - "Sequence Features were not equivalent", - (seq_original[i].getSequenceFeatures() == null && seq_new[in] + "Sequence Features were not equivalent" + + (ignoreFeatures ? " ignoring." : ""), + ignoreFeatures + || (seq_original[i].getSequenceFeatures() == null && seq_new[in] .getSequenceFeatures() == null) || (seq_original[i].getSequenceFeatures() != null && seq_new[in] .getSequenceFeatures() != null)); @@ -269,23 +338,28 @@ public class StockholmFileTest { if (annot_or.annotations.length != annot_new.annotations.length) { - System.err.println("Different lengths for annotation row elements: "+annot_or.annotations.length +"!="+ annot_new.annotations.length); + System.err.println("Different lengths for annotation row elements: " + + annot_or.annotations.length + "!=" + + annot_new.annotations.length); return false; } for (int i = 0; i < annot_or.annotations.length; i++) { - Annotation an_or=annot_or.annotations[i],an_new=annot_new.annotations[i]; - if (an_or != null - && an_new!= null) + Annotation an_or = annot_or.annotations[i], an_new = annot_new.annotations[i]; + if (an_or != null && an_new != null) { - if (!an_or.displayCharacter.trim() - .equals(an_new.displayCharacter.trim()) - || !(""+an_or.secondaryStructure).trim().equals((""+an_new.secondaryStructure).trim()) + if (!an_or.displayCharacter.trim().equals( + an_new.displayCharacter.trim()) + || !("" + an_or.secondaryStructure).trim().equals( + ("" + an_new.secondaryStructure).trim()) || (an_or.description != an_new.description && (an_or.description == null || an_new.description == null || !an_or.description .equals(an_new.description)))) { - System.err.println("Annotation Element Mismatch\nElement "+i+" in original: "+annot_or.annotations[i].toString()+"\nElement "+i+" in new: "+annot_new.annotations[i].toString()); + System.err.println("Annotation Element Mismatch\nElement " + i + + " in original: " + annot_or.annotations[i].toString() + + "\nElement " + i + " in new: " + + annot_new.annotations[i].toString()); return false; } } @@ -296,7 +370,16 @@ public class StockholmFileTest } else { - System.err.println("Annotation Element Mismatch\nElement "+i+" in original: "+(annot_or.annotations[i]==null ? "is null" : annot_or.annotations[i].toString())+"\nElement "+i+" in new: "+(annot_new.annotations[i] == null ? "is null" : annot_new.annotations[i].toString())); + System.err.println("Annotation Element Mismatch\nElement " + + i + + " in original: " + + (annot_or.annotations[i] == null ? "is null" + : annot_or.annotations[i].toString()) + + "\nElement " + + i + + " in new: " + + (annot_new.annotations[i] == null ? "is null" + : annot_new.annotations[i].toString())); return false; } }