X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=src%2Fcom%2Fhughes%2Fandroid%2Fdictionary%2Fengine%2FDictionaryBuilderTest.java;h=c6dcccbab194df8cc5517789eaf805f57227695c;hb=d49dab6bd67bd257fc05dba9f288c5ada3bd2071;hp=928047d5933956cd2ff4fab2cbd1bb57734d9c55;hpb=50408cbdec646b586a7c54d0d0d86e807d6c9657;p=DictionaryPC.git

diff --git a/src/com/hughes/android/dictionary/engine/DictionaryBuilderTest.java b/src/com/hughes/android/dictionary/engine/DictionaryBuilderTest.java
index 928047d..c6dcccb 100644
--- a/src/com/hughes/android/dictionary/engine/DictionaryBuilderTest.java
+++ b/src/com/hughes/android/dictionary/engine/DictionaryBuilderTest.java
@@ -1,6 +1,21 @@
+// Copyright 2011 Google Inc. All Rights Reserved.
+//
+// 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.hughes.android.dictionary.engine;
 
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.io.RandomAccessFile;
@@ -11,8 +26,15 @@ import junit.framework.TestCase;
 
 public class DictionaryBuilderTest extends TestCase {
   
-  public void testWiktionaryItalian() throws Exception {
-    final File result = new File("testdata/wiktionary.it.quickdic");
+  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 void testWiktionaryItalianFromItalian() throws Exception {
+    final String name = "wiktionary.it_it.quickdic";
+    final File result = new File(TEST_OUTPUTS + name);
     System.out.println("Writing to: " + result);
     DictionaryBuilder.main(new String[] {
         "--dictOut=" + result.getAbsolutePath(),
@@ -20,16 +42,7 @@ public class DictionaryBuilderTest extends TestCase {
         "--lang2=EN",
         "--dictInfo=SomeWikiData",
 
-        /*
-        "--input3=wikiSplit/english.data",
-        "--input3Name=enwiktionary.english",
-        "--input3Format=enwiktionary",
-        "--input3LangPattern=Italian",
-        "--input3LangCodePattern=it",
-        "--input3EnIndex=2",
-        "--input3PageLimit=1000",
-*/
-        "--input4=wikiSplit/italian.data",
+        "--input4=" + WIKISPLIT + "italian.data",
         "--input4Name=enwiktionary.italian",
         "--input4Format=enwiktionary",
         "--input4LangPattern=Italian",
@@ -37,60 +50,77 @@ public class DictionaryBuilderTest extends TestCase {
         "--input4EnIndex=2",
         "--input4PageLimit=1000",
 
-        "--print=testdata/wiktionary.it.test",
+        "--print=" + result.getPath() + ".text",
     });
     
-    // Check it once:
-    assertFilesEqual("testdata/wiktionary.it.golden2", "testdata/wiktionary.it.test"); 
-    
-    
-    // Check it again.
-    final Dictionary dict = new Dictionary(new RandomAccessFile(result.getAbsolutePath(), "r"));
-    final PrintStream out = new PrintStream(new File("testdata/wiktionary.it.test"));
-    dict.print(out);
-    out.close();
+    checkGolden(name, result); 
+  }
+
+  public void testWiktionaryItalianFromEnglish() throws Exception {
+    final String name = "wiktionary.it_en.quickdic";
+    final File result = new File(TEST_OUTPUTS + name);
+    System.out.println("Writing to: " + result);
+    DictionaryBuilder.main(new String[] {
+        "--dictOut=" + result.getAbsolutePath(),
+        "--lang1=IT",
+        "--lang2=EN",
+        "--dictInfo=SomeWikiData",
+
+        "--input3=" + WIKISPLIT + "english.data",
+        "--input3Name=enwiktionary.english",
+        "--input3Format=enwiktionary",
+        "--input3LangPattern=Italian",
+        "--input3LangCodePattern=it",
+        "--input3EnIndex=2",
+        "--input3PageLimit=1000",
+
+        "--print=" + result.getPath() + ".text",
+    });
     
-    assertFilesEqual("testdata/wiktionary.it.golden", "testdata/wiktionary.it.test");
+    checkGolden(name, result); 
   }
 
   
   public void testGermanCombined() throws Exception {
-    final File result = new File("testdata/de-en.quickdic");
+    final String name = "de-en.quickdic";
+    final File result = new File(TEST_OUTPUTS + name);
     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.getPath() + ".text",
     });
     
+    checkGolden(name, result); 
+  }
+
+  private void checkGolden(final String dictName, final File dictFile)
+      throws IOException, FileNotFoundException {
     // Check it once:
-    assertFilesEqual("testdata/de-en.golden", "testdata/de-en.test"); 
-    
-    
+    assertFilesEqual(GOLDENS + dictName + ".text", dictFile.getPath() + ".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 Dictionary dict = new Dictionary(new RandomAccessFile(dictFile.getAbsolutePath(), "r"));
+    final PrintStream out = new PrintStream(new File(dictFile.getName() + ".text"));
     dict.print(out);
     out.close();
-    
-    assertFilesEqual("testdata/de-en.golden", "testdata/de-en.test");
+    assertFilesEqual(GOLDENS + dictName + ".text", dictFile.getPath() + ".text");
   }
 
 
-
   void assertFilesEqual(final String expected, final String actual) throws IOException {
     final String expectedString = FileUtil.readToString(new File(expected));
     final String actualString = FileUtil.readToString(new File(actual));