From: Jim Procter Date: Fri, 20 Sep 2019 12:06:13 +0000 (+0100) Subject: JAL-3070 JAL-2507 fix up test output and honour the ‘ignoreFeatures’ flag when testin... X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=77e9234c6d0a7695cb959d4f6227e4ebc9bf4575;p=jalview.git JAL-3070 JAL-2507 fix up test output and honour the ‘ignoreFeatures’ flag when testing alignment equivalence (this broke disorderAnnotExportImport tests) --- 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();