From 52dafe8c321663338ba458f7ad1a08c0c838f156 Mon Sep 17 00:00:00 2001
From: Dan Zivkovic <zivkovic@google.com>
Date: Mon, 16 Mar 2015 14:38:44 -0700
Subject: [PATCH] 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: I8a2f78017fa30f46b5873dcf6a5f478f57af2ebd
---
 .../src/com/android/inputmethod/latin/makedict/FormatSpec.java | 3 +--
 .../com/android/inputmethod/latin/BinaryDictionaryTests.java   | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/java/src/com/android/inputmethod/latin/makedict/FormatSpec.java b/java/src/com/android/inputmethod/latin/makedict/FormatSpec.java
index 32a746d37..288261bf0 100644
--- a/java/src/com/android/inputmethod/latin/makedict/FormatSpec.java
+++ b/java/src/com/android/inputmethod/latin/makedict/FormatSpec.java
@@ -180,11 +180,10 @@ public final class FormatSpec {
     public static final int VERSION402 = 402;
     public static final int VERSION403 = 403;
     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 MAXIMUM_SUPPORTED_STATIC_VERSION = VERSION_DELIGHT3;
     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
     // use it in the reading code.
diff --git a/tests/src/com/android/inputmethod/latin/BinaryDictionaryTests.java b/tests/src/com/android/inputmethod/latin/BinaryDictionaryTests.java
index 752051775..89167f744 100644
--- a/tests/src/com/android/inputmethod/latin/BinaryDictionaryTests.java
+++ b/tests/src/com/android/inputmethod/latin/BinaryDictionaryTests.java
@@ -24,7 +24,6 @@ import android.util.Pair;
 import com.android.inputmethod.latin.NgramContext.WordInfo;
 import com.android.inputmethod.latin.common.CodePointUtils;
 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.FormatSpec;
 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_LOCALE = "test";
     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 boolean supportsNgram(final int formatVersion) {