JAL-1920 JAL-3017 use newline not <br/> in description and update test to cover multi...

[jalview.git] / test / jalview / ws / dbsources / UniprotTest.java

diff --git a/test/jalview/ws/dbsources/UniprotTest.java b/test/jalview/ws/dbsources/UniprotTest.java
index b187b67..c7f216e 100644 (file)
--- a/test/jalview/ws/dbsources/UniprotTest.java
+++ b/test/jalview/ws/dbsources/UniprotTest.java
@@ -68,6 +68,7 @@ public class UniprotTest
           + "<feature type=\"sequence variant\" description=\"Pathogenic\"><original>M</original><variation>L</variation><location><position position=\"41\"/></location></feature>"
           + "<feature type=\"sequence variant\" description=\"Pathogenic\"><original>M</original><location><position position=\"41\"/></location></feature>"
           + "<feature type=\"sequence variant\" description=\"Foo\"><variation>L</variation><variation>LMV</variation><original>M</original><location><position position=\"42\"/></location></feature>"
+          + "<feature type=\"sequence variant\" description=\"Foo\"><variation>LL</variation><variation>LMV</variation><original>ML</original><location><begin position=\"42\"/><end position=\"43\"/></location></feature>"
           + "<sequence length=\"10\" mass=\"27410\" checksum=\"8CB760AACF88FE6C\" modified=\"2008-01-15\" version=\"1\">MHAPL VSKDL</sequence></entry>"
           + "</uniprot>";
 
@@ -103,7 +104,7 @@ public class UniprotTest
      * Check sequence features
      */
     Vector<UniprotFeature> features = entry.getFeature();
-    assertEquals(7, features.size());
+    assertEquals(8, features.size());
     UniprotFeature sf = features.get(0);
     assertEquals("signal peptide", sf.getType());
     assertNull(sf.getDescription());
@@ -152,10 +153,15 @@ public class UniprotTest
     assertEquals(42, sf.getBegin());
     assertEquals(42, sf.getEnd());
     Assert.assertEquals(Uniprot.getDescription(sf),
-            "p.Met42Leu<br/>p.Met42LeuMetVal Foo");
-    /*
-     * Check cross-references
-     */
+            "p.Met42Leu" + "\n" + "p.Met42LeuMetVal Foo");
+
+    sf = features.get(7);
+    assertEquals(42, sf.getBegin());
+    assertEquals(43, sf.getEnd());
+    Assert.assertEquals(Uniprot.getDescription(sf),
+            "p.MetLeu42LeuLeu" + "\n" + "p.MetLeu42LeuMetVal Foo"); /*
+                                                                    * Check cross-references
+                                                                    */
     Vector<PDBEntry> xrefs = entry.getDbReference();
     assertEquals(3, xrefs.size());