From: Jim Procter <jprocter@issues.jalview.org>
Date: Thu, 25 Aug 2016 11:13:56 +0000 (+0100)
Subject: Merge branch 'trailm' into trial_fixMakeCDSDBRefPropagation
X-Git-Tag: Release_2_10_0~47^2~4^2~43^2~15
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=46c321b0c0f02adf71fe433c86ab6609e0872871;p=jalview.git

Merge branch 'trailm' into trial_fixMakeCDSDBRefPropagation
---

46c321b0c0f02adf71fe433c86ab6609e0872871
diff --cc test/jalview/analysis/AlignmentUtilsTests.java
index 2ec2e18,0426091..a0ce475
--- a/test/jalview/analysis/AlignmentUtilsTests.java
+++ b/test/jalview/analysis/AlignmentUtilsTests.java
@@@ -994,12 -994,14 +994,14 @@@ public class AlignmentUtilsTest
  
      /*
       * need a sourceDbRef if we are to construct dbrefs to the CDS
 -     * sequence
 +     * sequence from the dna contig sequences
       */
      DBRefEntry dbref = new DBRefEntry("ENSEMBL", "0", "dna1");
-     dna1.getDatasetSequence().setSourceDBRef(dbref);
+     dna1.getDatasetSequence().addDBRef(dbref);
+     org.testng.Assert.assertEquals(dbref, dna1.getPrimaryDBRefs().get(0));
      dbref = new DBRefEntry("ENSEMBL", "0", "dna2");
-     dna2.getDatasetSequence().setSourceDBRef(dbref);
+     dna2.getDatasetSequence().addDBRef(dbref);
+     org.testng.Assert.assertEquals(dbref, dna2.getPrimaryDBRefs().get(0));
  
      /*
       * CDS sequences are 'discovered' from dna-to-protein mappings on the alignment