X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fio%2FCrossRef2xmlTests.java;h=080bda8b4e2dd89e82b4f383c8d2a93e6e92be5a;hb=0c43b6471604ebf707b0f592ad9bdbe932910a86;hp=838aa7a09a12ff0e25f08063ab089758d55b4769;hpb=ec58d7c6a3ceadb413a2e11247adef2eaee3382b;p=jalview.git diff --git a/test/jalview/io/CrossRef2xmlTests.java b/test/jalview/io/CrossRef2xmlTests.java index 838aa7a..080bda8 100644 --- a/test/jalview/io/CrossRef2xmlTests.java +++ b/test/jalview/io/CrossRef2xmlTests.java @@ -77,7 +77,8 @@ public class CrossRef2xmlTests extends Jalview2xmlBase List keyseq = new ArrayList(); HashMap savedProjects = new HashMap(); - for (String[] did : new String[][] { { "UNIPROT", "P01731" } }) + for (String[] did : new String[][] { { "ENSEMBL", "ENSG00000157764" }, + { "UNIPROT", "P01731" } }) { // pass counters - 0 - first pass, 1 means retrieve project rather than // perform action @@ -113,6 +114,9 @@ public class CrossRef2xmlTests extends Jalview2xmlBase AlignmentTest.assertAlignmentDatasetRefs(af.getViewport() .getAlignment(), "Pass (" + pass1 + "," + pass2 + "," + pass3 + "): Fetch " + first + ":"); + AlignmentTest.assertDatasetIsNormalised(af.getViewport() + .getAlignment(), "Pass (" + pass1 + "," + pass2 + "," + + pass3 + "): Fetch " + first + ":"); dna = af.getViewport().getAlignment().isNucleotide(); retral = af.getViewport().getAlignment(); dataset = retral.getDataset(); @@ -136,6 +140,9 @@ public class CrossRef2xmlTests extends Jalview2xmlBase AlignmentTest.assertAlignmentDatasetRefs(af.getViewport() .getAlignment(), "Pass (" + pass1 + "," + pass2 + "," + pass3 + "): Recover " + first + ":"); + AlignmentTest.assertDatasetIsNormalised(af.getViewport() + .getAlignment(), "Pass (" + pass1 + "," + pass2 + "," + + pass3 + "): Recover " + first + ":"); } @@ -228,6 +235,10 @@ public class CrossRef2xmlTests extends Jalview2xmlBase "Pass (" + pass1 + "," + pass2 + "," + pass3 + "): before start of pass3: " + nextxref + ":"); + AlignmentTest.assertDatasetIsNormalised(avp.getAlignment(), + "Pass (" + pass1 + "," + pass2 + "," + pass3 + + "): before start of pass3: " + nextxref + + ":"); SequenceI[] xrseqs = avp.getAlignment().getSequencesArray(); @@ -340,6 +351,10 @@ public class CrossRef2xmlTests extends Jalview2xmlBase nextavp.getAlignment(), "" + "Pass (" + pass1 + "," + pass2 + "): For " + nextnextxref + ":"); + AlignmentTest.assertDatasetIsNormalised( + nextavp.getAlignment(), "" + "Pass (" + pass1 + + "," + pass2 + "): For " + + nextnextxref + ":"); stringify(dbtoviewBit, savedProjects, nextnextxref, nextavp);