mirror of
https://gitlab.futo.org/keyboard/latinime.git
synced 2024-09-28 14:54:30 +01:00
Add waitAllTasksForTests for testing.
Bug: 10667710 Change-Id: I7a189e32286a6005393fbde8da736541ca9226a8
This commit is contained in:
parent
9ff51527a3
commit
d06de553b2
@ -36,6 +36,7 @@ import java.util.HashMap;
|
||||
import java.util.Locale;
|
||||
import java.util.Map;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
import java.util.concurrent.CountDownLatch;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import java.util.concurrent.atomic.AtomicBoolean;
|
||||
import java.util.concurrent.atomic.AtomicReference;
|
||||
@ -738,13 +739,19 @@ abstract public class ExpandableBinaryDictionary extends Dictionary {
|
||||
}
|
||||
|
||||
@UsedForTesting
|
||||
public void shutdownExecutorForTests() {
|
||||
getExecutor(mDictName).shutdown();
|
||||
}
|
||||
|
||||
@UsedForTesting
|
||||
public boolean isTerminatedForTests() {
|
||||
return getExecutor(mDictName).isTerminated();
|
||||
public void waitAllTasksForTests() {
|
||||
final CountDownLatch countDownLatch = new CountDownLatch(1);
|
||||
getExecutor(mDictName).execute(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
countDownLatch.countDown();
|
||||
}
|
||||
});
|
||||
try {
|
||||
countDownLatch.await();
|
||||
} catch (InterruptedException e) {
|
||||
Log.e(TAG, "Interrupted while waiting for finishing dictionary operations.", e);
|
||||
}
|
||||
}
|
||||
|
||||
@UsedForTesting
|
||||
|
@ -43,9 +43,6 @@ public class UserHistoryDictionaryTests extends AndroidTestCase {
|
||||
"n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z"
|
||||
};
|
||||
|
||||
private static final int MIN_USER_HISTORY_DICTIONARY_FILE_SIZE = 1000;
|
||||
private static final int WAIT_TERMINATING_IN_MILLISECONDS = 100;
|
||||
|
||||
/**
|
||||
* Generates a random word.
|
||||
*/
|
||||
@ -71,8 +68,8 @@ public class UserHistoryDictionaryTests extends AndroidTestCase {
|
||||
private void addToDict(final UserHistoryDictionary dict, final List<String> words) {
|
||||
String prevWord = null;
|
||||
for (String word : words) {
|
||||
// TODO: Use timestamp properly.
|
||||
dict.addToDictionary(prevWord, word, true, 0 /* timestamp */);
|
||||
dict.addToDictionary(prevWord, word, true,
|
||||
(int)TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis()));
|
||||
prevWord = word;
|
||||
}
|
||||
}
|
||||
@ -90,10 +87,7 @@ public class UserHistoryDictionaryTests extends AndroidTestCase {
|
||||
// Add random words to the user history dictionary.
|
||||
addToDict(dict, words);
|
||||
if (checkContents) {
|
||||
try {
|
||||
Thread.sleep(TimeUnit.MILLISECONDS.convert(5L, TimeUnit.SECONDS));
|
||||
} catch (InterruptedException e) {
|
||||
}
|
||||
dict.waitAllTasksForTests();
|
||||
for (int i = 0; i < numberOfWords; ++i) {
|
||||
final String word = words.get(i);
|
||||
assertTrue(dict.isInDictionaryForTests(word));
|
||||
@ -120,17 +114,10 @@ public class UserHistoryDictionaryTests extends AndroidTestCase {
|
||||
* @param testFilenameSuffix file name suffix used for testing.
|
||||
*/
|
||||
private void waitForWriting(final String testFilenameSuffix) {
|
||||
try {
|
||||
final UserHistoryDictionary dict =
|
||||
PersonalizationHelper.getUserHistoryDictionary(getContext(),
|
||||
new Locale(testFilenameSuffix));
|
||||
dict.shutdownExecutorForTests();
|
||||
while (!dict.isTerminatedForTests()) {
|
||||
Thread.sleep(WAIT_TERMINATING_IN_MILLISECONDS);
|
||||
}
|
||||
} catch (InterruptedException e) {
|
||||
Log.d(TAG, "InterruptedException: ", e);
|
||||
}
|
||||
final UserHistoryDictionary dict =
|
||||
PersonalizationHelper.getUserHistoryDictionary(getContext(),
|
||||
new Locale(testFilenameSuffix));
|
||||
dict.waitAllTasksForTests();
|
||||
}
|
||||
|
||||
public void testRandomWords() {
|
||||
|
Loading…
Reference in New Issue
Block a user