X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fdatamodel%2FSequenceFeatureTest.java;h=9111e5ac2720320bbf39e594216e665a3c6d0957;hb=0ccb42e83189e8ce1682af2885f5a44be0f260ea;hp=fbeb36555301747795801ea9e3f9349b76b6aaa5;hpb=6ec47c00025dbeb48dba5f5db77754ec50b7a6b5;p=jalview.git diff --git a/test/jalview/datamodel/SequenceFeatureTest.java b/test/jalview/datamodel/SequenceFeatureTest.java index fbeb365..9111e5a 100644 --- a/test/jalview/datamodel/SequenceFeatureTest.java +++ b/test/jalview/datamodel/SequenceFeatureTest.java @@ -48,7 +48,7 @@ public class SequenceFeatureTest 12.5f, "group"); sf1.setValue("STRAND", "+"); sf1.setValue("Note", "Testing"); - Integer count = new Integer(7); + Integer count = Integer.valueOf(7); sf1.setValue("Count", count); SequenceFeature sf2 = new SequenceFeature(sf1); @@ -106,7 +106,7 @@ public class SequenceFeatureTest assertEquals("+", sf1.getValue("STRAND")); assertNull(sf1.getValue("strand")); // case-sensitive assertEquals(".", sf1.getValue("unknown", ".")); - Integer i = new Integer(27); + Integer i = Integer.valueOf(27); assertSame(i, sf1.getValue("Unknown", i)); } @@ -273,4 +273,47 @@ public class SequenceFeatureTest "group"); assertTrue(sf.isContactFeature()); } + + @Test(groups = { "Functional" }) + public void testGetDetailsReport() + { + // single locus, no group, no score + SequenceFeature sf = new SequenceFeature("variant", "G,C", 22, 22, null); + String expected = "
" + + "" + + "
Typevariant
Start/end22
DescriptionG,C
"; + assertEquals(expected, sf.getDetailsReport()); + + // contact feature + sf = new SequenceFeature("Disulphide Bond", "a description", 28, 31, + null); + expected = "
" + + "" + + "
TypeDisulphide Bond
Start/end28:31
Descriptiona description
"; + assertEquals(expected, sf.getDetailsReport()); + + sf = new SequenceFeature("variant", "G,C", 22, 33, + 12.5f, "group"); + sf.setValue("Parent", "ENSG001"); + sf.setValue("Child", "ENSP002"); + expected = "
" + + "" + + "" + + "" + + "" + + "" + + "
Typevariant
Start/end22-33
DescriptionG,C
Score12.5
Groupgroup
ChildENSP002
ParentENSG001
"; + assertEquals(expected, sf.getDetailsReport()); + + /* + * feature with embedded html link in description + */ + String desc = "Fer2 Status: True Positive Pfam 8_8"; + sf = new SequenceFeature("Pfam", desc, 8, 83, "Uniprot"); + expected = "
" + + "" + + "" + + "
TypePfam
Start/end8-83
DescriptionFer2 Status: True Positive Pfam 8_8
GroupUniprot
"; + assertEquals(expected, sf.getDetailsReport()); + } }