X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=src%2Fcom%2Fhughes%2Fandroid%2Fdictionary%2Fengine%2FDictionaryBuilderTest.java;h=903f327c4943be8c96d100756baaa4f3b3bccdfc;hb=f602bd837028813c3e2d7cc1456a3b7b6a8bb53e;hp=7c8d2324ec15e664fb27ffd4953327fa105c57fc;hpb=a91fcd717450fa7cbbc2b260c265d0a66a232dc6;p=DictionaryPC.git

diff --git a/src/com/hughes/android/dictionary/engine/DictionaryBuilderTest.java b/src/com/hughes/android/dictionary/engine/DictionaryBuilderTest.java
index 7c8d232..903f327 100644
--- a/src/com/hughes/android/dictionary/engine/DictionaryBuilderTest.java
+++ b/src/com/hughes/android/dictionary/engine/DictionaryBuilderTest.java
@@ -11,32 +11,59 @@ import junit.framework.TestCase;
 
 public class DictionaryBuilderTest extends TestCase {
   
-  public void testGermanCombined() throws Exception {
-    final File result = new File("testdata/de-en.quickdic");
+  public void testWiktionaryCombined() throws Exception {
+    final File result = new File("testdata/wiktionary.quickdic");
     System.out.println("Writing to: " + result);
     DictionaryBuilder.main(new String[] {
         "--dictOut=" + result.getAbsolutePath(),
         "--lang1=DE",
         "--lang2=EN",
-        "--dictInfo=@testdata/de-en_dictInfo.txt",
-
-//        "--input1=testdata/de-en_chemnitz_100",
-//        "--input1Name=dictcc",
-//        "--input1Charset=UTF8",
-//        "--input1Format=chemnitz",
-//
-//        "--input2=testdata/de-en_dictcc_100",
-//        "--input2Name=dictcc",
-//        "--input2Charset=UTF8",
-//        "--input2Format=dictcc",
+        "--dictInfo=SomeWikiData",
 
         "--input3=testdata/enwiktionary_small.xml",
         "--input3Name=enwiktionary",
         "--input3Format=enwiktionary",
-        "--input3TranslationPattern1=[Gg]erman",
-        "--input3TranslationPattern2=[Ee]glish",
+        "--input3TranslationPattern1=German|Italian|Spanish|French|Japanese|Arabic|Mandarin",
+        "--input3TranslationPattern2=English",
         "--input3EnIndex=2",
 
+        "--print=testdata/wiktionary.test",
+    });
+    
+    // Check it once:
+    assertFilesEqual("testdata/wiktionary.golden", "testdata/wiktionary.test"); 
+    
+    
+    // Check it again.
+    final Dictionary dict = new Dictionary(new RandomAccessFile(result.getAbsolutePath(), "r"));
+    final PrintStream out = new PrintStream(new File("testdata/wiktionary.test"));
+    dict.print(out);
+    out.close();
+    
+    assertFilesEqual("testdata/wiktionary.golden", "testdata/wiktionary.test");
+  }
+
+  
+  public void testGermanCombined() throws Exception {
+    if (1==1) throw new RuntimeException();
+    final File result = new File("testdata/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",
+
+        "--input1=testdata/de-en_chemnitz_100",
+        "--input1Name=dictcc",
+        "--input1Charset=UTF8",
+        "--input1Format=chemnitz",
+
+        "--input2=testdata/de-en_dictcc_100",
+        "--input2Name=dictcc",
+        "--input2Charset=UTF8",
+        "--input2Format=dictcc",
+
         "--print=testdata/de-en.test",
     });
     
@@ -52,7 +79,8 @@ public class DictionaryBuilderTest extends TestCase {
     
     assertFilesEqual("testdata/de-en.golden", "testdata/de-en.test");
   }
-  
+
+
 
   void assertFilesEqual(final String expected, final String actual) throws IOException {
     final String expectedString = FileUtil.readToString(new File(expected));
@@ -60,4 +88,5 @@ public class DictionaryBuilderTest extends TestCase {
     assertEquals(expectedString, actualString);
   }
 
+  
 }