X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fanalysis%2FRnaTest.java;h=f33525faf21a63e2198aafad82133fdc618f7e01;hb=4ed0cd5f8477ba52a9f5b19b021f8f6183f9dd61;hp=95c37acfcc8f2cd27613ebffb7810f4553c2540f;hpb=32522ec3c4179494249e085506977f21f83e9b2e;p=jalview.git

diff --git a/test/jalview/analysis/RnaTest.java b/test/jalview/analysis/RnaTest.java
index 95c37ac..f33525f 100644
--- a/test/jalview/analysis/RnaTest.java
+++ b/test/jalview/analysis/RnaTest.java
@@ -128,24 +128,34 @@ public class RnaTest
             Rna.getRNASecStrucState("a.[K-]z}?{Q b(w)p><i"));
   }
 
+  /**
+   * Tests for isClosingParenthesis with char or String argument
+   */
   @Test(groups = { "Functional" })
   public void testIsClosingParenthesis()
   {
+    assertFalse(Rna.isClosingParenthesis(null));
+
     /*
      * only a-z, )]}> are closing bracket symbols
      */
     for (int i = 0; i <= 255; i++)
     {
-      boolean isClosing = Rna.isClosingParenthesis((char) i);
+      boolean isClosingChar = Rna.isClosingParenthesis((char) i);
+      boolean isClosingString = Rna.isClosingParenthesis(String
+              .valueOf((char) i));
       if ((i >= 'a' && i <= 'z') || i == ')' || i == '}' || i == ']'
               || i == '>')
       {
-        assertTrue(String.format("close base pair %c", i), isClosing);
+        assertTrue(String.format("close base pair %c", i), isClosingChar);
+        assertTrue(String.format("close base pair %c", i), isClosingString);
       }
       else
       {
-        assertFalse(String.format("close base pair %c", i), isClosing);
+        assertFalse(String.format("close base pair %c", i), isClosingChar);
+        assertFalse(String.format("close base pair %c", i), isClosingString);
       }
+      assertFalse(Rna.isClosingParenthesis(String.valueOf((char) i) + " "));
     }
   }
 
@@ -178,6 +188,9 @@ public class RnaTest
     }
   }
 
+  /**
+   * Tests for isOpeningParenthesis with char or String argument
+   */
   @Test(groups = { "Functional" })
   public void testIsOpeningParenthesis()
   {
@@ -186,16 +199,21 @@ public class RnaTest
      */
     for (int i = 0; i <= 255; i++)
     {
-      boolean isOpening = Rna.isOpeningParenthesis((char) i);
+      boolean isOpeningChar = Rna.isOpeningParenthesis((char) i);
+      boolean isOpeningString = Rna.isOpeningParenthesis(String
+              .valueOf((char) i));
       if ((i >= 'A' && i <= 'Z') || i == '(' || i == '{' || i == '['
               || i == '<')
       {
-        assertTrue(String.format("Open base pair %c", i), isOpening);
+        assertTrue(String.format("Open base pair %c", i), isOpeningChar);
+        assertTrue(String.format("Open base pair %c", i), isOpeningString);
       }
       else
       {
-        assertFalse(String.format("Open base pair %c", i), isOpening);
+        assertFalse(String.format("Open base pair %c", i), isOpeningChar);
+        assertFalse(String.format("Open base pair %c", i), isOpeningString);
       }
+      assertFalse(Rna.isOpeningParenthesis(String.valueOf((char) i) + " "));
     }
   }
 
@@ -225,4 +243,37 @@ public class RnaTest
       }
     }
   }
+
+  /**
+   * Tests for isRnaSecondaryStructureSymbol with char or String argument
+   */
+  @Test(groups = { "Functional" })
+  public void testIsRnaSecondaryStructureSymbol()
+  {
+    assertFalse(Rna.isRnaSecondaryStructureSymbol(null));
+  
+    /*
+     * only A-Z,  a-z, ()[]{}<> are valid symbols
+     */
+    for (int i = 0; i <= 255; i++)
+    {
+      boolean isValidChar = Rna.isRnaSecondaryStructureSymbol((char) i);
+      boolean isValidString = Rna.isRnaSecondaryStructureSymbol(String
+              .valueOf((char) i));
+      if ((i >= 'A' && i <= 'Z') || (i >= 'a' && i <= 'z') || i == '('
+              || i == ')' || i == '{' || i == '}' || i == '[' || i == ']'
+              || i == '<' || i == '>')
+      {
+        assertTrue(String.format("close base pair %c", i), isValidChar);
+        assertTrue(String.format("close base pair %c", i), isValidString);
+      }
+      else
+      {
+        assertFalse(String.format("close base pair %c", i), isValidChar);
+        assertFalse(String.format("close base pair %c", i), isValidString);
+      }
+      assertFalse(Rna.isRnaSecondaryStructureSymbol(String
+              .valueOf((char) i) + " "));
+    }
+  }
 }