2 files changed, 51 insertions, 5 deletions

diff --git a/tests/src/com/android/inputmethod/latin/UserDictionaryLookupTest.java b/tests/src/com/android/inputmethod/latin/UserDictionaryLookupTest.java
index d8060f286..917140ab5 100644
--- a/tests/src/com/android/inputmethod/latin/UserDictionaryLookupTest.java
+++ b/tests/src/com/android/inputmethod/latin/UserDictionaryLookupTest.java
@@ -309,6 +309,52 @@ public class UserDictionaryLookupTest extends AndroidTestCase {
         lookup.close();
     }
 
+    public void testDictionaryStats() {
+        Log.d(TAG, "testDictionaryStats");
+
+        // Insert "foo" and "bar". Only "foo" has a shortcut.
+        Uri uri = addWord("foo", Locale.GERMANY, 17, "f");
+        addWord("bar", Locale.GERMANY, 17, null);
+
+        // Create the UserDictionaryLookup and wait until it's loaded.
+        UserDictionaryLookup lookup = new UserDictionaryLookup(mContext, ExecutorUtils.SPELLING);
+        lookup.open();
+        while (!lookup.isLoaded()) {
+        }
+
+        // "foo" should match.
+        assertTrue(lookup.isValidWord("foo", Locale.GERMANY));
+
+        // "bar" should match.
+        assertTrue(lookup.isValidWord("bar", Locale.GERMANY));
+
+        // "foo" should have a shortcut.
+        assertEquals("foo", lookup.expandShortcut("f", Locale.GERMANY));
+
+        // Now delete "foo".
+        deleteWord(uri);
+
+        // Wait a little bit before expecting a change. The time we wait should be greater than
+        // UserDictionaryLookup.RELOAD_DELAY_MS.
+        try {
+            Thread.sleep(UserDictionaryLookup.RELOAD_DELAY_MS + 1000);
+        } catch (InterruptedException e) {
+        }
+
+        // Perform lookups again. Reload should have occured.
+        //
+        // "foo" should not match.
+        assertFalse(lookup.isValidWord("foo", Locale.GERMANY));
+
+        // "foo" should not have a shortcut.
+        assertNull(lookup.expandShortcut("f", Locale.GERMANY));
+
+        // "bar" should still match.
+        assertTrue(lookup.isValidWord("bar", Locale.GERMANY));
+
+        lookup.close();
+    }
+
     public void testClose() {
         Log.d(TAG, "testClose");
 
diff --git a/tests/src/com/android/inputmethod/latin/network/HttpUrlConnectionBuilderTests.java b/tests/src/com/android/inputmethod/latin/network/HttpUrlConnectionBuilderTests.java
index 54808b793..5b3e78eaf 100644
--- a/tests/src/com/android/inputmethod/latin/network/HttpUrlConnectionBuilderTests.java
+++ b/tests/src/com/android/inputmethod/latin/network/HttpUrlConnectionBuilderTests.java
@@ -87,7 +87,7 @@ public class HttpUrlConnectionBuilderTests extends AndroidTestCase {
 
     public void testAddHeader() throws IOException {
         HttpUrlConnectionBuilder builder = new HttpUrlConnectionBuilder();
-        builder.setUrl("https://www.example.com");
+        builder.setUrl("http://www.example.com");
         builder.addHeader("some-random-key", "some-random-value");
         HttpURLConnection connection = builder.build();
         assertEquals("some-random-value", connection.getRequestProperty("some-random-key"));
@@ -95,14 +95,14 @@ public class HttpUrlConnectionBuilderTests extends AndroidTestCase {
 
     public void testSetUseCache_notSet() throws IOException {
         HttpUrlConnectionBuilder builder = new HttpUrlConnectionBuilder();
-        builder.setUrl("https://www.example.com");
+        builder.setUrl("http://www.example.com");
         HttpURLConnection connection = builder.build();
         assertFalse(connection.getUseCaches());
     }
 
     public void testSetUseCache_false() throws IOException {
         HttpUrlConnectionBuilder builder = new HttpUrlConnectionBuilder();
-        builder.setUrl("https://www.example.com");
+        builder.setUrl("http://www.example.com");
         HttpURLConnection connection = builder.build();
         connection.setUseCaches(false);
         assertFalse(connection.getUseCaches());
@@ -110,7 +110,7 @@ public class HttpUrlConnectionBuilderTests extends AndroidTestCase {
 
     public void testSetUseCache_true() throws IOException {
         HttpUrlConnectionBuilder builder = new HttpUrlConnectionBuilder();
-        builder.setUrl("https://www.example.com");
+        builder.setUrl("http://www.example.com");
         HttpURLConnection connection = builder.build();
         connection.setUseCaches(true);
         assertTrue(connection.getUseCaches());
@@ -118,7 +118,7 @@ public class HttpUrlConnectionBuilderTests extends AndroidTestCase {
 
     public void testSetMode_uploadOnly() throws IOException {
         HttpUrlConnectionBuilder builder = new HttpUrlConnectionBuilder();
-        builder.setUrl("https://www.example.com");
+        builder.setUrl("http://www.example.com");
         builder.setMode(MODE_UPLOAD_ONLY);
         HttpURLConnection connection = builder.build();
         assertTrue(connection.getDoInput());