Merge branch 'develop' into update_212_Dec_merge_with_21125_chamges

[jalview.git] / test / jalview / util / StringUtilsTest.java

diff --git a/test/jalview/util/StringUtilsTest.java b/test/jalview/util/StringUtilsTest.java
index 9cc8d1c..b425116 100644 (file)
--- a/test/jalview/util/StringUtilsTest.java
+++ b/test/jalview/util/StringUtilsTest.java
@@ -67,39 +67,29 @@ public class StringUtilsTest
     char[] c1 = "ABC".toCharArray();
 
     // delete second position
-    assertTrue(Arrays.equals(new char[] { 'A', 'C' },
-            StringUtils.deleteChars(c1, 1, 2)));
+    assertTrue(
+            Arrays.equals(new char[]
+            { 'A', 'C' }, StringUtils.deleteChars(c1, 1, 2)));
 
     // delete positions 1 and 2
-    assertTrue(Arrays.equals(new char[] { 'C' },
-            StringUtils.deleteChars(c1, 0, 2)));
+    assertTrue(
+            Arrays.equals(new char[]
+            { 'C' }, StringUtils.deleteChars(c1, 0, 2)));
 
     // delete positions 1-3
     assertTrue(Arrays.equals(new char[] {},
             StringUtils.deleteChars(c1, 0, 3)));
 
     // delete position 3
-    assertTrue(Arrays.equals(new char[] { 'A', 'B' },
-            StringUtils.deleteChars(c1, 2, 3)));
+    assertTrue(
+            Arrays.equals(new char[]
+            { 'A', 'B' }, StringUtils.deleteChars(c1, 2, 3)));
 
     // out of range deletion is ignore
     assertTrue(Arrays.equals(c1, StringUtils.deleteChars(c1, 3, 4)));
   }
 
   @Test(groups = { "Functional" })
-  public void testGetLastToken()
-  {
-    assertNull(StringUtils.getLastToken(null, null));
-    assertNull(StringUtils.getLastToken(null, "/"));
-    assertEquals("a", StringUtils.getLastToken("a", null));
-
-    assertEquals("abc", StringUtils.getLastToken("abc", "/"));
-    assertEquals("c", StringUtils.getLastToken("abc", "b"));
-    assertEquals("file1.dat", StringUtils.getLastToken(
-            "file://localhost:8080/data/examples/file1.dat", "/"));
-  }
-
-  @Test(groups = { "Functional" })
   public void testSeparatorListToArray()
   {
     String[] result = StringUtils.separatorListToArray(
@@ -116,8 +106,8 @@ public class StringUtilsTest
      * String delimited by | containing a quoted | (should not be treated as
      * delimiter)
      */
-    assertEquals("[abc='|'d, ef, g]", Arrays.toString(StringUtils
-            .separatorListToArray("abc='|'d|ef|g", "|")));
+    assertEquals("[abc='|'d, ef, g]", Arrays.toString(
+            StringUtils.separatorListToArray("abc='|'d|ef|g", "|")));
   }
 
   @Test(groups = { "Functional" })
@@ -126,19 +116,19 @@ public class StringUtilsTest
     assertEquals("*", StringUtils.arrayToSeparatorList(null, "*"));
     assertEquals("*",
             StringUtils.arrayToSeparatorList(new String[] {}, "*"));
-    assertEquals(
-            "a*bc*cde",
-            StringUtils.arrayToSeparatorList(new String[] { "a", "bc",
-                "cde" }, "*"));
-    assertEquals(
-            "a*cde",
-            StringUtils.arrayToSeparatorList(new String[] { "a", null,
-                "cde" }, "*"));
-    assertEquals("a**cde", StringUtils.arrayToSeparatorList(new String[] {
-        "a", "", "cde" }, "*"));
+    assertEquals("a*bc*cde",
+            StringUtils.arrayToSeparatorList(new String[]
+            { "a", "bc", "cde" }, "*"));
+    assertEquals("a*cde",
+            StringUtils.arrayToSeparatorList(new String[]
+            { "a", null, "cde" }, "*"));
+    assertEquals("a**cde",
+            StringUtils.arrayToSeparatorList(new String[]
+            { "a", "", "cde" }, "*"));
     // delimiter within token is not (yet) escaped
-    assertEquals("a*b*c*cde", StringUtils.arrayToSeparatorList(new String[]
-    { "a", "b*c", "cde" }, "*"));
+    assertEquals("a*b*c*cde",
+            StringUtils.arrayToSeparatorList(new String[]
+            { "a", "b*c", "cde" }, "*"));
   }
 
   @Test(groups = { "Functional" })
@@ -151,7 +141,8 @@ public class StringUtilsTest
     assertEquals("now", StringUtils.listToDelimitedString(list, ";"));
     list.add("is");
     assertEquals("now;is", StringUtils.listToDelimitedString(list, ";"));
-    assertEquals("now ; is", StringUtils.listToDelimitedString(list, " ; "));
+    assertEquals("now ; is",
+            StringUtils.listToDelimitedString(list, " ; "));
     list.add("the");
     list.add("winter");
     list.add("of");
@@ -199,7 +190,8 @@ public class StringUtilsTest
     assertEquals(-1, StringUtils.compareVersions("2.8.3", "2.9.2"));
     assertEquals(-1, StringUtils.compareVersions("2.8", "2.8.3"));
     assertEquals(-1, StringUtils.compareVersions("2.8.3", "2.8.3b1", "b"));
-    assertEquals(-1, StringUtils.compareVersions("2.8.3b1", "2.8.3b2", "b"));
+    assertEquals(-1,
+            StringUtils.compareVersions("2.8.3b1", "2.8.3b2", "b"));
     assertEquals(-1, StringUtils.compareVersions("2.8", "2.8.0", "b"));
     assertEquals(-1, StringUtils.compareVersions("2", "12"));
     assertEquals(-1, StringUtils.compareVersions("3.2.4", "3.12.11"));
@@ -234,18 +226,18 @@ public class StringUtilsTest
   {
     assertNull(StringUtils.stripHtmlTags(null));
     assertEquals("", StringUtils.stripHtmlTags(""));
-    assertEquals(
-            "<a href=\"something\">label</href>",
-            StringUtils
-                    .stripHtmlTags("<html><a href=\"something\">label</href></html>"));
+    assertEquals("<a href=\"something\">label</href>",
+            StringUtils.stripHtmlTags(
+                    "<html><a href=\"something\">label</href></html>"));
 
     // if no "<html>" tag, < and > get html-encoded (not sure why)
     assertEquals("&lt;a href=\"something\"&gt;label&lt;/href&gt;",
-            StringUtils.stripHtmlTags("<a href=\"something\">label</href>"));
+            StringUtils
+                    .stripHtmlTags("<a href=\"something\">label</href>"));
 
     // </body> gets removed but not <body> (is this intentional?)
-    assertEquals("<body><p>hello",
-            StringUtils.stripHtmlTags("<html><body><p>hello</body></html>"));
+    assertEquals("<body><p>hello", StringUtils
+            .stripHtmlTags("<html><body><p>hello</body></html>"));
 
     assertEquals("kdHydro &lt; 12.53",
             StringUtils.stripHtmlTags("kdHydro < 12.53"));
@@ -311,5 +303,9 @@ public class StringUtilsTest
     // decode space also; %3E is not decoded to .
     assertEquals("a=b%3Ec d=,",
             StringUtils.urlDecode("a%3Db%3Ec+d%3D%2C", ";=, "));
+
+    // decode encoded % (%25)
+    assertEquals("a,=;\t%z",
+            StringUtils.urlDecode("a%2C%3D%3B%09%25z", ";=,\t%"));
   }
 }