aboutsummaryrefslogtreecommitdiffstats
path: root/tests/src
diff options
context:
space:
mode:
authorKeisuke Kuroyanagi <ksk@google.com>2014-03-07 02:44:39 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-07 02:44:39 -0800
commit7a15267e5815980d2096f7eafeaf144c17c68605 (patch)
tree3f5494bf8a8351ce0c0867ed192eb2996a3ea9fc /tests/src
parentd37cf57a2d349d8bc9315ca0ea3c4e73a8b4f616 (diff)
parent32326a9d7ad07f19dcdd2c0bfb578b2582eb2993 (diff)
downloadlatinime-7a15267e5815980d2096f7eafeaf144c17c68605.tar.gz
latinime-7a15267e5815980d2096f7eafeaf144c17c68605.tar.xz
latinime-7a15267e5815980d2096f7eafeaf144c17c68605.zip
am 32326a9d: Merge "Move DictionaryOptions from FusionDictionary to FormatSpec."
* commit '32326a9d7ad07f19dcdd2c0bfb578b2582eb2993': Move DictionaryOptions from FusionDictionary to FormatSpec.
Diffstat (limited to 'tests/src')
-rw-r--r--tests/src/com/android/inputmethod/latin/FusionDictionaryTests.java3
-rw-r--r--tests/src/com/android/inputmethod/latin/makedict/BinaryDictUtils.java2
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/src/com/android/inputmethod/latin/FusionDictionaryTests.java b/tests/src/com/android/inputmethod/latin/FusionDictionaryTests.java
index cf528d010..09309bcc0 100644
--- a/tests/src/com/android/inputmethod/latin/FusionDictionaryTests.java
+++ b/tests/src/com/android/inputmethod/latin/FusionDictionaryTests.java
@@ -19,6 +19,7 @@ package com.android.inputmethod.latin;
import android.test.AndroidTestCase;
import android.test.suitebuilder.annotation.SmallTest;
+import com.android.inputmethod.latin.makedict.FormatSpec.DictionaryOptions;
import com.android.inputmethod.latin.makedict.FusionDictionary;
import com.android.inputmethod.latin.makedict.ProbabilityInfo;
import com.android.inputmethod.latin.makedict.FusionDictionary.PtNodeArray;
@@ -32,7 +33,7 @@ import java.util.HashMap;
public class FusionDictionaryTests extends AndroidTestCase {
public void testFindWordInTree() {
FusionDictionary dict = new FusionDictionary(new PtNodeArray(),
- new FusionDictionary.DictionaryOptions(new HashMap<String,String>()));
+ new DictionaryOptions(new HashMap<String,String>()));
dict.add("abc", new ProbabilityInfo(10), null, false /* isNotAWord */);
assertNull(FusionDictionary.findWordInTree(dict.mRootNodeArray, "aaa"));
diff --git a/tests/src/com/android/inputmethod/latin/makedict/BinaryDictUtils.java b/tests/src/com/android/inputmethod/latin/makedict/BinaryDictUtils.java
index 79f3e0dc9..5a3eba801 100644
--- a/tests/src/com/android/inputmethod/latin/makedict/BinaryDictUtils.java
+++ b/tests/src/com/android/inputmethod/latin/makedict/BinaryDictUtils.java
@@ -16,8 +16,8 @@
package com.android.inputmethod.latin.makedict;
+import com.android.inputmethod.latin.makedict.FormatSpec.DictionaryOptions;
import com.android.inputmethod.latin.makedict.FormatSpec.FormatOptions;
-import com.android.inputmethod.latin.makedict.FusionDictionary.DictionaryOptions;
import java.io.File;
import java.util.HashMap;