From: Thad Hughes Date: Wed, 14 Dec 2011 00:02:12 +0000 (-0800) Subject: Fixing tests after moving out data. X-Git-Url: http://gitweb.fperrin.net/?a=commitdiff_plain;h=2433d2f98245523c959985785d63525877ade0ea;p=DictionaryPC.git Fixing tests after moving out data. --- diff --git a/src/com/hughes/android/dictionary/engine/DictionaryBuilderTest.java b/src/com/hughes/android/dictionary/engine/DictionaryBuilderTest.java index 4cd4fe3..77b240a 100644 --- a/src/com/hughes/android/dictionary/engine/DictionaryBuilderTest.java +++ b/src/com/hughes/android/dictionary/engine/DictionaryBuilderTest.java @@ -25,8 +25,15 @@ import junit.framework.TestCase; public class DictionaryBuilderTest extends TestCase { + public static final String TEST_INPUTS = "../DictionaryData/testdata/inputs/"; + public static final String WIKISPLIT = "../DictionaryData/inputs/wikiSplit/"; + public static final String GOLDENS = "../DictionaryData/testdata/goldens/"; + + public static final String TEST_OUTPUTS = "../DictionaryData/testdata/outputs/"; + public static final String OUTPUTS = "../DictionaryData/outputs/"; + public void testWiktionaryItalian() throws Exception { - final File result = new File("testdata/wiktionary.it.quickdic"); + final File result = new File(TEST_OUTPUTS + "wiktionary.it.quickdic"); System.out.println("Writing to: " + result); DictionaryBuilder.main(new String[] { "--dictOut=" + result.getAbsolutePath(), @@ -35,7 +42,7 @@ public class DictionaryBuilderTest extends TestCase { "--dictInfo=SomeWikiData", /* - "--input3=wikiSplit/english.data", + "--input3=" + WIKISPLIT + "english.data", "--input3Name=enwiktionary.english", "--input3Format=enwiktionary", "--input3LangPattern=Italian", @@ -43,7 +50,7 @@ public class DictionaryBuilderTest extends TestCase { "--input3EnIndex=2", "--input3PageLimit=1000", */ - "--input4=wikiSplit/italian.data", + "--input4=" + WIKISPLIT + "italian.data", "--input4Name=enwiktionary.italian", "--input4Format=enwiktionary", "--input4LangPattern=Italian", @@ -51,56 +58,54 @@ public class DictionaryBuilderTest extends TestCase { "--input4EnIndex=2", "--input4PageLimit=1000", - "--print=testdata/wiktionary.it.test", + "--print=" + result.getName() + ".text", }); // Check it once: - assertFilesEqual("testdata/wiktionary.it.golden2", "testdata/wiktionary.it.test"); - + assertFilesEqual(GOLDENS + "wiktionary.it_it.quickdic.text", result.getName() + ".text"); // Check it again. final Dictionary dict = new Dictionary(new RandomAccessFile(result.getAbsolutePath(), "r")); - final PrintStream out = new PrintStream(new File("testdata/wiktionary.it.test")); + final PrintStream out = new PrintStream(new File(result.getName() + ".text")); dict.print(out); out.close(); - assertFilesEqual("testdata/wiktionary.it.golden", "testdata/wiktionary.it.test"); + assertFilesEqual(GOLDENS + "wiktionary.it_it.quickdic.text", result.getName() + ".text"); } public void testGermanCombined() throws Exception { - final File result = new File("testdata/de-en.quickdic"); + final File result = new File(TEST_OUTPUTS + "de-en.quickdic"); System.out.println("Writing to: " + result); DictionaryBuilder.main(new String[] { "--dictOut=" + result.getAbsolutePath(), "--lang1=DE", "--lang2=EN", - "--dictInfo=@testdata/de-en_dictInfo.txt", + "--dictInfo=@" + TEST_INPUTS + "de-en_dictInfo.txt", - "--input1=testdata/de-en_chemnitz_100", + "--input1=" + TEST_INPUTS + "de-en_chemnitz_100", "--input1Name=chemnitz", "--input1Charset=UTF8", "--input1Format=chemnitz", - "--input2=testdata/de-en_dictcc_100", + "--input2=" + TEST_INPUTS + "de-en_dictcc_simulated", "--input2Name=dictcc", "--input2Charset=UTF8", "--input2Format=dictcc", - "--print=testdata/de-en.test", + "--print=" + result.getName() + ".text", }); // Check it once: - assertFilesEqual("testdata/de-en.golden", "testdata/de-en.test"); - + assertFilesEqual(GOLDENS + "de-en.quickdic.text", result.getName() + ".text"); // Check it again. final Dictionary dict = new Dictionary(new RandomAccessFile(result.getAbsolutePath(), "r")); - final PrintStream out = new PrintStream(new File("testdata/de-en.test")); + final PrintStream out = new PrintStream(result.getName() + ".text"); dict.print(out); out.close(); - assertFilesEqual("testdata/de-en.golden", "testdata/de-en.test"); + assertFilesEqual(GOLDENS + "de-en.quickdic.text", result.getName() + ".text"); } diff --git a/src/com/hughes/android/dictionary/engine/DictionaryTest.java b/src/com/hughes/android/dictionary/engine/DictionaryTest.java index 696b8be..1d6300b 100644 --- a/src/com/hughes/android/dictionary/engine/DictionaryTest.java +++ b/src/com/hughes/android/dictionary/engine/DictionaryTest.java @@ -25,6 +25,9 @@ import com.hughes.android.dictionary.engine.PairEntry.Row; public class DictionaryTest extends TestCase { + + static final String TEST_OUTPUTS = com.hughes.android.dictionary.engine.DictionaryBuilderTest.TEST_OUTPUTS; + static final String OUTPUTS = com.hughes.android.dictionary.engine.DictionaryBuilderTest.OUTPUTS; @Override protected void setUp() { @@ -38,18 +41,18 @@ public class DictionaryTest extends TestCase { } public void testEnItWiktionary() throws IOException { - final RandomAccessFile raf = new RandomAccessFile("dictOutputs/EN-IT_enwiktionary.quickdic", "r"); + final RandomAccessFile raf = new RandomAccessFile(OUTPUTS + "EN-IT_enwiktionary.quickdic", "r"); final Dictionary dict = new Dictionary(raf); final Index enIndex = dict.indices.get(0); - final PairEntry.Row row = (Row) enIndex.rows.get(2); - assertEquals("z", row.getRawText(false)); + final RowBase row = enIndex.rows.get(4); + assertEquals("carbonyl chloride (the compound COCl2) (noun)\tossicloruro di carbonio", row.getRawText(false)); raf.close(); } public void testGermanMetadata() throws IOException { - final RandomAccessFile raf = new RandomAccessFile("testdata/de-en.quickdic", "r"); + final RandomAccessFile raf = new RandomAccessFile(TEST_OUTPUTS + "de-en.quickdic", "r"); final Dictionary dict = new Dictionary(raf); final Index deIndex = dict.indices.get(0); @@ -60,13 +63,13 @@ public class DictionaryTest extends TestCase { assertEquals("chemnitz", dict.sources.get(0).name); assertEquals(0, dict.sources.get(0).pairEntryStart); assertEquals("dictcc", dict.sources.get(1).name); - assertEquals(113, dict.sources.get(1).pairEntryStart); + assertEquals(0, dict.sources.get(1).pairEntryStart); // TODO: rethink this raf.close(); } public void testGermanIndex() throws IOException { - final RandomAccessFile raf = new RandomAccessFile("testdata/de-en.quickdic", "r"); + final RandomAccessFile raf = new RandomAccessFile(TEST_OUTPUTS + "de-en.quickdic", "r"); final Dictionary dict = new Dictionary(raf); final Index deIndex = dict.indices.get(0); @@ -116,7 +119,7 @@ public class DictionaryTest extends TestCase { } public void testGermanTokenRows() throws IOException { - final RandomAccessFile raf = new RandomAccessFile("testdata/de-en.quickdic", "r"); + final RandomAccessFile raf = new RandomAccessFile(TEST_OUTPUTS + "de-en.quickdic", "r"); final Dictionary dict = new Dictionary(raf); final Index deIndex = dict.indices.get(0); @@ -147,7 +150,7 @@ public class DictionaryTest extends TestCase { } public void testChemnitz() throws IOException { - final RandomAccessFile raf = new RandomAccessFile("dictOutputs/de-en_chemnitz.quickdic", "r"); + final RandomAccessFile raf = new RandomAccessFile(OUTPUTS + "/de-en_chemnitz.quickdic", "r"); final Dictionary dict = new Dictionary(raf); final Index deIndex = dict.indices.get(0); diff --git a/src/com/hughes/android/dictionary/parser/WikiTokenizer.java b/src/com/hughes/android/dictionary/parser/WikiTokenizer.java index ad14bc0..f80605d 100644 --- a/src/com/hughes/android/dictionary/parser/WikiTokenizer.java +++ b/src/com/hughes/android/dictionary/parser/WikiTokenizer.java @@ -70,7 +70,7 @@ public final class WikiTokenizer { public WikiTokenizer(final String wikiText, final boolean isNewline) { this.wikiText = wikiText; this.matcher = wikiTokenEvent.matcher(wikiText); - justReturnedNewline = false; + justReturnedNewline = isNewline; } private void clear() {