am 5c057b32: Merge "Fix unit tests."

* commit '5c057b32414fab5f5d8267f8fc8b4230b54d4cca':
  Fix unit tests.
This commit is contained in:
Satoshi Kataoka 2013-08-08 03:17:43 -07:00 committed by Android Git Automerger
commit 4869841560

View file

@ -16,6 +16,7 @@
package com.android.inputmethod.latin.makedict; package com.android.inputmethod.latin.makedict;
import com.android.inputmethod.annotations.UsedForTesting;
import com.android.inputmethod.latin.Constants; import com.android.inputmethod.latin.Constants;
import com.android.inputmethod.latin.makedict.FusionDictionary.DictionaryOptions; import com.android.inputmethod.latin.makedict.FusionDictionary.DictionaryOptions;
@ -236,9 +237,12 @@ public final class FormatSpec {
public static final class FormatOptions { public static final class FormatOptions {
public final int mVersion; public final int mVersion;
public final boolean mSupportsDynamicUpdate; public final boolean mSupportsDynamicUpdate;
@UsedForTesting
public FormatOptions(final int version) { public FormatOptions(final int version) {
this(version, false); this(version, false);
} }
@UsedForTesting
public FormatOptions(final int version, final boolean supportsDynamicUpdate) { public FormatOptions(final int version, final boolean supportsDynamicUpdate) {
mVersion = version; mVersion = version;
if (version < FIRST_VERSION_WITH_DYNAMIC_UPDATE && supportsDynamicUpdate) { if (version < FIRST_VERSION_WITH_DYNAMIC_UPDATE && supportsDynamicUpdate) {