nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am b51412a0: Merge "Quit depending on SoftReference in UserHistoryDictionaryTests." 

* commit 'b51412a05c28fa51828e07224b7fe49a424d8fc5':
  Quit depending on SoftReference in UserHistoryDictionaryTests.
main
Keisuke Kuroyanagi 2014-09-22 05:53:29 +00:00 committed by Android Git Automerger
parent f1fd943095 b51412a05c
commit 42852d3b6e
1 changed files with 38 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
tests/src/com/android/inputmethod/latin/personalization/UserHistoryDictionaryTests.java
View File

@ -74,9 +74,10 @@ public class UserHistoryDictionaryTests extends AndroidTestCase {
} }
} }
private void checkExistenceAndRemoveDictFile(final Locale locale, final File dictFile) { private void checkExistenceAndRemoveDictFile(final UserHistoryDictionary dict,
final File dictFile) {
Log.d(TAG, "waiting for writing ..."); Log.d(TAG, "waiting for writing ...");
waitForWriting(locale); dict.waitAllTasksForTests();
if (!dictFile.exists()) { if (!dictFile.exists()) {
try { try {
Log.d(TAG, dictFile + " is not existing. Wait " Log.d(TAG, dictFile + " is not existing. Wait "
@ -91,6 +92,10 @@ public class UserHistoryDictionaryTests extends AndroidTestCase {
FileUtils.deleteRecursively(dictFile); FileUtils.deleteRecursively(dictFile);
} }
private static Locale getDummyLocale(final String name) {
return new Locale(TEST_LOCALE_PREFIX + name + System.currentTimeMillis());
}
@Override @Override
protected void setUp() throws Exception { protected void setUp() throws Exception {
super.setUp(); super.setUp();
@ -168,11 +173,9 @@ public class UserHistoryDictionaryTests extends AndroidTestCase {
* @param checkContents if true, checks whether written words are actually in the dictionary * @param checkContents if true, checks whether written words are actually in the dictionary
* or not. * or not.
*/ */
private void addAndWriteRandomWords(final Locale locale, final int numberOfWords, private void addAndWriteRandomWords(final UserHistoryDictionary dict,
final Random random, final boolean checkContents) { final int numberOfWords, final Random random, final boolean checkContents) {
final List<String> words = generateWords(numberOfWords, random); final List<String> words = generateWords(numberOfWords, random);
final UserHistoryDictionary dict = PersonalizationHelper.getUserHistoryDictionary(
mContext, locale);
// Add random words to the user history dictionary. // Add random words to the user history dictionary.
addToDict(dict, words); addToDict(dict, words);
if (checkContents) { if (checkContents) {
@ -188,46 +191,34 @@ public class UserHistoryDictionaryTests extends AndroidTestCase {
/** /**
* Clear all entries in the user history dictionary. * Clear all entries in the user history dictionary.
* @param locale dummy locale for testing. * @param dict the user history dictionary.
*/ */
private void clearHistory(final Locale locale) { private void clearHistory(final UserHistoryDictionary dict) {
final UserHistoryDictionary dict = PersonalizationHelper.getUserHistoryDictionary(
mContext, locale);
dict.waitAllTasksForTests(); dict.waitAllTasksForTests();
dict.clear(); dict.clear();
dict.close(); dict.close();
dict.waitAllTasksForTests(); dict.waitAllTasksForTests();
} }
/**
* Shut down executer and wait until all operations of user history are done.
* @param locale dummy locale for testing.
*/
private void waitForWriting(final Locale locale) {
final UserHistoryDictionary dict = PersonalizationHelper.getUserHistoryDictionary(
mContext, locale);
dict.waitAllTasksForTests();
}
public void testRandomWords() { public void testRandomWords() {
Log.d(TAG, "This test can be used for profiling."); Log.d(TAG, "This test can be used for profiling.");
Log.d(TAG, "Usage: please set UserHistoryDictionary.PROFILE_SAVE_RESTORE to true."); Log.d(TAG, "Usage: please set UserHistoryDictionary.PROFILE_SAVE_RESTORE to true.");
final Locale dummyLocale = final Locale dummyLocale = getDummyLocale("random_words");
new Locale(TEST_LOCALE_PREFIX + "random_words" + System.currentTimeMillis());
final String dictName = ExpandableBinaryDictionary.getDictName( final String dictName = ExpandableBinaryDictionary.getDictName(
UserHistoryDictionary.NAME, dummyLocale, null /* dictFile */); UserHistoryDictionary.NAME, dummyLocale, null /* dictFile */);
final File dictFile = ExpandableBinaryDictionary.getDictFile( final File dictFile = ExpandableBinaryDictionary.getDictFile(
mContext, dictName, null /* dictFile */); mContext, dictName, null /* dictFile */);
final UserHistoryDictionary dict = PersonalizationHelper.getUserHistoryDictionary(
getContext(), dummyLocale);
final int numberOfWords = 1000; final int numberOfWords = 1000;
final Random random = new Random(123456); final Random random = new Random(123456);
try { try {
clearHistory(dummyLocale); clearHistory(dict);
addAndWriteRandomWords(dummyLocale, numberOfWords, random, addAndWriteRandomWords(dict, numberOfWords, random, true /* checksContents */);
true /* checksContents */);
} finally { } finally {
checkExistenceAndRemoveDictFile(dummyLocale, dictFile); checkExistenceAndRemoveDictFile(dict, dictFile);
} }
} }
@ -237,28 +228,30 @@ public class UserHistoryDictionaryTests extends AndroidTestCase {
final int numberOfWordsInsertedForEachLanguageSwitch = 100; final int numberOfWordsInsertedForEachLanguageSwitch = 100;
final File dictFiles[] = new File[numberOfLanguages]; final File dictFiles[] = new File[numberOfLanguages];
final Locale dummyLocales[] = new Locale[numberOfLanguages]; final UserHistoryDictionary dicts[] = new UserHistoryDictionary[numberOfLanguages];
try { try {
final Random random = new Random(123456); final Random random = new Random(123456);
// Create filename suffixes for this test. // Create filename suffixes for this test.
for (int i = 0; i < numberOfLanguages; i++) { for (int i = 0; i < numberOfLanguages; i++) {
dummyLocales[i] = new Locale(TEST_LOCALE_PREFIX + "switching_languages" + i); final Locale dummyLocale = getDummyLocale("switching_languages" + i);
final String dictName = ExpandableBinaryDictionary.getDictName( final String dictName = ExpandableBinaryDictionary.getDictName(
UserHistoryDictionary.NAME, dummyLocales[i], null /* dictFile */); UserHistoryDictionary.NAME, dummyLocale, null /* dictFile */);
dictFiles[i] = ExpandableBinaryDictionary.getDictFile( dictFiles[i] = ExpandableBinaryDictionary.getDictFile(
mContext, dictName, null /* dictFile */); mContext, dictName, null /* dictFile */);
clearHistory(dummyLocales[i]); dicts[i] = PersonalizationHelper.getUserHistoryDictionary(getContext(),
dummyLocale);
clearHistory(dicts[i]);
} }
final long start = System.currentTimeMillis(); final long start = System.currentTimeMillis();
for (int i = 0; i < numberOfLanguageSwitching; i++) { for (int i = 0; i < numberOfLanguageSwitching; i++) {
final int index = i % numberOfLanguages; final int index = i % numberOfLanguages;
// Switch languages to testFilenameSuffixes[index]. // Switch to dicts[index].
addAndWriteRandomWords(dummyLocales[index], addAndWriteRandomWords(dicts[index], numberOfWordsInsertedForEachLanguageSwitch,
numberOfWordsInsertedForEachLanguageSwitch, random, random, false /* checksContents */);
false /* checksContents */);
} }
final long end = System.currentTimeMillis(); final long end = System.currentTimeMillis();
@ -266,38 +259,38 @@ public class UserHistoryDictionaryTests extends AndroidTestCase {
+ (end - start) + " ms"); + (end - start) + " ms");
} finally { } finally {
for (int i = 0; i < numberOfLanguages; i++) { for (int i = 0; i < numberOfLanguages; i++) {
checkExistenceAndRemoveDictFile(dummyLocales[i], dictFiles[i]); checkExistenceAndRemoveDictFile(dicts[i], dictFiles[i]);
} }
} }
} }
public void testAddManyWords() { public void testAddManyWords() {
final Locale dummyLocale = final Locale dummyLocale = getDummyLocale("many_random_words");
new Locale(TEST_LOCALE_PREFIX + "many_random_words" + System.currentTimeMillis());
final String dictName = ExpandableBinaryDictionary.getDictName( final String dictName = ExpandableBinaryDictionary.getDictName(
UserHistoryDictionary.NAME, dummyLocale, null /* dictFile */); UserHistoryDictionary.NAME, dummyLocale, null /* dictFile */);
final File dictFile = ExpandableBinaryDictionary.getDictFile( final File dictFile = ExpandableBinaryDictionary.getDictFile(
mContext, dictName, null /* dictFile */); mContext, dictName, null /* dictFile */);
final int numberOfWords = 10000; final int numberOfWords = 10000;
final Random random = new Random(123456); final Random random = new Random(123456);
clearHistory(dummyLocale); final UserHistoryDictionary dict = PersonalizationHelper.getUserHistoryDictionary(
getContext(), dummyLocale);
clearHistory(dict);
try { try {
addAndWriteRandomWords(dummyLocale, numberOfWords, random, true /* checksContents */); addAndWriteRandomWords(dict, numberOfWords, random, true /* checksContents */);
} finally { } finally {
checkExistenceAndRemoveDictFile(dummyLocale, dictFile); checkExistenceAndRemoveDictFile(dict, dictFile);
} }
} }
public void testDecaying() { public void testDecaying() {
final Locale dummyLocale = final Locale dummyLocale = getDummyLocale("decaying");
new Locale(TEST_LOCALE_PREFIX + "decaying" + System.currentTimeMillis()); final UserHistoryDictionary dict = PersonalizationHelper.getUserHistoryDictionary(
getContext(), dummyLocale);
final int numberOfWords = 5000; final int numberOfWords = 5000;
final Random random = new Random(123456); final Random random = new Random(123456);
resetCurrentTimeForTestMode(); resetCurrentTimeForTestMode();
clearHistory(dummyLocale); clearHistory(dict);
final List<String> words = generateWords(numberOfWords, random); final List<String> words = generateWords(numberOfWords, random);
final UserHistoryDictionary dict =
PersonalizationHelper.getUserHistoryDictionary(getContext(), dummyLocale);
dict.waitAllTasksForTests(); dict.waitAllTasksForTests();
PrevWordsInfo prevWordsInfo = PrevWordsInfo.EMPTY_PREV_WORDS_INFO; PrevWordsInfo prevWordsInfo = PrevWordsInfo.EMPTY_PREV_WORDS_INFO;
for (final String word : words) { for (final String word : words) {