Fix flaky unit test.

Change-Id: I8df0f9a0398b29f679844f256ad84f09ebcea8ee
This commit is contained in:
Keisuke Kuroyanagi 2014-01-14 18:18:39 -08:00
parent cdeeadf5ca
commit 68069c55c4
2 changed files with 4 additions and 1 deletions

View file

@ -58,6 +58,7 @@ abstract public class ExpandableBinaryDictionary extends Dictionary {
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 @@ abstract public class ExpandableBinaryDictionary extends Dictionary {
}
}
});
return holder.get(false, TIMEOUT_FOR_READ_OPS_IN_MILLISECONDS);
return holder.get(false, TIMEOUT_FOR_READ_OPS_FOR_TESTS_IN_MILLISECONDS);
}
@UsedForTesting

View file

@ -105,8 +105,10 @@ public class UserHistoryDictionaryTests extends AndroidTestCase {
final UserHistoryDictionary dict =
PersonalizationHelper.getUserHistoryDictionary(getContext(),
new Locale(testFilenameSuffix));
dict.waitAllTasksForTests();
dict.clearAndFlushDictionary();
dict.close();
dict.waitAllTasksForTests();
}
/**