Merge branch 'feature/JAL-3187linkedFeatures' into feature/JAL-3251biotypedMappings

[jalview.git] / test / jalview / datamodel / MappingTypeTest.java

diff --git a/test/jalview/datamodel/MappingTypeTest.java b/test/jalview/datamodel/MappingTypeTest.java
index a7b28a7..560fa71 100644 (file)
--- a/test/jalview/datamodel/MappingTypeTest.java
+++ b/test/jalview/datamodel/MappingTypeTest.java
@@ -21,9 +21,6 @@
 package jalview.datamodel;
 
 import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertSame;
-
-import jalview.datamodel.MappingType;
 
 import org.testng.annotations.Test;
 
@@ -31,33 +28,50 @@ public class MappingTypeTest
 {
 
   @Test(groups = "Functional")
-  public void testGetInverse()
-  {
-    assertSame(MappingType.PeptideToNucleotide,
-            MappingType.NucleotideToPeptide.getInverse());
-    assertSame(MappingType.NucleotideToPeptide,
-            MappingType.PeptideToNucleotide.getInverse());
-    assertSame(MappingType.NucleotideToNucleotide,
-            MappingType.NucleotideToNucleotide.getInverse());
-    assertSame(MappingType.PeptideToPeptide,
-            MappingType.PeptideToPeptide.getInverse());
-  }
-
-  @Test(groups = "Functional")
   public void testGetFromRatio()
   {
-    assertEquals(1, MappingType.NucleotideToNucleotide.getFromRatio());
-    assertEquals(1, MappingType.PeptideToNucleotide.getFromRatio());
-    assertEquals(1, MappingType.PeptideToPeptide.getFromRatio());
-    assertEquals(3, MappingType.NucleotideToPeptide.getFromRatio());
+    /*
+     * nucleotide-nucleotide
+     */
+    assertEquals(1, MappingType.GenomeToCdna.getFromRatio());
+    assertEquals(1, MappingType.CdnaToGenome.getFromRatio());
+    assertEquals(1, MappingType.GenomeToCds.getFromRatio());
+    assertEquals(1, MappingType.CdsToGenome.getFromRatio());
+    assertEquals(1, MappingType.CdnaToCds.getFromRatio());
+    assertEquals(1, MappingType.CdsToCdna.getFromRatio());
+
+    /*
+     * nucleotide-peptide
+     */
+    assertEquals(3, MappingType.GenomeToPeptide.getFromRatio());
+    assertEquals(1, MappingType.PeptideToGenome.getFromRatio());
+    assertEquals(3, MappingType.CdnaToPeptide.getFromRatio());
+    assertEquals(1, MappingType.PeptideToCdna.getFromRatio());
+    assertEquals(3, MappingType.CdsToPeptide.getFromRatio());
+    assertEquals(1, MappingType.PeptideToCds.getFromRatio());
   }
 
   @Test(groups = "Functional")
   public void testGetToRatio()
   {
-    assertEquals(1, MappingType.NucleotideToNucleotide.getToRatio());
-    assertEquals(3, MappingType.PeptideToNucleotide.getToRatio());
-    assertEquals(1, MappingType.PeptideToPeptide.getToRatio());
-    assertEquals(1, MappingType.NucleotideToPeptide.getToRatio());
+    /*
+     * nucleotide-nucleotide
+     */
+    assertEquals(1, MappingType.GenomeToCdna.getToRatio());
+    assertEquals(1, MappingType.CdnaToGenome.getToRatio());
+    assertEquals(1, MappingType.GenomeToCds.getToRatio());
+    assertEquals(1, MappingType.CdsToGenome.getToRatio());
+    assertEquals(1, MappingType.CdnaToCds.getToRatio());
+    assertEquals(1, MappingType.CdsToCdna.getToRatio());
+
+    /*
+     * nucleotide-peptide
+     */
+    assertEquals(1, MappingType.GenomeToPeptide.getToRatio());
+    assertEquals(3, MappingType.PeptideToGenome.getToRatio());
+    assertEquals(1, MappingType.CdnaToPeptide.getToRatio());
+    assertEquals(3, MappingType.PeptideToCdna.getToRatio());
+    assertEquals(1, MappingType.CdsToPeptide.getToRatio());
+    assertEquals(3, MappingType.PeptideToCds.getToRatio());
   }
 }