X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fws%2Fdbsources%2FUniprotTest.java;h=c603a110559167360c087a8fb875f154bec4e37c;hb=42df19afce43090aea47fe782195f11236801be7;hp=2d4be719173e0d9b1822a4e0efad3565401b8975;hpb=e957648a02a9e25795a92a4f39a5e3c1e7adb230;p=jalview.git diff --git a/test/jalview/ws/dbsources/UniprotTest.java b/test/jalview/ws/dbsources/UniprotTest.java index 2d4be71..c603a11 100644 --- a/test/jalview/ws/dbsources/UniprotTest.java +++ b/test/jalview/ws/dbsources/UniprotTest.java @@ -63,6 +63,9 @@ public class UniprotTest + "" + "" + "" + + "ML" + + "ML" + + "M" + "MHAPL VSKDL" + ""; @@ -98,7 +101,7 @@ public class UniprotTest * Check sequence features */ Vector features = entry.getFeature(); - assertEquals(3, features.size()); + assertEquals(6, features.size()); UniprotFeature sf = features.get(0); assertEquals("signal peptide", sf.getType()); assertNull(sf.getDescription()); @@ -118,6 +121,27 @@ public class UniprotTest assertEquals(21, sf.getBegin()); assertEquals(247, sf.getEnd()); + sf = features.get(3); + assertEquals("sequence variant", sf.getType()); + assertEquals("Variation: 'L' Original: 'M'", sf.getDescription()); + assertEquals(41, sf.getPosition()); + assertEquals(41, sf.getBegin()); + assertEquals(41, sf.getEnd()); + + sf = features.get(4); + assertEquals("sequence variant", sf.getType()); + assertEquals("Pathogenic Variation: 'L' Original: 'M'", + sf.getDescription()); + assertEquals(41, sf.getPosition()); + assertEquals(41, sf.getBegin()); + assertEquals(41, sf.getEnd()); + + sf = features.get(5); + assertEquals("sequence variant", sf.getType()); + assertEquals("Pathogenic Original: 'M'", sf.getDescription()); + assertEquals(41, sf.getPosition()); + assertEquals(41, sf.getBegin()); + assertEquals(41, sf.getEnd()); /* * Check cross-references */ @@ -163,11 +187,11 @@ public class UniprotTest new StringReader(UNIPROT_XML)).get(0); /* - * name formatted as source | accession ids | names - * source database converted to Jalview canonical name + * name formatted with Uniprot Entry name */ - String expectedName = "UNIPROT|A9CKP4|A9CKP5|A9CKP4_AGRT5|A9CKP4_AGRT6"; - assertEquals(expectedName, Uniprot.getUniprotEntryId(entry)); + String expectedName = "A9CKP4_AGRT5|A9CKP4_AGRT6"; + assertEquals(expectedName, + Uniprot.getUniprotEntryId(entry)); } /**