commit 68069c55c49d21dcccd0a90369cd0fd61982d8cf
author Keisuke Kuroyanagi <ksk@google.com> Tue Jan 14 18:18:39 2014 -0800
committer Keisuke Kuroyanagi <ksk@google.com> Tue Jan 14 18:51:29 2014 -0800
tree ee01152a8a044357af3bcfd0d77d6c897db26221
parent cdeeadf5caf00dd7cc73ebdd6f7196e96a76df00

Fix flaky unit test.

Change-Id: I8df0f9a0398b29f679844f256ad84f09ebcea8ee

java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java

diff --git a/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java b/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java
index 7757d29..cb5b0e3 100644
--- a/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java
+++ b/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java
@@ -58,6 +58,7 @@
     private static final boolean DBG_STRESS_TEST = false;
 
     private static final int TIMEOUT_FOR_READ_OPS_IN_MILLISECONDS = 100;
+    private static final int TIMEOUT_FOR_READ_OPS_FOR_TESTS_IN_MILLISECONDS = 1000;
 
     /**
      * The maximum length of a word in this dictionary.
@@ -761,7 +762,7 @@
                 }
             }
         });
-        return holder.get(false, TIMEOUT_FOR_READ_OPS_IN_MILLISECONDS);
+        return holder.get(false, TIMEOUT_FOR_READ_OPS_FOR_TESTS_IN_MILLISECONDS);
     }
 
     @UsedForTesting

tests/src/com/android/inputmethod/latin/personalization/UserHistoryDictionaryTests.java

diff --git a/tests/src/com/android/inputmethod/latin/personalization/UserHistoryDictionaryTests.java b/tests/src/com/android/inputmethod/latin/personalization/UserHistoryDictionaryTests.java
index 17423a7..8433569 100644
--- a/tests/src/com/android/inputmethod/latin/personalization/UserHistoryDictionaryTests.java
+++ b/tests/src/com/android/inputmethod/latin/personalization/UserHistoryDictionaryTests.java
@@ -105,8 +105,10 @@
         final UserHistoryDictionary dict =
                 PersonalizationHelper.getUserHistoryDictionary(getContext(),
                         new Locale(testFilenameSuffix));
+        dict.waitAllTasksForTests();
         dict.clearAndFlushDictionary();
         dict.close();
+        dict.waitAllTasksForTests();
     }
 
     /**