Don't test format version 403 twice.
BinaryDictionaryTests runs all tests 3 times for 3 format verisons. Cut that number down by 33% to speed things up. Change-Id: I8a2f78017fa30f46b5873dcf6a5f478f57af2ebdmain
parent
f508209f6a
commit
52dafe8c32
|
@ -180,11 +180,10 @@ public final class FormatSpec {
|
||||||
public static final int VERSION402 = 402;
|
public static final int VERSION402 = 402;
|
||||||
public static final int VERSION403 = 403;
|
public static final int VERSION403 = 403;
|
||||||
public static final int VERSION4 = VERSION403;
|
public static final int VERSION4 = VERSION403;
|
||||||
public static final int VERSION4_DEV = VERSION403;
|
|
||||||
public static final int MINIMUM_SUPPORTED_STATIC_VERSION = VERSION202;
|
public static final int MINIMUM_SUPPORTED_STATIC_VERSION = VERSION202;
|
||||||
public static final int MAXIMUM_SUPPORTED_STATIC_VERSION = VERSION_DELIGHT3;
|
public static final int MAXIMUM_SUPPORTED_STATIC_VERSION = VERSION_DELIGHT3;
|
||||||
static final int MINIMUM_SUPPORTED_DYNAMIC_VERSION = VERSION4;
|
static final int MINIMUM_SUPPORTED_DYNAMIC_VERSION = VERSION4;
|
||||||
static final int MAXIMUM_SUPPORTED_DYNAMIC_VERSION = VERSION4_DEV;
|
static final int MAXIMUM_SUPPORTED_DYNAMIC_VERSION = VERSION403;
|
||||||
|
|
||||||
// TODO: Make this value adaptative to content data, store it in the header, and
|
// TODO: Make this value adaptative to content data, store it in the header, and
|
||||||
// use it in the reading code.
|
// use it in the reading code.
|
||||||
|
|
|
@ -24,7 +24,6 @@ import android.util.Pair;
|
||||||
import com.android.inputmethod.latin.NgramContext.WordInfo;
|
import com.android.inputmethod.latin.NgramContext.WordInfo;
|
||||||
import com.android.inputmethod.latin.common.CodePointUtils;
|
import com.android.inputmethod.latin.common.CodePointUtils;
|
||||||
import com.android.inputmethod.latin.common.FileUtils;
|
import com.android.inputmethod.latin.common.FileUtils;
|
||||||
import com.android.inputmethod.latin.define.DecoderSpecificConstants;
|
|
||||||
import com.android.inputmethod.latin.makedict.DictionaryHeader;
|
import com.android.inputmethod.latin.makedict.DictionaryHeader;
|
||||||
import com.android.inputmethod.latin.makedict.FormatSpec;
|
import com.android.inputmethod.latin.makedict.FormatSpec;
|
||||||
import com.android.inputmethod.latin.makedict.WeightedString;
|
import com.android.inputmethod.latin.makedict.WeightedString;
|
||||||
|
@ -44,7 +43,7 @@ public class BinaryDictionaryTests extends AndroidTestCase {
|
||||||
private static final String TEST_DICT_FILE_EXTENSION = ".testDict";
|
private static final String TEST_DICT_FILE_EXTENSION = ".testDict";
|
||||||
private static final String TEST_LOCALE = "test";
|
private static final String TEST_LOCALE = "test";
|
||||||
private static final int[] DICT_FORMAT_VERSIONS =
|
private static final int[] DICT_FORMAT_VERSIONS =
|
||||||
new int[] { FormatSpec.VERSION402, FormatSpec.VERSION403, FormatSpec.VERSION4_DEV };
|
new int[] { FormatSpec.VERSION402, FormatSpec.VERSION403 };
|
||||||
private static final String DICTIONARY_ID = "TestBinaryDictionary";
|
private static final String DICTIONARY_ID = "TestBinaryDictionary";
|
||||||
|
|
||||||
private static boolean supportsNgram(final int formatVersion) {
|
private static boolean supportsNgram(final int formatVersion) {
|
||||||
|
|
Loading…
Reference in New Issue