From 77e9234c6d0a7695cb959d4f6227e4ebc9bf4575 Mon Sep 17 00:00:00 2001 From: Jim Procter Date: Fri, 20 Sep 2019 13:06:13 +0100 Subject: [PATCH 1/1] =?utf8?q?JAL-3070=20JAL-2507=20fix=20up=20test=20output?= =?utf8?q?=20and=20honour=20the=20=E2=80=98ignoreFeatures=E2=80=99=20flag=20?= =?utf8?q?when=20testing=20alignment=20equivalence=20(this=20broke=20disorde?= =?utf8?q?rAnnotExportImport=20tests)?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- test/jalview/io/StockholmFileTest.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/test/jalview/io/StockholmFileTest.java b/test/jalview/io/StockholmFileTest.java index ac807e1..96c6828 100644 --- a/test/jalview/io/StockholmFileTest.java +++ b/test/jalview/io/StockholmFileTest.java @@ -22,22 +22,17 @@ package jalview.io; import static org.testng.AssertJUnit.assertEquals; import static org.testng.AssertJUnit.assertNotNull; -import static org.testng.AssertJUnit.assertNull; import static org.testng.AssertJUnit.assertTrue; import static org.testng.AssertJUnit.fail; -import jalview.datamodel.Alignment; import jalview.datamodel.AlignmentAnnotation; import jalview.datamodel.AlignmentI; import jalview.datamodel.Annotation; -import jalview.datamodel.DBRefEntry; -import jalview.datamodel.Sequence; import jalview.datamodel.SequenceFeature; import jalview.datamodel.SequenceI; import jalview.gui.JvOptionPane; import java.io.File; -import java.io.IOException; import java.util.Arrays; import java.util.BitSet; import java.util.HashMap; @@ -328,10 +323,11 @@ public class StockholmFileTest || (seq_original[i].getSequenceFeatures() != null && seq_new[in] .getSequenceFeatures() != null)); // compare sequence features - if (seq_original[i].getSequenceFeatures() != null + if (!ignoreFeatures + && seq_original[i].getSequenceFeatures() != null && seq_new[in].getSequenceFeatures() != null) { - System.out.println("There are feature!!!"); + System.out.println("Checking feature equivalence."); sequenceFeatures_original = seq_original[i] .getSequenceFeatures(); sequenceFeatures_new = seq_new[in].getSequenceFeatures(); -- 1.7.10.2