From 77fd5dbf3e432356dd16eb428c740e446c04373e Mon Sep 17 00:00:00 2001
From: Dan Zivkovic <zivkovic@google.com>
Date: Tue, 10 Mar 2015 17:22:41 -0700
Subject: [PATCH] Remove dead code, including tests.
Change-Id: Id88b02b74bdfe4ca05b08181ceb6b34d5652fc0c
---
.../inputmethod/latin/BinaryDictionary.java | 19 +-
.../latin/utils/BinaryDictionaryUtils.java | 1 +
.../keyboard/KeyboardLayoutTest.java | 2 -
.../latin/BinaryDictionaryTests.java | 85 +--
.../BinaryDictDecoderEncoderTests.java | 677 ------------------
.../latin/makedict/BinaryDictUtils.java | 80 ---
.../latin/makedict/Ver2DictEncoderTests.java | 81 ---
.../latin/makedict/Ver4DictEncoder.java | 133 ----
.../utils/BinaryDictionaryUtilsTests.java | 90 ---
9 files changed, 8 insertions(+), 1160 deletions(-)
delete mode 100644 tests/src/com/android/inputmethod/latin/makedict/BinaryDictDecoderEncoderTests.java
delete mode 100644 tests/src/com/android/inputmethod/latin/makedict/BinaryDictUtils.java
delete mode 100644 tests/src/com/android/inputmethod/latin/makedict/Ver2DictEncoderTests.java
delete mode 100644 tests/src/com/android/inputmethod/latin/makedict/Ver4DictEncoder.java
delete mode 100644 tests/src/com/android/inputmethod/latin/utils/BinaryDictionaryUtilsTests.java
diff --git a/java/src/com/android/inputmethod/latin/BinaryDictionary.java b/java/src/com/android/inputmethod/latin/BinaryDictionary.java
index 7ec964d837..6b2b1239cf 100644
--- a/java/src/com/android/inputmethod/latin/BinaryDictionary.java
+++ b/java/src/com/android/inputmethod/latin/BinaryDictionary.java
@@ -216,7 +216,7 @@ public final class BinaryDictionary extends Dictionary {
long newFormatVersion);
// TODO: Move native dict into session
- private final void loadDictionary(final String path, final long startOffset,
+ private void loadDictionary(final String path, final long startOffset,
final long length, final boolean isUpdatable) {
mHasUpdated = false;
mNativeDict = openNative(path, startOffset, length, isUpdatable);
@@ -487,23 +487,6 @@ public final class BinaryDictionary extends Dictionary {
return true;
}
- // Remove an n-gram entry from the binary dictionary in native code.
- public boolean removeNgramEntry(final NgramContext ngramContext, final String word) {
- if (!ngramContext.isValid() || TextUtils.isEmpty(word)) {
- return false;
- }
- final int[][] prevWordCodePointArrays = new int[ngramContext.getPrevWordCount()][];
- final boolean[] isBeginningOfSentenceArray = new boolean[ngramContext.getPrevWordCount()];
- ngramContext.outputToArray(prevWordCodePointArrays, isBeginningOfSentenceArray);
- final int[] wordCodePoints = StringUtils.toCodePointArray(word);
- if (!removeNgramEntryNative(mNativeDict, prevWordCodePointArrays,
- isBeginningOfSentenceArray, wordCodePoints)) {
- return false;
- }
- mHasUpdated = true;
- return true;
- }
-
// Update entries for the word occurrence with the ngramContext.
public boolean updateEntriesForWordWithNgramContext(@Nonnull final NgramContext ngramContext,
final String word, final boolean isValidWord, final int count, final int timestamp) {
diff --git a/java/src/com/android/inputmethod/latin/utils/BinaryDictionaryUtils.java b/java/src/com/android/inputmethod/latin/utils/BinaryDictionaryUtils.java
index 892b967c4b..3bf9c62006 100644
--- a/java/src/com/android/inputmethod/latin/utils/BinaryDictionaryUtils.java
+++ b/java/src/com/android/inputmethod/latin/utils/BinaryDictionaryUtils.java
@@ -40,6 +40,7 @@ public final class BinaryDictionaryUtils {
JniUtils.loadNativeLibrary();
}
+ @UsedForTesting
private static native boolean createEmptyDictFileNative(String filePath, long dictVersion,
String locale, String[] attributeKeyStringArray, String[] attributeValueStringArray);
private static native float calcNormalizedScoreNative(int[] before, int[] after, int score);
diff --git a/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutTest.java b/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutTest.java
index 733bf96e28..1e1f82fc0e 100644
--- a/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutTest.java
+++ b/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutTest.java
@@ -27,8 +27,6 @@ import org.junit.Test;
@SmallTest
public class KeyboardLayoutTest {
- private KeyboardLayout mKeyboardLayout;
-
@Test
public void testNewKeyboardLayout() {
KeyboardLayout keyboardLayout = KeyboardLayout
diff --git a/tests/src/com/android/inputmethod/latin/BinaryDictionaryTests.java b/tests/src/com/android/inputmethod/latin/BinaryDictionaryTests.java
index 1618798411..7eccd4d5f0 100644
--- a/tests/src/com/android/inputmethod/latin/BinaryDictionaryTests.java
+++ b/tests/src/com/android/inputmethod/latin/BinaryDictionaryTests.java
@@ -39,7 +39,6 @@ import java.util.HashSet;
import java.util.Locale;
import java.util.Random;
-// TODO Use the seed passed as an argument for makedict test.
@LargeTest
public class BinaryDictionaryTests extends AndroidTestCase {
private static final String TEST_DICT_FILE_EXTENSION = ".testDict";
@@ -214,10 +213,9 @@ public class BinaryDictionaryTests extends AndroidTestCase {
private static void addTrigramEntry(final BinaryDictionary binaryDictionary, final String word0,
final String word1, final String word2, final int probability) {
- final NgramContext ngramContext =
- new NgramContext(new WordInfo[] { new WordInfo(word1), new WordInfo(word0) } );
- binaryDictionary.addNgramEntry(ngramContext, word2, probability,
- BinaryDictionary.NOT_A_VALID_TIMESTAMP /* timestamp */);
+ binaryDictionary.addNgramEntry(
+ new NgramContext(new WordInfo(word1), new WordInfo(word0)), word2,
+ probability, BinaryDictionary.NOT_A_VALID_TIMESTAMP /* timestamp */);
}
private static boolean isValidBigram(final BinaryDictionary binaryDictionary,
@@ -225,18 +223,6 @@ public class BinaryDictionaryTests extends AndroidTestCase {
return binaryDictionary.isValidNgram(new NgramContext(new WordInfo(word0)), word1);
}
- private static void removeBigramEntry(final BinaryDictionary binaryDictionary,
- final String word0, final String word1) {
- binaryDictionary.removeNgramEntry(new NgramContext(new WordInfo(word0)), word1);
- }
-
- private static void removeTrigramEntry(final BinaryDictionary binaryDictionary,
- final String word0, final String word1, final String word2) {
- final NgramContext ngramContext =
- new NgramContext(new WordInfo[] { new WordInfo(word1), new WordInfo(word0) } );
- binaryDictionary.removeNgramEntry(ngramContext, word2);
- }
-
private static int getBigramProbability(final BinaryDictionary binaryDictionary,
final String word0, final String word1) {
return binaryDictionary.getNgramProbability(new NgramContext(new WordInfo(word0)), word1);
@@ -244,9 +230,8 @@ public class BinaryDictionaryTests extends AndroidTestCase {
private static int getTrigramProbability(final BinaryDictionary binaryDictionary,
final String word0, final String word1, final String word2) {
- final NgramContext ngramContext =
- new NgramContext(new WordInfo[] { new WordInfo(word1), new WordInfo(word0) } );
- return binaryDictionary.getNgramProbability(ngramContext, word2);
+ return binaryDictionary.getNgramProbability(
+ new NgramContext(new WordInfo(word1), new WordInfo(word0)), word2);
}
public void testAddUnigramWord() {
@@ -421,48 +406,6 @@ public class BinaryDictionaryTests extends AndroidTestCase {
}
}
- public void testRemoveBigramWords() {
- for (final int formatVersion : DICT_FORMAT_VERSIONS) {
- testRemoveBigramWords(formatVersion);
- }
- }
-
- private void testRemoveBigramWords(final int formatVersion) {
- final BinaryDictionary binaryDictionary = getEmptyBinaryDictionary(formatVersion);
- final int unigramProbability = 100;
- final int bigramProbability = 150;
- addUnigramWord(binaryDictionary, "aaa", unigramProbability);
- addUnigramWord(binaryDictionary, "abb", unigramProbability);
- addUnigramWord(binaryDictionary, "bcc", unigramProbability);
- addBigramWords(binaryDictionary, "aaa", "abb", bigramProbability);
- addBigramWords(binaryDictionary, "aaa", "bcc", bigramProbability);
- addBigramWords(binaryDictionary, "abb", "aaa", bigramProbability);
- addBigramWords(binaryDictionary, "abb", "bcc", bigramProbability);
-
- assertTrue(isValidBigram(binaryDictionary, "aaa", "abb"));
- assertTrue(isValidBigram(binaryDictionary, "aaa", "bcc"));
- assertTrue(isValidBigram(binaryDictionary, "abb", "aaa"));
- assertTrue(isValidBigram(binaryDictionary, "abb", "bcc"));
-
- removeBigramEntry(binaryDictionary, "aaa", "abb");
- assertFalse(isValidBigram(binaryDictionary, "aaa", "abb"));
- addBigramWords(binaryDictionary, "aaa", "abb", bigramProbability);
- assertTrue(isValidBigram(binaryDictionary, "aaa", "abb"));
-
-
- removeBigramEntry(binaryDictionary, "aaa", "bcc");
- assertFalse(isValidBigram(binaryDictionary, "aaa", "bcc"));
- removeBigramEntry(binaryDictionary, "abb", "aaa");
- assertFalse(isValidBigram(binaryDictionary, "abb", "aaa"));
- removeBigramEntry(binaryDictionary, "abb", "bcc");
- assertFalse(isValidBigram(binaryDictionary, "abb", "bcc"));
-
- removeBigramEntry(binaryDictionary, "aaa", "abb");
- // Test remove non-existing bigram operation.
- removeBigramEntry(binaryDictionary, "aaa", "abb");
- removeBigramEntry(binaryDictionary, "bcc", "aaa");
- }
-
public void testAddTrigramWords() {
for (final int formatVersion : DICT_FORMAT_VERSIONS) {
if (supportsNgram(formatVersion)) {
@@ -495,11 +438,6 @@ public class BinaryDictionaryTests extends AndroidTestCase {
addTrigramEntry(binaryDictionary, "bcc", "abb", "aaa", updatedTrigramProbability);
assertEquals(updatedTrigramProbability,
getTrigramProbability(binaryDictionary, "bcc", "abb", "aaa"));
-
- removeTrigramEntry(binaryDictionary, "aaa", "abb", "bcc");
- assertEquals(Dictionary.NOT_A_PROBABILITY,
- getTrigramProbability(binaryDictionary, "aaa", "abb", "bcc"));
- assertTrue(isValidBigram(binaryDictionary, "abb", "bcc"));
}
public void testFlushDictionary() {
@@ -655,7 +593,6 @@ public class BinaryDictionaryTests extends AndroidTestCase {
final int initialUnigramCount = 100;
final float addUnigramProb = 0.5f;
final float addBigramProb = 0.8f;
- final float removeBigramProb = 0.2f;
final int codePointSetSize = 30;
final long seed = System.currentTimeMillis();
@@ -710,14 +647,6 @@ public class BinaryDictionaryTests extends AndroidTestCase {
bigramProbabilities.put(bigram, bigramProbability);
addBigramWords(binaryDictionary, word0, word1, bigramProbability);
}
- // Remove bigram.
- if (random.nextFloat() < removeBigramProb && !bigramWords.isEmpty()) {
- final int bigramIndex = random.nextInt(bigramWords.size());
- final Pair<String, String> bigram = bigramWords.get(bigramIndex);
- bigramWords.remove(bigramIndex);
- bigramProbabilities.remove(bigram);
- removeBigramEntry(binaryDictionary, bigram.first, bigram.second);
- }
}
// Test whether the all unigram operations are collectlly handled.
@@ -731,8 +660,7 @@ public class BinaryDictionaryTests extends AndroidTestCase {
final Pair<String, String> bigram = bigramWords.get(i);
final int probability;
if (bigramProbabilities.containsKey(bigram)) {
- final int bigramProbability = bigramProbabilities.get(bigram);
- probability = bigramProbability;
+ probability = bigramProbabilities.get(bigram);
} else {
probability = Dictionary.NOT_A_PROBABILITY;
}
@@ -1051,7 +979,6 @@ public class BinaryDictionaryTests extends AndroidTestCase {
addUnigramWord(binaryDictionary, "bbb", unigramProbability);
final int bigramProbability = 150;
addBigramWords(binaryDictionary, "aaa", "bbb", bigramProbability);
- final int shortcutProbability = 10;
binaryDictionary.addUnigramEntry("ccc", unigramProbability,
false /* isBeginningOfSentence */, false /* isNotAWord */,
false /* isPossiblyOffensive */, 0 /* timestamp */);
diff --git a/tests/src/com/android/inputmethod/latin/makedict/BinaryDictDecoderEncoderTests.java b/tests/src/com/android/inputmethod/latin/makedict/BinaryDictDecoderEncoderTests.java
deleted file mode 100644
index 39da9fcd6b..0000000000
--- a/tests/src/com/android/inputmethod/latin/makedict/BinaryDictDecoderEncoderTests.java
+++ /dev/null
@@ -1,677 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.inputmethod.latin.makedict;
-
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.LargeTest;
-import android.util.Log;
-import android.util.Pair;
-import android.util.SparseArray;
-
-import com.android.inputmethod.latin.BinaryDictionary;
-import com.android.inputmethod.latin.common.CodePointUtils;
-import com.android.inputmethod.latin.makedict.BinaryDictDecoderUtils.CharEncoding;
-import com.android.inputmethod.latin.makedict.BinaryDictDecoderUtils.DictBuffer;
-import com.android.inputmethod.latin.makedict.FormatSpec.FormatOptions;
-import com.android.inputmethod.latin.makedict.FusionDictionary.PtNode;
-import com.android.inputmethod.latin.makedict.FusionDictionary.PtNodeArray;
-import com.android.inputmethod.latin.utils.BinaryDictionaryUtils;
-import com.android.inputmethod.latin.utils.ByteArrayDictBuffer;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map.Entry;
-import java.util.Random;
-import java.util.Set;
-import java.util.TreeMap;
-
-/**
- * Unit tests for BinaryDictDecoderUtils and BinaryDictEncoderUtils.
- */
-@LargeTest
-public class BinaryDictDecoderEncoderTests extends AndroidTestCase {
- private static final String TAG = BinaryDictDecoderEncoderTests.class.getSimpleName();
- private static final int DEFAULT_MAX_UNIGRAMS = 300;
- private static final int DEFAULT_CODE_POINT_SET_SIZE = 50;
- private static final int LARGE_CODE_POINT_SET_SIZE = 300;
- private static final int UNIGRAM_FREQ = 10;
- private static final int BIGRAM_FREQ = 50;
- private static final int TOLERANCE_OF_BIGRAM_FREQ = 5;
-
- private static final ArrayList<String> sWords = new ArrayList<>();
- private static final ArrayList<String> sWordsWithVariousCodePoints = new ArrayList<>();
- private static final SparseArray<List<Integer>> sEmptyBigrams = new SparseArray<>();
- private static final SparseArray<List<Integer>> sStarBigrams = new SparseArray<>();
- private static final SparseArray<List<Integer>> sChainBigrams = new SparseArray<>();
-
- final Random mRandom;
-
- public BinaryDictDecoderEncoderTests() {
- this(System.currentTimeMillis(), DEFAULT_MAX_UNIGRAMS);
- }
-
- public BinaryDictDecoderEncoderTests(final long seed, final int maxUnigrams) {
- super();
- BinaryDictionaryUtils.setCurrentTimeForTest(0);
- Log.e(TAG, "Testing dictionary: seed is " + seed);
- mRandom = new Random(seed);
- sWords.clear();
- sWordsWithVariousCodePoints.clear();
- generateWords(maxUnigrams, mRandom);
-
- for (int i = 0; i < sWords.size(); ++i) {
- sChainBigrams.put(i, new ArrayList<Integer>());
- if (i > 0) {
- sChainBigrams.get(i - 1).add(i);
- }
- }
-
- sStarBigrams.put(0, new ArrayList<Integer>());
- // MAX - 1 because we added one above already
- final int maxBigrams = Math.min(sWords.size(), FormatSpec.MAX_BIGRAMS_IN_A_PTNODE - 1);
- for (int i = 1; i < maxBigrams; ++i) {
- sStarBigrams.get(0).add(i);
- }
- }
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- BinaryDictionaryUtils.setCurrentTimeForTest(0);
- }
-
- @Override
- protected void tearDown() throws Exception {
- // Quit test mode.
- BinaryDictionaryUtils.setCurrentTimeForTest(-1);
- super.tearDown();
- }
-
- private static void generateWords(final int number, final Random random) {
- final int[] codePointSet = CodePointUtils.generateCodePointSet(DEFAULT_CODE_POINT_SET_SIZE,
- random);
- final Set<String> wordSet = new HashSet<>();
- while (wordSet.size() < number) {
- wordSet.add(CodePointUtils.generateWord(random, codePointSet));
- }
- sWords.addAll(wordSet);
-
- final int[] largeCodePointSet = CodePointUtils.generateCodePointSet(
- LARGE_CODE_POINT_SET_SIZE, random);
- wordSet.clear();
- while (wordSet.size() < number) {
- wordSet.add(CodePointUtils.generateWord(random, largeCodePointSet));
- }
- sWordsWithVariousCodePoints.addAll(wordSet);
- }
-
- /**
- * Adds unigrams to the dictionary.
- */
- private static void addUnigrams(final int number, final FusionDictionary dict,
- final List<String> words) {
- for (int i = 0; i < number; ++i) {
- final String word = words.get(i);
- final ArrayList<WeightedString> shortcuts = new ArrayList<>();
- dict.add(word, new ProbabilityInfo(UNIGRAM_FREQ), false /* isNotAWord */,
- false /* isPossiblyOffensive */);
- }
- }
-
- private static void addBigrams(final FusionDictionary dict,
- final List<String> words,
- final SparseArray<List<Integer>> bigrams) {
- for (int i = 0; i < bigrams.size(); ++i) {
- final int w1 = bigrams.keyAt(i);
- for (int w2 : bigrams.valueAt(i)) {
- dict.setBigram(words.get(w1), words.get(w2), new ProbabilityInfo(BIGRAM_FREQ));
- }
- }
- }
-
-// The following is useful to dump the dictionary into a textual file, but it can't compile
-// on-device, so it's commented out.
-// private void dumpToCombinedFileForDebug(final FusionDictionary dict, final String filename)
-// throws IOException {
-// com.android.inputmethod.latin.dicttool.CombinedInputOutput.writeDictionaryCombined(
-// new java.io.FileWriter(new File(filename)), dict);
-// }
-
- private static long timeWritingDictToFile(final File file, final FusionDictionary dict,
- final FormatSpec.FormatOptions formatOptions) {
-
- long now = -1, diff = -1;
-
- try {
- final DictEncoder dictEncoder = BinaryDictUtils.getDictEncoder(file, formatOptions);
-
- now = System.currentTimeMillis();
- // If you need to dump the dict to a textual file, uncomment the line below and the
- // function above
- // dumpToCombinedFileForDebug(file, "/tmp/foo");
- dictEncoder.writeDictionary(dict, formatOptions);
- diff = System.currentTimeMillis() - now;
- } catch (IOException e) {
- Log.e(TAG, "IO exception while writing file", e);
- } catch (UnsupportedFormatException e) {
- Log.e(TAG, "UnsupportedFormatException", e);
- }
-
- return diff;
- }
-
- private static void checkDictionary(final FusionDictionary dict, final List<String> words,
- final SparseArray<List<Integer>> bigrams) {
- assertNotNull(dict);
-
- // check unigram
- for (final String word : words) {
- final PtNode ptNode = FusionDictionary.findWordInTree(dict.mRootNodeArray, word);
- assertNotNull(ptNode);
- }
-
- // check bigram
- for (int i = 0; i < bigrams.size(); ++i) {
- final int w1 = bigrams.keyAt(i);
- for (final int w2 : bigrams.valueAt(i)) {
- final PtNode ptNode = FusionDictionary.findWordInTree(dict.mRootNodeArray,
- words.get(w1));
- assertNotNull(words.get(w1) + "," + words.get(w2), ptNode.getBigram(words.get(w2)));
- }
- }
- }
-
- private static String outputOptions(final int bufferType,
- final FormatSpec.FormatOptions formatOptions) {
- final String result = " : buffer type = "
- + ((bufferType == BinaryDictUtils.USE_BYTE_BUFFER) ? "byte buffer" : "byte array");
- return result + " : version = " + formatOptions.mVersion;
- }
-
- // Tests for readDictionaryBinary and writeDictionaryBinary
-
- private static long timeReadingAndCheckDict(final File file, final List<String> words,
- final SparseArray<List<Integer>> bigrams, final int bufferType) {
- long now, diff = -1;
-
- FusionDictionary dict = null;
- try {
- final DictDecoder dictDecoder = BinaryDictIOUtils.getDictDecoder(file, 0, file.length(),
- bufferType);
- now = System.currentTimeMillis();
- dict = dictDecoder.readDictionaryBinary(false /* deleteDictIfBroken */);
- diff = System.currentTimeMillis() - now;
- } catch (IOException e) {
- Log.e(TAG, "IOException while reading dictionary", e);
- } catch (UnsupportedFormatException e) {
- Log.e(TAG, "Unsupported format", e);
- }
-
- checkDictionary(dict, words, bigrams);
- return diff;
- }
-
- // Tests for readDictionaryBinary and writeDictionaryBinary
- private String runReadAndWrite(final List<String> words,
- final SparseArray<List<Integer>> bigrams,
- final int bufferType, final FormatSpec.FormatOptions formatOptions,
- final String message) {
-
- final String dictName = "runReadAndWrite";
- final String dictVersion = Long.toString(System.currentTimeMillis());
- final File file = BinaryDictUtils.getDictFile(dictName, dictVersion, formatOptions,
- getContext().getCacheDir());
-
- final FusionDictionary dict = new FusionDictionary(new PtNodeArray(),
- BinaryDictUtils.makeDictionaryOptions(dictName, dictVersion, formatOptions));
- addUnigrams(words.size(), dict, words);
- addBigrams(dict, words, bigrams);
- checkDictionary(dict, words, bigrams);
-
- final long write = timeWritingDictToFile(file, dict, formatOptions);
- final long read = timeReadingAndCheckDict(file, words, bigrams, bufferType);
-
- return "PROF: read=" + read + "ms, write=" + write + "ms :" + message
- + " : " + outputOptions(bufferType, formatOptions);
- }
-
- private void runReadAndWriteTests(final List<String> results, final int bufferType,
- final FormatSpec.FormatOptions formatOptions) {
- results.add(runReadAndWrite(sWords, sEmptyBigrams, bufferType,
- formatOptions, "unigram"));
- results.add(runReadAndWrite(sWords, sChainBigrams, bufferType,
- formatOptions, "chain"));
- results.add(runReadAndWrite(sWords, sStarBigrams, bufferType,
- formatOptions, "star"));
- results.add(runReadAndWrite(sWords, sEmptyBigrams, bufferType, formatOptions,
- "unigram with shortcuts"));
- results.add(runReadAndWrite(sWords, sChainBigrams, bufferType, formatOptions,
- "chain with shortcuts"));
- results.add(runReadAndWrite(sWords, sStarBigrams, bufferType, formatOptions,
- "star with shortcuts"));
- results.add(runReadAndWrite(sWordsWithVariousCodePoints, sEmptyBigrams,
- bufferType, formatOptions,
- "unigram with various code points"));
- }
-
- public void testCharacterTableIsPresent() throws IOException, UnsupportedFormatException {
- final String[] wordSource = {"words", "used", "for", "testing", "a", "code point", "table"};
- final List<String> words = Arrays.asList(wordSource);
- final String correctCodePointTable = "toesdrniawuplgfcb ";
- final String dictName = "codePointTableTest";
- final String dictVersion = Long.toString(System.currentTimeMillis());
- final String codePointTableAttribute = DictionaryHeader.CODE_POINT_TABLE_KEY;
- final File file = BinaryDictUtils.getDictFile(dictName, dictVersion,
- BinaryDictUtils.STATIC_OPTIONS, getContext().getCacheDir());
-
- // Write a test dictionary
- final DictEncoder dictEncoder = new Ver2DictEncoder(file,
- Ver2DictEncoder.CODE_POINT_TABLE_ON);
- final FormatSpec.FormatOptions formatOptions =
- new FormatSpec.FormatOptions(
- FormatSpec.MINIMUM_SUPPORTED_STATIC_VERSION);
- final FusionDictionary sourcedict = new FusionDictionary(new PtNodeArray(),
- BinaryDictUtils.makeDictionaryOptions(dictName, dictVersion, formatOptions));
- addUnigrams(words.size(), sourcedict, words);
- dictEncoder.writeDictionary(sourcedict, formatOptions);
-
- // Read the dictionary
- final DictDecoder dictDecoder = BinaryDictIOUtils.getDictDecoder(file, 0, file.length(),
- DictDecoder.USE_BYTEARRAY);
- final DictionaryHeader fileHeader = dictDecoder.readHeader();
- // Check if codePointTable is present
- assertTrue("codePointTable is not present",
- fileHeader.mDictionaryOptions.mAttributes.containsKey(codePointTableAttribute));
- final String codePointTable =
- fileHeader.mDictionaryOptions.mAttributes.get(codePointTableAttribute);
- // Check if codePointTable is correct
- assertEquals("codePointTable is incorrect", codePointTable, correctCodePointTable);
- }
-
- // Unit test for CharEncoding.readString and CharEncoding.writeString.
- public void testCharEncoding() {
- // the max length of a word in sWords is less than 50.
- // See generateWords.
- final byte[] buffer = new byte[50 * 3];
- final DictBuffer dictBuffer = new ByteArrayDictBuffer(buffer);
- for (final String word : sWords) {
- Arrays.fill(buffer, (byte) 0);
- CharEncoding.writeString(buffer, 0, word, null);
- dictBuffer.position(0);
- final String str = CharEncoding.readString(dictBuffer);
- assertEquals(word, str);
- }
- }
-
- public void testReadAndWriteWithByteBuffer() {
- final List<String> results = new ArrayList<>();
-
- runReadAndWriteTests(results, BinaryDictUtils.USE_BYTE_BUFFER,
- BinaryDictUtils.STATIC_OPTIONS);
- runReadAndWriteTests(results, BinaryDictUtils.USE_BYTE_BUFFER,
- BinaryDictUtils.DYNAMIC_OPTIONS_WITHOUT_TIMESTAMP);
- runReadAndWriteTests(results, BinaryDictUtils.USE_BYTE_BUFFER,
- BinaryDictUtils.DYNAMIC_OPTIONS_WITH_TIMESTAMP);
- for (final String result : results) {
- Log.d(TAG, result);
- }
- }
-
- public void testReadAndWriteWithByteArray() {
- final List<String> results = new ArrayList<>();
-
- runReadAndWriteTests(results, BinaryDictUtils.USE_BYTE_ARRAY,
- BinaryDictUtils.STATIC_OPTIONS);
- runReadAndWriteTests(results, BinaryDictUtils.USE_BYTE_ARRAY,
- BinaryDictUtils.DYNAMIC_OPTIONS_WITHOUT_TIMESTAMP);
- runReadAndWriteTests(results, BinaryDictUtils.USE_BYTE_ARRAY,
- BinaryDictUtils.DYNAMIC_OPTIONS_WITH_TIMESTAMP);
-
- for (final String result : results) {
- Log.d(TAG, result);
- }
- }
-
- // Tests for readUnigramsAndBigramsBinary
-
- private static void checkWordMap(final List<String> expectedWords,
- final SparseArray<List<Integer>> expectedBigrams,
- final TreeMap<Integer, String> resultWords,
- final TreeMap<Integer, Integer> resultFrequencies,
- final TreeMap<Integer, ArrayList<PendingAttribute>> resultBigrams,
- final boolean checkProbability) {
- // check unigrams
- final Set<String> actualWordsSet = new HashSet<>(resultWords.values());
- final Set<String> expectedWordsSet = new HashSet<>(expectedWords);
- assertEquals(actualWordsSet, expectedWordsSet);
- if (checkProbability) {
- for (int freq : resultFrequencies.values()) {
- assertEquals(freq, UNIGRAM_FREQ);
- }
- }
-
- // check bigrams
- final HashMap<String, Set<String>> expBigrams = new HashMap<>();
- for (int i = 0; i < expectedBigrams.size(); ++i) {
- final String word1 = expectedWords.get(expectedBigrams.keyAt(i));
- for (int w2 : expectedBigrams.valueAt(i)) {
- if (expBigrams.get(word1) == null) {
- expBigrams.put(word1, new HashSet<String>());
- }
- expBigrams.get(word1).add(expectedWords.get(w2));
- }
- }
-
- final HashMap<String, Set<String>> actBigrams = new HashMap<>();
- for (Entry<Integer, ArrayList<PendingAttribute>> entry : resultBigrams.entrySet()) {
- final String word1 = resultWords.get(entry.getKey());
- final int unigramFreq = resultFrequencies.get(entry.getKey());
- for (PendingAttribute attr : entry.getValue()) {
- final String word2 = resultWords.get(attr.mAddress);
- if (actBigrams.get(word1) == null) {
- actBigrams.put(word1, new HashSet<String>());
- }
- actBigrams.get(word1).add(word2);
-
- if (checkProbability) {
- final int bigramFreq = BinaryDictIOUtils.reconstructBigramFrequency(
- unigramFreq, attr.mFrequency);
- assertTrue(Math.abs(bigramFreq - BIGRAM_FREQ) < TOLERANCE_OF_BIGRAM_FREQ);
- }
- }
- }
- assertEquals(actBigrams, expBigrams);
- }
-
- private static long timeAndCheckReadUnigramsAndBigramsBinary(final File file,
- final List<String> words, final SparseArray<List<Integer>> bigrams,
- final int bufferType, final boolean checkProbability) {
- final TreeMap<Integer, String> resultWords = new TreeMap<>();
- final TreeMap<Integer, ArrayList<PendingAttribute>> resultBigrams = new TreeMap<>();
- final TreeMap<Integer, Integer> resultFreqs = new TreeMap<>();
-
- long now = -1, diff = -1;
- try {
- final DictDecoder dictDecoder = BinaryDictIOUtils.getDictDecoder(file, 0, file.length(),
- bufferType);
- now = System.currentTimeMillis();
- dictDecoder.readUnigramsAndBigramsBinary(resultWords, resultFreqs, resultBigrams);
- diff = System.currentTimeMillis() - now;
- } catch (IOException e) {
- Log.e(TAG, "IOException", e);
- } catch (UnsupportedFormatException e) {
- Log.e(TAG, "UnsupportedFormatException", e);
- }
-
- checkWordMap(words, bigrams, resultWords, resultFreqs, resultBigrams, checkProbability);
- return diff;
- }
-
- private String runReadUnigramsAndBigramsBinary(final ArrayList<String> words,
- final SparseArray<List<Integer>> bigrams, final int bufferType,
- final FormatSpec.FormatOptions formatOptions, final String message) {
- final String dictName = "runReadUnigrams";
- final String dictVersion = Long.toString(System.currentTimeMillis());
- final File file = BinaryDictUtils.getDictFile(dictName, dictVersion, formatOptions,
- getContext().getCacheDir());
-
- // making the dictionary from lists of words.
- final FusionDictionary dict = new FusionDictionary(new PtNodeArray(),
- BinaryDictUtils.makeDictionaryOptions(dictName, dictVersion, formatOptions));
- addUnigrams(words.size(), dict, words);
- addBigrams(dict, words, bigrams);
-
- timeWritingDictToFile(file, dict, formatOptions);
-
- // Caveat: Currently, the Java code to read a v4 dictionary doesn't calculate the
- // probability when there's a timestamp for the entry.
- // TODO: Abandon the Java code, and implement the v4 dictionary reading code in native.
- long wordMap = timeAndCheckReadUnigramsAndBigramsBinary(file, words, bigrams, bufferType,
- !formatOptions.mHasTimestamp /* checkProbability */);
- long fullReading = timeReadingAndCheckDict(file, words, bigrams,
- bufferType);
-
- return "readDictionaryBinary=" + fullReading + ", readUnigramsAndBigramsBinary=" + wordMap
- + " : " + message + " : " + outputOptions(bufferType, formatOptions);
- }
-
- private void runReadUnigramsAndBigramsTests(final ArrayList<String> results,
- final int bufferType, final FormatSpec.FormatOptions formatOptions) {
- results.add(runReadUnigramsAndBigramsBinary(sWords, sEmptyBigrams, bufferType,
- formatOptions, "unigram"));
- results.add(runReadUnigramsAndBigramsBinary(sWords, sChainBigrams, bufferType,
- formatOptions, "chain"));
- results.add(runReadUnigramsAndBigramsBinary(sWords, sStarBigrams, bufferType,
- formatOptions, "star"));
- }
-
- public void testReadUnigramsAndBigramsBinaryWithByteBuffer() {
- final ArrayList<String> results = new ArrayList<>();
-
- runReadUnigramsAndBigramsTests(results, BinaryDictUtils.USE_BYTE_BUFFER,
- BinaryDictUtils.STATIC_OPTIONS);
-
- for (final String result : results) {
- Log.d(TAG, result);
- }
- }
-
- public void testReadUnigramsAndBigramsBinaryWithByteArray() {
- final ArrayList<String> results = new ArrayList<>();
-
- runReadUnigramsAndBigramsTests(results, BinaryDictUtils.USE_BYTE_ARRAY,
- BinaryDictUtils.STATIC_OPTIONS);
-
- for (final String result : results) {
- Log.d(TAG, result);
- }
- }
-
- // Tests for getTerminalPosition
- private static String getWordFromBinary(final DictDecoder dictDecoder, final int address) {
- if (dictDecoder.getPosition() != 0) dictDecoder.setPosition(0);
-
- DictionaryHeader fileHeader = null;
- try {
- fileHeader = dictDecoder.readHeader();
- } catch (IOException e) {
- return null;
- } catch (UnsupportedFormatException e) {
- return null;
- }
- if (fileHeader == null) return null;
- return BinaryDictDecoderUtils.getWordAtPosition(dictDecoder, fileHeader.mBodyOffset,
- address).mWord;
- }
-
- private static long checkGetTerminalPosition(final DictDecoder dictDecoder, final String word,
- final boolean contained) {
- long diff = -1;
- int position = -1;
- try {
- final long now = System.nanoTime();
- position = dictDecoder.getTerminalPosition(word);
- diff = System.nanoTime() - now;
- } catch (IOException e) {
- Log.e(TAG, "IOException while getTerminalPosition", e);
- } catch (UnsupportedFormatException e) {
- Log.e(TAG, "UnsupportedFormatException while getTerminalPosition", e);
- }
-
- assertEquals(FormatSpec.NOT_VALID_WORD != position, contained);
- if (contained) assertEquals(getWordFromBinary(dictDecoder, position), word);
- return diff;
- }
-
- private void runGetTerminalPosition(final ArrayList<String> words,
- final SparseArray<List<Integer>> bigrams, final int bufferType,
- final FormatOptions formatOptions, final String message) {
- final String dictName = "testGetTerminalPosition";
- final String dictVersion = Long.toString(System.currentTimeMillis());
- final File file = BinaryDictUtils.getDictFile(dictName, dictVersion, formatOptions,
- getContext().getCacheDir());
-
- final FusionDictionary dict = new FusionDictionary(new PtNodeArray(),
- BinaryDictUtils.makeDictionaryOptions(dictName, dictVersion, formatOptions));
- addUnigrams(sWords.size(), dict, sWords);
- addBigrams(dict, words, bigrams);
- timeWritingDictToFile(file, dict, formatOptions);
-
- final DictDecoder dictDecoder = BinaryDictIOUtils.getDictDecoder(file, 0, file.length(),
- DictDecoder.USE_BYTEARRAY);
- try {
- dictDecoder.openDictBuffer();
- } catch (IOException e) {
- Log.e(TAG, "IOException while opening the buffer", e);
- } catch (UnsupportedFormatException e) {
- Log.e(TAG, "IOException while opening the buffer", e);
- }
- assertTrue("Can't get the buffer", dictDecoder.isDictBufferOpen());
-
- try {
- // too long word
- final String longWord = "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz";
- assertEquals(FormatSpec.NOT_VALID_WORD, dictDecoder.getTerminalPosition(longWord));
-
- // null
- assertEquals(FormatSpec.NOT_VALID_WORD, dictDecoder.getTerminalPosition(null));
-
- // empty string
- assertEquals(FormatSpec.NOT_VALID_WORD, dictDecoder.getTerminalPosition(""));
- } catch (IOException e) {
- } catch (UnsupportedFormatException e) {
- }
-
- // Test a word that is contained within the dictionary.
- long sum = 0;
- for (int i = 0; i < sWords.size(); ++i) {
- final long time = checkGetTerminalPosition(dictDecoder, sWords.get(i), true);
- sum += time == -1 ? 0 : time;
- }
- Log.d(TAG, "per search : " + (((double)sum) / sWords.size() / 1000000) + " : " + message
- + " : " + outputOptions(bufferType, formatOptions));
-
- // Test a word that isn't contained within the dictionary.
- final int[] codePointSet = CodePointUtils.generateCodePointSet(DEFAULT_CODE_POINT_SET_SIZE,
- mRandom);
- for (int i = 0; i < 1000; ++i) {
- final String word = CodePointUtils.generateWord(mRandom, codePointSet);
- if (sWords.indexOf(word) != -1) continue;
- checkGetTerminalPosition(dictDecoder, word, false);
- }
- }
-
- private void runGetTerminalPositionTests(final int bufferType,
- final FormatOptions formatOptions) {
- runGetTerminalPosition(sWords, sEmptyBigrams, bufferType, formatOptions, "unigram");
- }
-
- public void testGetTerminalPosition() {
- final ArrayList<String> results = new ArrayList<>();
-
- runGetTerminalPositionTests(BinaryDictUtils.USE_BYTE_ARRAY,
- BinaryDictUtils.STATIC_OPTIONS);
- runGetTerminalPositionTests(BinaryDictUtils.USE_BYTE_BUFFER,
- BinaryDictUtils.STATIC_OPTIONS);
-
- for (final String result : results) {
- Log.d(TAG, result);
- }
- }
-
- public void testVer2DictGetWordProperty() {
- final FormatOptions formatOptions = BinaryDictUtils.STATIC_OPTIONS;
- final ArrayList<String> words = sWords;
- final String dictName = "testGetWordProperty";
- final String dictVersion = Long.toString(System.currentTimeMillis());
- final FusionDictionary dict = new FusionDictionary(new PtNodeArray(),
- BinaryDictUtils.makeDictionaryOptions(dictName, dictVersion, formatOptions));
- addUnigrams(words.size(), dict, words);
- addBigrams(dict, words, sEmptyBigrams);
- final File file = BinaryDictUtils.getDictFile(dictName, dictVersion, formatOptions,
- getContext().getCacheDir());
- file.delete();
- timeWritingDictToFile(file, dict, formatOptions);
- final BinaryDictionary binaryDictionary = new BinaryDictionary(file.getAbsolutePath(),
- 0 /* offset */, file.length(), true /* useFullEditDistance */,
- Locale.ENGLISH, dictName, false /* isUpdatable */);
- for (final String word : words) {
- final WordProperty wordProperty = binaryDictionary.getWordProperty(word,
- false /* isBeginningOfSentence */);
- assertEquals(word, wordProperty.mWord);
- assertEquals(UNIGRAM_FREQ, wordProperty.getProbability());
- }
- }
-
- public void testVer2DictIteration() {
- final FormatOptions formatOptions = BinaryDictUtils.STATIC_OPTIONS;
- final ArrayList<String> words = sWords;
- final SparseArray<List<Integer>> bigrams = sEmptyBigrams;
- final String dictName = "testGetWordProperty";
- final String dictVersion = Long.toString(System.currentTimeMillis());
- final FusionDictionary dict = new FusionDictionary(new PtNodeArray(),
- BinaryDictUtils.makeDictionaryOptions(dictName, dictVersion, formatOptions));
- addUnigrams(words.size(), dict, words);
- addBigrams(dict, words, bigrams);
- final File file = BinaryDictUtils.getDictFile(dictName, dictVersion, formatOptions,
- getContext().getCacheDir());
- timeWritingDictToFile(file, dict, formatOptions);
- Log.d(TAG, file.getAbsolutePath());
- final BinaryDictionary binaryDictionary = new BinaryDictionary(file.getAbsolutePath(),
- 0 /* offset */, file.length(), true /* useFullEditDistance */,
- Locale.ENGLISH, dictName, false /* isUpdatable */);
-
- final HashSet<String> wordSet = new HashSet<>(words);
- final HashSet<Pair<String, String>> bigramSet = new HashSet<>();
-
- for (int i = 0; i < words.size(); i++) {
- final List<Integer> bigramList = bigrams.get(i);
- if (bigramList != null) {
- for (final Integer word1Index : bigramList) {
- final String word1 = words.get(word1Index);
- bigramSet.add(new Pair<>(words.get(i), word1));
- }
- }
- }
- int token = 0;
- do {
- final BinaryDictionary.GetNextWordPropertyResult result =
- binaryDictionary.getNextWordProperty(token);
- final WordProperty wordProperty = result.mWordProperty;
- final String word0 = wordProperty.mWord;
- assertEquals(UNIGRAM_FREQ, wordProperty.mProbabilityInfo.mProbability);
- wordSet.remove(word0);
- if (wordProperty.mHasNgrams) {
- for (final WeightedString bigramTarget : wordProperty.getBigrams()) {
- final String word1 = bigramTarget.mWord;
- final Pair<String, String> bigram = new Pair<>(word0, word1);
- assertTrue(bigramSet.contains(bigram));
- bigramSet.remove(bigram);
- }
- }
- token = result.mNextToken;
- } while (token != 0);
- assertTrue(wordSet.isEmpty());
- assertTrue(bigramSet.isEmpty());
- }
-}
diff --git a/tests/src/com/android/inputmethod/latin/makedict/BinaryDictUtils.java b/tests/src/com/android/inputmethod/latin/makedict/BinaryDictUtils.java
deleted file mode 100644
index 9c1e4cf84e..0000000000
--- a/tests/src/com/android/inputmethod/latin/makedict/BinaryDictUtils.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.inputmethod.latin.makedict;
-
-import com.android.inputmethod.latin.makedict.FormatSpec.DictionaryOptions;
-import com.android.inputmethod.latin.makedict.FormatSpec.FormatOptions;
-
-import java.io.File;
-import java.util.HashMap;
-
-public class BinaryDictUtils {
- public static final int USE_BYTE_ARRAY = 1;
- public static final int USE_BYTE_BUFFER = 2;
-
- public static final String TEST_DICT_FILE_EXTENSION = ".testDict";
-
- public static final FormatSpec.FormatOptions STATIC_OPTIONS =
- new FormatSpec.FormatOptions(FormatSpec.VERSION202);
- public static final FormatSpec.FormatOptions DYNAMIC_OPTIONS_WITHOUT_TIMESTAMP =
- new FormatSpec.FormatOptions(FormatSpec.VERSION4, false /* hasTimestamp */);
- public static final FormatSpec.FormatOptions DYNAMIC_OPTIONS_WITH_TIMESTAMP =
- new FormatSpec.FormatOptions(FormatSpec.VERSION4, true /* hasTimestamp */);
-
- public static DictionaryOptions makeDictionaryOptions(final String id, final String version,
- final FormatSpec.FormatOptions formatOptions) {
- final DictionaryOptions options = new DictionaryOptions(new HashMap<String, String>());
- options.mAttributes.put(DictionaryHeader.DICTIONARY_LOCALE_KEY, "en_US");
- options.mAttributes.put(DictionaryHeader.DICTIONARY_ID_KEY, id);
- options.mAttributes.put(DictionaryHeader.DICTIONARY_VERSION_KEY, version);
- if (formatOptions.mHasTimestamp) {
- options.mAttributes.put(DictionaryHeader.HAS_HISTORICAL_INFO_KEY,
- DictionaryHeader.ATTRIBUTE_VALUE_TRUE);
- options.mAttributes.put(DictionaryHeader.USES_FORGETTING_CURVE_KEY,
- DictionaryHeader.ATTRIBUTE_VALUE_TRUE);
- }
- return options;
- }
-
- public static File getDictFile(final String name, final String version,
- final FormatOptions formatOptions, final File directory) {
- if (formatOptions.mVersion == FormatSpec.VERSION2
- || formatOptions.mVersion == FormatSpec.VERSION201
- || formatOptions.mVersion == FormatSpec.VERSION202) {
- return new File(directory, name + "." + version + TEST_DICT_FILE_EXTENSION);
- } else if (formatOptions.mVersion == FormatSpec.VERSION4) {
- return new File(directory, name + "." + version);
- } else {
- throw new RuntimeException("the format option has a wrong version : "
- + formatOptions.mVersion);
- }
- }
-
- public static DictEncoder getDictEncoder(final File file, final FormatOptions formatOptions) {
- if (formatOptions.mVersion == FormatSpec.VERSION4) {
- if (!file.isDirectory()) {
- file.mkdir();
- }
- return new Ver4DictEncoder(file);
- } else if (formatOptions.mVersion == FormatSpec.VERSION202) {
- return new Ver2DictEncoder(file, Ver2DictEncoder.CODE_POINT_TABLE_OFF);
- } else {
- throw new RuntimeException("The format option has a wrong version : "
- + formatOptions.mVersion);
- }
- }
-}
diff --git a/tests/src/com/android/inputmethod/latin/makedict/Ver2DictEncoderTests.java b/tests/src/com/android/inputmethod/latin/makedict/Ver2DictEncoderTests.java
deleted file mode 100644
index dbf9b7ac2c..0000000000
--- a/tests/src/com/android/inputmethod/latin/makedict/Ver2DictEncoderTests.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.inputmethod.latin.makedict;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map.Entry;
-
-import com.android.inputmethod.latin.makedict.BinaryDictEncoderUtils.CodePointTable;
-import com.android.inputmethod.latin.makedict.FusionDictionary.PtNodeArray;
-
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.LargeTest;
-
-/**
- * Unit tests for Ver2DictEncoder
- */
-@LargeTest
-public class Ver2DictEncoderTests extends AndroidTestCase {
- private static final int UNIGRAM_FREQ = 10;
-
- public void testCodePointTable() {
- final String[] wordSource = {"words", "used", "for", "testing", "a", "code point", "table"};
- final List<String> words = Arrays.asList(wordSource);
- final String correctCodePointTable = "eotdsanirfg bclwup";
- final String correctCodePointOccurrenceArrayString =
- "11641114101411531003114211021052972119111711121108110311021991981321";
- final String correctCodePointExpectedMapString = "343332363540383937464549484744414243";
- final String dictName = "codePointTableTest";
- final String dictVersion = Long.toString(System.currentTimeMillis());
-
- final FormatSpec.FormatOptions formatOptions =
- new FormatSpec.FormatOptions(FormatSpec.VERSION2);
- final FusionDictionary sourcedict = new FusionDictionary(new PtNodeArray(),
- BinaryDictUtils.makeDictionaryOptions(dictName, dictVersion, formatOptions));
- addUnigrams(sourcedict, words);
- final CodePointTable codePointTable = Ver2DictEncoder.makeCodePointTable(sourcedict);
-
- // Check if mCodePointOccurrenceArray is correct
- final StringBuilder codePointOccurrenceArrayString = new StringBuilder();
- for (Entry<Integer, Integer> entry : codePointTable.mCodePointOccurrenceArray) {
- codePointOccurrenceArrayString.append(entry.getKey());
- codePointOccurrenceArrayString.append(entry.getValue());
- }
- assertEquals(correctCodePointOccurrenceArrayString,
- codePointOccurrenceArrayString.toString());
-
- // Check if mCodePointToOneByteCodeMap is correct
- final StringBuilder codePointExpectedMapString = new StringBuilder();
- for (int i = 0; i < correctCodePointTable.length(); ++i) {
- codePointExpectedMapString.append(codePointTable.mCodePointToOneByteCodeMap.get(
- correctCodePointTable.codePointAt(i)));
- }
- assertEquals(correctCodePointExpectedMapString, codePointExpectedMapString.toString());
- }
-
- /**
- * Adds unigrams to the dictionary.
- */
- private static void addUnigrams(final FusionDictionary dict, final List<String> words) {
- for (final String word : words) {
- dict.add(word, new ProbabilityInfo(UNIGRAM_FREQ),
- false /* isNotAWord */,
- false /* isPossiblyOffensive */);
- }
- }
-}
diff --git a/tests/src/com/android/inputmethod/latin/makedict/Ver4DictEncoder.java b/tests/src/com/android/inputmethod/latin/makedict/Ver4DictEncoder.java
deleted file mode 100644
index 6e7b37d548..0000000000
--- a/tests/src/com/android/inputmethod/latin/makedict/Ver4DictEncoder.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.inputmethod.latin.makedict;
-
-import com.android.inputmethod.annotations.UsedForTesting;
-import com.android.inputmethod.latin.BinaryDictionary;
-import com.android.inputmethod.latin.Dictionary;
-import com.android.inputmethod.latin.NgramContext;
-import com.android.inputmethod.latin.common.LocaleUtils;
-import com.android.inputmethod.latin.makedict.FormatSpec.FormatOptions;
-import com.android.inputmethod.latin.makedict.FusionDictionary.PtNode;
-import com.android.inputmethod.latin.utils.BinaryDictionaryUtils;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.HashMap;
-
-/**
- * An implementation of DictEncoder for version 4 binary dictionary.
- */
-@UsedForTesting
-public class Ver4DictEncoder implements DictEncoder {
- private final File mDictPlacedDir;
-
- @UsedForTesting
- public Ver4DictEncoder(final File dictPlacedDir) {
- mDictPlacedDir = dictPlacedDir;
- }
-
- // TODO: This builds a FusionDictionary first and iterates it to add words to the binary
- // dictionary. However, it is possible to just add words directly to the binary dictionary
- // instead.
- // In the long run, when we stop supporting version 2, FusionDictionary will become deprecated
- // and we can remove it. Then we'll be able to just call BinaryDictionary directly.
- @Override
- public void writeDictionary(FusionDictionary dict, FormatOptions formatOptions)
- throws IOException, UnsupportedFormatException {
- if (formatOptions.mVersion != FormatSpec.VERSION4) {
- throw new UnsupportedFormatException("File header has a wrong version number : "
- + formatOptions.mVersion);
- }
- if (!mDictPlacedDir.isDirectory()) {
- throw new UnsupportedFormatException("Given path is not a directory.");
- }
- if (!BinaryDictionaryUtils.createEmptyDictFile(mDictPlacedDir.getAbsolutePath(),
- FormatSpec.VERSION4, LocaleUtils.constructLocaleFromString(
- dict.mOptions.mAttributes.get(DictionaryHeader.DICTIONARY_LOCALE_KEY)),
- dict.mOptions.mAttributes)) {
- throw new IOException("Cannot create dictionary file : "
- + mDictPlacedDir.getAbsolutePath());
- }
- final BinaryDictionary binaryDict = new BinaryDictionary(mDictPlacedDir.getAbsolutePath(),
- 0l, mDictPlacedDir.length(), true /* useFullEditDistance */,
- LocaleUtils.constructLocaleFromString(dict.mOptions.mAttributes.get(
- DictionaryHeader.DICTIONARY_LOCALE_KEY)),
- Dictionary.TYPE_USER /* Dictionary type. Does not matter for us */,
- true /* isUpdatable */);
- if (!binaryDict.isValidDictionary()) {
- // Somehow createEmptyDictFile returned true, but the file was not created correctly
- throw new IOException("Cannot create dictionary file");
- }
- for (final WordProperty wordProperty : dict) {
- if (!binaryDict.addUnigramEntry(wordProperty.mWord, wordProperty.getProbability(),
- wordProperty.mIsBeginningOfSentence, wordProperty.mIsNotAWord,
- wordProperty.mIsPossiblyOffensive, 0 /* timestamp */)) {
- MakedictLog.e("Cannot add unigram entry for " + wordProperty.mWord);
- }
- if (binaryDict.needsToRunGC(true /* mindsBlockByGC */)) {
- if (!binaryDict.flushWithGC()) {
- MakedictLog.e("Cannot flush dict with GC.");
- return;
- }
- }
- }
- for (final WordProperty word0Property : dict) {
- if (!word0Property.mHasNgrams) continue;
- // TODO: Support ngram.
- for (final WeightedString word1 : word0Property.getBigrams()) {
- final NgramContext ngramContext =
- new NgramContext(new NgramContext.WordInfo(word0Property.mWord));
- if (!binaryDict.addNgramEntry(ngramContext, word1.mWord,
- word1.getProbability(), 0 /* timestamp */)) {
- MakedictLog.e("Cannot add n-gram entry for "
- + ngramContext + " -> " + word1.mWord);
- return;
- }
- if (binaryDict.needsToRunGC(true /* mindsBlockByGC */)) {
- if (!binaryDict.flushWithGC()) {
- MakedictLog.e("Cannot flush dict with GC.");
- return;
- }
- }
- }
- }
- if (!binaryDict.flushWithGC()) {
- MakedictLog.e("Cannot flush dict with GC.");
- return;
- }
- binaryDict.close();
- }
-
- @Override
- public void setPosition(int position) {
- }
-
- @Override
- public int getPosition() {
- return 0;
- }
-
- @Override
- public void writePtNodeCount(int ptNodeCount) {
- }
-
- @Override
- public void writePtNode(PtNode ptNode, FusionDictionary dict,
- HashMap<Integer, Integer> codePointToOneByteCodeMap) {
- }
-}
diff --git a/tests/src/com/android/inputmethod/latin/utils/BinaryDictionaryUtilsTests.java b/tests/src/com/android/inputmethod/latin/utils/BinaryDictionaryUtilsTests.java
deleted file mode 100644
index f50b8e0b88..0000000000
--- a/tests/src/com/android/inputmethod/latin/utils/BinaryDictionaryUtilsTests.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.inputmethod.latin.utils;
-
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.LargeTest;
-
-import com.android.inputmethod.latin.BinaryDictionary;
-import com.android.inputmethod.latin.common.FileUtils;
-import com.android.inputmethod.latin.common.LocaleUtils;
-import com.android.inputmethod.latin.makedict.DictionaryHeader;
-import com.android.inputmethod.latin.makedict.FormatSpec;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-@LargeTest
-public class BinaryDictionaryUtilsTests extends AndroidTestCase {
- private static final String TEST_DICT_FILE_EXTENSION = ".testDict";
- private static final String TEST_LOCALE = "test";
-
- private File createEmptyDictionaryAndGetFile(final String dictId,
- final int formatVersion) throws IOException {
- if (formatVersion == FormatSpec.VERSION4) {
- return createEmptyVer4DictionaryAndGetFile(dictId);
- }
- throw new IOException("Dictionary format version " + formatVersion + " is not supported.");
- }
-
- private File createEmptyVer4DictionaryAndGetFile(final String dictId) throws IOException {
- final File file = getDictFile(dictId);
- FileUtils.deleteRecursively(file);
- Map<String, String> attributeMap = new HashMap<>();
- attributeMap.put(DictionaryHeader.DICTIONARY_ID_KEY, dictId);
- attributeMap.put(DictionaryHeader.DICTIONARY_VERSION_KEY,
- String.valueOf(TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis())));
- attributeMap.put(DictionaryHeader.USES_FORGETTING_CURVE_KEY,
- DictionaryHeader.ATTRIBUTE_VALUE_TRUE);
- attributeMap.put(DictionaryHeader.HAS_HISTORICAL_INFO_KEY,
- DictionaryHeader.ATTRIBUTE_VALUE_TRUE);
- if (BinaryDictionaryUtils.createEmptyDictFile(file.getAbsolutePath(), FormatSpec.VERSION4,
- LocaleUtils.constructLocaleFromString(TEST_LOCALE), attributeMap)) {
- return file;
- }
- throw new IOException("Empty dictionary " + file.getAbsolutePath() + " cannot be created.");
- }
-
- private File getDictFile(final String dictId) {
- return new File(getContext().getCacheDir(), dictId + TEST_DICT_FILE_EXTENSION);
- }
-
- public void testRenameDictionary() {
- final int formatVersion = FormatSpec.VERSION4;
- File dictFile0 = null;
- try {
- dictFile0 = createEmptyDictionaryAndGetFile("MoveFromDictionary", formatVersion);
- } catch (IOException e) {
- fail("IOException while writing an initial dictionary : " + e);
- }
- final File dictFile1 = getDictFile("MoveToDictionary");
- FileUtils.deleteRecursively(dictFile1);
- assertTrue(BinaryDictionaryUtils.renameDict(dictFile0, dictFile1));
- assertFalse(dictFile0.exists());
- assertTrue(dictFile1.exists());
- BinaryDictionary binaryDictionary = new BinaryDictionary(dictFile1.getAbsolutePath(),
- 0 /* offset */, dictFile1.length(), true /* useFullEditDistance */,
- Locale.getDefault(), TEST_LOCALE, true /* isUpdatable */);
- assertTrue(binaryDictionary.isValidDictionary());
- assertTrue(binaryDictionary.getFormatVersion() == formatVersion);
- binaryDictionary.close();
- }
-}
--
GitLab