X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fdatamodel%2FSequenceFeatureTest.java;h=673ea290a7e74ca7c1de3e7d04fc56e528060624;hb=5a631296dd1dcc1df7b50487a647c27333696c74;hp=2774a16c031e5fe0087c55c63223da3610f06e54;hpb=4eb8d7a0f14e5dd1dc5ad5ad0960bae9b25fa043;p=jalview.git diff --git a/test/jalview/datamodel/SequenceFeatureTest.java b/test/jalview/datamodel/SequenceFeatureTest.java index 2774a16..673ea29 100644 --- a/test/jalview/datamodel/SequenceFeatureTest.java +++ b/test/jalview/datamodel/SequenceFeatureTest.java @@ -26,11 +26,11 @@ import static org.testng.AssertJUnit.assertNull; import static org.testng.AssertJUnit.assertSame; import static org.testng.AssertJUnit.assertTrue; -import jalview.gui.JvOptionPane; - import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; +import jalview.gui.JvOptionPane; + public class SequenceFeatureTest { @@ -278,13 +278,14 @@ public class SequenceFeatureTest public void testGetDetailsReport() { SequenceI seq = new Sequence("TestSeq", "PLRFQMD"); + String seqName = seq.getName(); // single locus, no group, no score SequenceFeature sf = new SequenceFeature("variant", "G,C", 22, 22, null); String expected = "
" + "" + "
LocationTestSeq22
Typevariant
DescriptionG,C
"; - assertEquals(expected, sf.getDetailsReport(seq)); + assertEquals(expected, sf.getDetailsReport(seqName, null)); // contact feature sf = new SequenceFeature("Disulphide Bond", "a description", 28, 31, @@ -292,7 +293,7 @@ public class SequenceFeatureTest expected = "
" + "" + "
LocationTestSeq28:31
TypeDisulphide Bond
Descriptiona description
"; - assertEquals(expected, sf.getDetailsReport(seq)); + assertEquals(expected, sf.getDetailsReport(seqName, null)); sf = new SequenceFeature("variant", "G,C", 22, 33, 12.5f, "group"); @@ -305,7 +306,7 @@ public class SequenceFeatureTest + "Groupgroup" + "ChildENSP002" + "ParentENSG001"; - assertEquals(expected, sf.getDetailsReport(seq)); + assertEquals(expected, sf.getDetailsReport(seqName, null)); /* * feature with embedded html link in description @@ -316,6 +317,6 @@ public class SequenceFeatureTest + "TypePfam" + "DescriptionFer2 Status: True Positive Pfam 8_8" + "GroupUniprot"; - assertEquals(expected, sf.getDetailsReport(seq)); + assertEquals(expected, sf.getDetailsReport(seqName, null)); } }