X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=test%2Fjalview%2Fschemes%2FResiduePropertiesTest.java;h=d7e0e0bcde36dbeea1996aa3a4ac8d900af001d2;hb=3f3c6c3a2b99fee2e726d18302af1b3320331212;hp=b976e4457c3ed276175bfbcd20de5ba843b1465a;hpb=be32c14cd8e48fe0a207cd7030cb9cd46f894678;p=jalview.git

diff --git a/test/jalview/schemes/ResiduePropertiesTest.java b/test/jalview/schemes/ResiduePropertiesTest.java
index b976e44..d7e0e0b 100644
--- a/test/jalview/schemes/ResiduePropertiesTest.java
+++ b/test/jalview/schemes/ResiduePropertiesTest.java
@@ -1,9 +1,12 @@
 package jalview.schemes;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertNull;
 
-import org.junit.Test;
+import java.util.Collections;
+import java.util.List;
+
+import org.testng.annotations.Test;
 
 public class ResiduePropertiesTest
 {
@@ -171,4 +174,46 @@ public class ResiduePropertiesTest
     assertNull(ResidueProperties.codonTranslate("VHD"));
     assertNull(ResidueProperties.codonTranslate("WSK"));
   }
+
+  @Test
+  public void testGetResidues_nucleotide()
+  {
+    /*
+     * Non-ambiguous only; we don't care about the order of the list, it is just
+     * sorted here to make assertions reliable
+     */
+    List<String> residues = ResidueProperties.getResidues(true, false);
+    Collections.sort(residues);
+    assertEquals("[A, C, G, T, U]", residues.toString());
+
+    /*
+     * Including ambiguity codes I N R X Y
+     */
+    residues = ResidueProperties.getResidues(true, true);
+    Collections.sort(residues);
+    assertEquals("[A, C, G, I, N, R, T, U, X, Y]", residues.toString());
+  }
+
+  @Test
+  public void testGetResidues_peptide()
+  {
+    /*
+     * Non-ambiguous only; we don't care about the order of the list, it is just
+     * sorted here to make assertions reliable
+     */
+    List<String> residues = ResidueProperties.getResidues(false, false);
+    Collections.sort(residues);
+    assertEquals(
+            "[ALA, ARG, ASN, ASP, CYS, GLN, GLU, GLY, HIS, ILE, LEU, LYS, MET, PHE, PRO, SER, THR, TRP, TYR, VAL]",
+            residues.toString());
+
+    /*
+     * Including ambiguity codes ASX, GLX, XAA
+     */
+    residues = ResidueProperties.getResidues(false, true);
+    Collections.sort(residues);
+    assertEquals(
+            "[ALA, ARG, ASN, ASP, ASX, CYS, GLN, GLU, GLX, GLY, HIS, ILE, LEU, LYS, MET, PHE, PRO, SER, THR, TRP, TYR, VAL, XAA]",
+            residues.toString());
+  }
 }