Change predefined additional subtype format in preference

This change also refactor StringUtils class

Change-Id: Ie0b4d169b21c260bf238d6fcc9ab0ee8bfd6b508

2 files changed, 95 insertions, 4 deletions

diff --git a/tests/src/com/android/inputmethod/latin/StringUtilsTests.java b/tests/src/com/android/inputmethod/latin/StringUtilsTests.java
new file mode 100644
index 000000000..8a5a82246
--- /dev/null
+++ b/tests/src/com/android/inputmethod/latin/StringUtilsTests.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.android.inputmethod.latin;
+
+import android.test.AndroidTestCase;
+
+public class StringUtilsTests extends AndroidTestCase {
+    public void testContainsInArray() {
+        assertFalse("empty array", StringUtils.containsInArray("key", new String[0]));
+        assertFalse("not in 1 element", StringUtils.containsInArray("key", new String[] {
+                "key1"
+        }));
+        assertFalse("not in 2 elements", StringUtils.containsInArray("key", new String[] {
+                "key1", "key2"
+        }));
+
+        assertTrue("in 1 element", StringUtils.containsInArray("key", new String[] {
+                "key"
+        }));
+        assertTrue("in 2 elements", StringUtils.containsInArray("key", new String[] {
+                "key1", "key"
+        }));
+    }
+
+    public void testContainsInCsv() {
+        assertFalse("null", StringUtils.containsInCsv("key", null));
+        assertFalse("empty", StringUtils.containsInCsv("key", ""));
+        assertFalse("not in 1 element", StringUtils.containsInCsv("key", "key1"));
+        assertFalse("not in 2 elements", StringUtils.containsInCsv("key", "key1,key2"));
+
+        assertTrue("in 1 element", StringUtils.containsInCsv("key", "key"));
+        assertTrue("in 2 elements", StringUtils.containsInCsv("key", "key1,key"));
+    }
+
+    public void testAppendToCsvIfNotExists() {
+        assertEquals("null", "key", StringUtils.appendToCsvIfNotExists("key", null));
+        assertEquals("empty", "key", StringUtils.appendToCsvIfNotExists("key", ""));
+
+        assertEquals("not in 1 element", "key1,key",
+                StringUtils.appendToCsvIfNotExists("key", "key1"));
+        assertEquals("not in 2 elements", "key1,key2,key",
+                StringUtils.appendToCsvIfNotExists("key", "key1,key2"));
+
+        assertEquals("in 1 element", "key",
+                StringUtils.appendToCsvIfNotExists("key", "key"));
+        assertEquals("in 2 elements at position 1", "key,key2",
+                StringUtils.appendToCsvIfNotExists("key", "key,key2"));
+        assertEquals("in 2 elements at position 2", "key1,key",
+                StringUtils.appendToCsvIfNotExists("key", "key1,key"));
+        assertEquals("in 3 elements at position 2", "key1,key,key3",
+                StringUtils.appendToCsvIfNotExists("key", "key1,key,key3"));
+    }
+
+    public void testRemoveFromCsvIfExists() {
+        assertEquals("null", "", StringUtils.removeFromCsvIfExists("key", null));
+        assertEquals("empty", "", StringUtils.removeFromCsvIfExists("key", ""));
+
+        assertEquals("not in 1 element", "key1",
+                StringUtils.removeFromCsvIfExists("key", "key1"));
+        assertEquals("not in 2 elements", "key1,key2",
+                StringUtils.removeFromCsvIfExists("key", "key1,key2"));
+
+        assertEquals("in 1 element", "",
+                StringUtils.removeFromCsvIfExists("key", "key"));
+        assertEquals("in 2 elements at position 1", "key2",
+                StringUtils.removeFromCsvIfExists("key", "key,key2"));
+        assertEquals("in 2 elements at position 2", "key1",
+                StringUtils.removeFromCsvIfExists("key", "key1,key"));
+        assertEquals("in 3 elements at position 2", "key1,key3",
+                StringUtils.removeFromCsvIfExists("key", "key1,key,key3"));
+
+        assertEquals("in 3 elements at position 1,2,3", "",
+                StringUtils.removeFromCsvIfExists("key", "key,key,key"));
+        assertEquals("in 5 elements at position 2,4", "key1,key3,key5",
+                StringUtils.removeFromCsvIfExists("key", "key1,key,key3,key,key5"));
+    }
+}
diff --git a/tests/src/com/android/inputmethod/latin/SubtypeLocaleTests.java b/tests/src/com/android/inputmethod/latin/SubtypeLocaleTests.java
index 12711c137..971fbc21b 100644
--- a/tests/src/com/android/inputmethod/latin/SubtypeLocaleTests.java
+++ b/tests/src/com/android/inputmethod/latin/SubtypeLocaleTests.java
@@ -165,13 +165,13 @@ public class SubtypeLocaleTests extends AndroidTestCase {
 
     public void testAdditionalSubtype() {
         final InputMethodSubtype DE_QWERTY = AdditionalSubtype.createAdditionalSubtype(
-                Locale.GERMAN.toString(), AdditionalSubtype.QWERTY);
+                Locale.GERMAN.toString(), AdditionalSubtype.QWERTY, null);
         final InputMethodSubtype FR_QWERTZ = AdditionalSubtype.createAdditionalSubtype(
-                Locale.FRENCH.toString(), AdditionalSubtype.QWERTZ);
+                Locale.FRENCH.toString(), AdditionalSubtype.QWERTZ, null);
         final InputMethodSubtype EN_AZERTY = AdditionalSubtype.createAdditionalSubtype(
-                Locale.ENGLISH.toString(), AdditionalSubtype.AZERTY);
+                Locale.ENGLISH.toString(), AdditionalSubtype.AZERTY, null);
         final InputMethodSubtype ZZ_AZERTY = AdditionalSubtype.createAdditionalSubtype(
-                SubtypeLocale.NO_LANGUAGE, AdditionalSubtype.AZERTY);
+                SubtypeLocale.NO_LANGUAGE, AdditionalSubtype.AZERTY, null);
 
         assertTrue(AdditionalSubtype.isAdditionalSubtype(FR_QWERTZ));
         assertTrue(AdditionalSubtype.isAdditionalSubtype(DE_QWERTY));