X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=blobdiff_plain;f=test%2Fjalview%2Fio%2FStockholmFileTest.java;h=b1995ab5945b4d1d99ff1df0b135d5aacd9483b1;hp=e4f2abc900d7f68b0be339d9ed312b38c0a713b4;hb=0ae965fc73680bdc69b06986c060ff17342c4787;hpb=5de214b159afb4f2bc2c16464fb634ded293847b diff --git a/test/jalview/io/StockholmFileTest.java b/test/jalview/io/StockholmFileTest.java index e4f2abc..b1995ab 100644 --- a/test/jalview/io/StockholmFileTest.java +++ b/test/jalview/io/StockholmFileTest.java @@ -274,6 +274,11 @@ public class StockholmFileTest // check Alignment annotation AlignmentAnnotation[] aa_new = al_input.getAlignmentAnnotation(); AlignmentAnnotation[] aa_original = al.getAlignmentAnnotation(); + boolean expectProteinSS = !al.isNucleotide(); + assertTrue( + "Alignments not both " + + (al.isNucleotide() ? "nucleotide" : "protein"), + al_input.isNucleotide() == al.isNucleotide()); // note - at moment we do not distinguish between alignment without any // annotation rows and alignment with no annotation row vector @@ -292,6 +297,13 @@ public class StockholmFileTest assertEqualSecondaryStructure( "Different alignment annotation at position " + i, aa_original[i], aa_new[i], allowNullAnnotation); + if (aa_original[i].hasIcons) + { + assertTrue( + "Secondary structure expected to be " + + (expectProteinSS ? "protein" : "nucleotide"), + expectProteinSS == !aa_original[i].isRNA()); + } // compare graphGroup or graph properties - needed to verify JAL-1299 assertEquals("Graph type not identical.", aa_original[i].graph, aa_new[i].graph);