X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fws%2Fdbsources%2FUniprotTest.java;h=060c3032f2abf456765a2d516c359c59843773c8;hb=0d4b46bd187c65f264ebdbdc968ac349f2dfcce5;hp=67d5d62aa1b63fab19835a8c08cf4a7b9b17eb18;hpb=389aee3db85ef6cbbe710f281000daa45edcc206;p=jalview.git
diff --git a/test/jalview/ws/dbsources/UniprotTest.java b/test/jalview/ws/dbsources/UniprotTest.java
index 67d5d62..060c303 100644
--- a/test/jalview/ws/dbsources/UniprotTest.java
+++ b/test/jalview/ws/dbsources/UniprotTest.java
@@ -154,19 +154,22 @@ public class UniprotTest
assertEquals(42, sf.getBegin());
assertEquals(42, sf.getEnd());
Assert.assertEquals(Uniprot.getDescription(sf),
- "p.Met42Leu" + "\n" + "p.Met42LeuMetVal Foo");
+ "p.Met42Leu" + "
"
+ + "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");
+ "p.MetLeu42LeuLeu" + "
"
+ + "p.MetLeu42LeuMetVal Foo");
sf = features.get(8);
assertEquals(42, sf.getBegin());
assertEquals(45, sf.getEnd());
Assert.assertEquals(Uniprot.getDescription(sf),
- "p.MLML42LeuLeu" + "\n" + "p.MLML42LMVK Foo Too");
+ "p.MLML42LeuLeu" + "
"
+ + "p.MLML42LMVK Foo Too");
/*
* Check cross-references
@@ -253,8 +256,9 @@ public class UniprotTest
uf.setVariation(vars);
assertEquals("p.Lys23Tyr Hello", Uniprot.getDescription(uf));
+ // multiple variants generate an html description over more than one line
vars.add("W");
- assertEquals("p.Lys23Tyr\np.Lys23Trp Hello",
+ assertEquals("p.Lys23Tyr
p.Lys23Trp Hello",
Uniprot.getDescription(uf));
/*
@@ -264,16 +268,14 @@ public class UniprotTest
vars.clear();
vars.add("KWE");
uf.setOriginal("KLS");
- assertEquals(
- "p.LysLeuSer23LysTrpGlu Hello",
+ assertEquals("p.LysLeuSer23LysTrpGlu Hello",
Uniprot.getDescription(uf));
// adding a fourth original base switches to single letter code
uf.setOriginal("KLST");
- assertEquals("p.KLST23LysTrpGlu Hello",
- Uniprot.getDescription(uf));
+ assertEquals("p.KLST23LysTrpGlu Hello", Uniprot.getDescription(uf));
- // adding a fourth variant switches to a condensed representation
+ // adding a fourth variant switches to single letter code
vars.clear();
vars.add("KWES");
assertEquals("p.KLST23KWES Hello", Uniprot.getDescription(uf));