X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=inline;f=test%2Fjalview%2Fdatamodel%2FSequenceFeatureTest.java;h=f8479a35123f4c4c6b9cb1b6d18f57a652d9a076;hb=e42e467b0a21b19e9c39c9395bdac19c322d9ffe;hp=fbeb36555301747795801ea9e3f9349b76b6aaa5;hpb=163ed5b997bbda48e4cdd950e87a8fe01baae7fb;p=jalview.git
diff --git a/test/jalview/datamodel/SequenceFeatureTest.java b/test/jalview/datamodel/SequenceFeatureTest.java
index fbeb365..f8479a3 100644
--- a/test/jalview/datamodel/SequenceFeatureTest.java
+++ b/test/jalview/datamodel/SequenceFeatureTest.java
@@ -26,11 +26,15 @@ import static org.testng.AssertJUnit.assertNull;
import static org.testng.AssertJUnit.assertSame;
import static org.testng.AssertJUnit.assertTrue;
-import jalview.gui.JvOptionPane;
+import java.util.ArrayList;
+import java.util.List;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
+import jalview.gui.JvOptionPane;
+import jalview.util.MapList;
+
public class SequenceFeatureTest
{
@@ -48,7 +52,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 +110,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 +277,83 @@ public class SequenceFeatureTest
"group");
assertTrue(sf.isContactFeature());
}
+
+ @Test(groups = { "Functional" })
+ 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 = "
Location | TestSeq | 22 |
"
+ + "Type | variant | |
"
+ + "Description | G,C | |
";
+ assertEquals(expected, sf.getDetailsReport(seqName, null));
+
+ // contact feature
+ sf = new SequenceFeature("Disulphide Bond", "a description", 28, 31,
+ null);
+ expected = "
Location | TestSeq | 28:31 |
"
+ + "Type | Disulphide Bond | |
"
+ + "Description | a description | |
";
+ assertEquals(expected, sf.getDetailsReport(seqName, null));
+
+ sf = new SequenceFeature("variant", "G,C", 22, 33,
+ 12.5f, "group");
+ sf.setValue("Parent", "ENSG001");
+ sf.setValue("Child", "ENSP002");
+ expected = "
Location | TestSeq | 22-33 |
"
+ + "Type | variant | |
"
+ + "Description | G,C | |
"
+ + "Score | 12.5 | |
"
+ + "Group | group | |
"
+ + "Child | | ENSP002 |
"
+ + "Parent | | ENSG001 |
";
+ assertEquals(expected, sf.getDetailsReport(seqName, null));
+
+ /*
+ * 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 = "
Location | TestSeq | 8-83 |
"
+ + "Type | Pfam | |
"
+ + "Description | Fer2 Status: True Positive Pfam 8_8 | |
"
+ + "Group | Uniprot | |
";
+ assertEquals(expected, sf.getDetailsReport(seqName, null));
+ }
+
+ /**
+ * Feature details report for a virtual feature should include original and
+ * mapped locations, and also derived peptide consequence if it can be
+ * determined
+ */
+ @Test(groups = { "Functional" })
+ public void testGetDetailsReport_virtualFeature()
+ {
+ SequenceI cds = new Sequence("Cds/101-121", "CCTttgAGAtttCAAatgGAT");
+ SequenceI seq = new Sequence("TestSeq/8-14", "PLRFQMD");
+ MapList map = new MapList(new int[] { 101, 118 }, new int[] { 8, 13 },
+ 3, 1);
+ Mapping mapping = new Mapping(seq, map);
+ List features = new ArrayList<>();
+ // vary ttg (Leu) to ttc (Phe)
+ SequenceFeature sf = new SequenceFeature("variant", "G,C", 106, 106,
+ null);
+ sf.setValue("alleles", "G,C"); // needed to compute peptide consequence!
+ features.add(sf);
+
+ MappedFeatures mf = new MappedFeatures(mapping, cds, 9, 'L', features);
+
+ String expected = "
Location | Cds | 106 |
"
+ + "Peptide Location | TestSeq | 9 |
"
+ + "Type | variant | |
"
+ + "Description | G,C | |
"
+ + "Consequence | Translated by Jalview | p.Leu9Phe |
"
+ + "alleles | | G,C |
"
+ + "
";
+
+ assertEquals(expected, sf.getDetailsReport(seq.getName(), mf));
+ }
}