X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=src%2Fcom%2Fhughes%2Fandroid%2Fdictionary%2Fengine%2FDictionaryBuilderTest.java;h=7cdb3130b0c9a82495db5f0dac4b61216f7294e7;hb=6b48357924945c3b493557f2d311ec0957b31964;hp=71cb4c2b1a1b4dd20b5de3f8513df56194e09cf6;hpb=5fab504f765ff1553c98096ba85b04ffc2ef1062;p=DictionaryPC.git

diff --git a/src/com/hughes/android/dictionary/engine/DictionaryBuilderTest.java b/src/com/hughes/android/dictionary/engine/DictionaryBuilderTest.java
index 71cb4c2..7cdb313 100644
--- a/src/com/hughes/android/dictionary/engine/DictionaryBuilderTest.java
+++ b/src/com/hughes/android/dictionary/engine/DictionaryBuilderTest.java
@@ -26,58 +26,81 @@ 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/enWikiSplit/";
-  public static final String STOPLISTS = "../DictionaryData/inputs/stoplists/";
-  public static final String GOLDENS = "../DictionaryData/testdata/goldens/";
+  public static final String TEST_INPUTS = "testdata/inputs/";
+  public static final String WIKISPLIT = "data/inputs/enWikiSplit/";
+  public static final String STOPLISTS = "data/inputs/stoplists/";
+  public static final String GOLDENS = "testdata/goldens/";
 
-  public static final String TEST_OUTPUTS = "../DictionaryData/testdata/outputs/";
+  public static final String TEST_OUTPUTS = "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(),
-        "--lang1=IT",
-        "--lang2=EN",
-        "--lang1Stoplist=" + STOPLISTS + "it.txt",
-        "--lang2Stoplist=" + STOPLISTS + "en.txt",
-        "--dictInfo=SomeWikiData",
+  // French
+  public void testWiktionary_FR_FR() throws Exception {
+    wiktionaryTestWithLangToEn("wiktionary.fr_fr.quickdic", "FR", "fr.txt",
+        "FR.data", "enwiktionary.french", "French", "fr");
+  }
 
-        "--input4=" + WIKISPLIT + "italian.data",
-        "--input4Name=enwiktionary.italian",
-        "--input4Format=enwiktionary",
-        "--input4LangPattern=Italian",
-        "--input4LangCodePattern=it",
-        "--input4EnIndex=2",
-        "--input4PageLimit=1000",
+  
+  // Arabic
+  public void testWiktionary_AR_AR() throws Exception {
+    wiktionaryTestWithLangToEn("wiktionary.ar_ar.quickdic", "AR", "empty.txt",
+        "AR.data", "enwiktionary.arabic", "Arabic", "ar");
+  }
 
-        "--print=" + result.getPath() + ".text",
-    });
-    
-    checkGolden(name, result); 
+  // Chinese
+  public void testWiktionary_ZH_ZH() throws Exception {
+    wiktionaryTestWithLangToEn("wiktionary.zh_zh.quickdic", "ZH", "empty.txt",
+        // These missing "e" prevents a complete match, forcing the name to be printed.
+        "ZH.data", "enwiktionary.chinese", "Chinese|Mandarin|Cantones", "zh");
+  }
+
+  public void testWiktionary_ZH_EN() throws Exception {
+    wiktionaryTestWithLangToEn("wiktionary.zh_en.quickdic", "ZH", "empty.txt",
+        // These missing "e" prevents a complete match, forcing the name to be printed
+        "EN.data", "enwiktionary.english", "Chinese|Mandarin|Cantones", "zh");
+  }
+  
+  // German
+  public void testWiktionary_DE_DE() throws Exception {
+    wiktionaryTestWithLangToEn("wiktionary.de_de.quickdic", "DE", "de.txt",
+        "DE.data", "enwiktionary.german", "German", "it");
+  }
+
+  public void testWiktionary_DE_EN() throws Exception {
+    wiktionaryTestWithLangToEn("wiktionary.de_en.quickdic", "DE", "de.txt",
+        "EN.data", "enwiktionary.english", "German", "it");
   }
 
-  public void testWiktionaryItalianFromEnglish() throws Exception {
-    final String name = "wiktionary.it_en.quickdic";
+  // Italian
+  public void testWiktionary_IT_IT() throws Exception {
+    wiktionaryTestWithLangToEn("wiktionary.it_it.quickdic", "IT", "it.txt",
+        "IT.data", "enwiktionary.italian", "Italian", "it");
+  }
+
+  public void testWiktionary_IT_EN() throws Exception {
+    wiktionaryTestWithLangToEn("wiktionary.it_en.quickdic", "IT", "it.txt",
+        "EN.data", "enwiktionary.english", "Italian", "it");
+  }
+
+  public void wiktionaryTestWithLangToEn(final String name, final String lang1,
+      final String stoplist, final String data, final String dictName,
+      final String langPattern, final String langCode) throws Exception {
     final File result = new File(TEST_OUTPUTS + name);
     System.out.println("Writing to: " + result);
     DictionaryBuilder.main(new String[] {
         "--dictOut=" + result.getAbsolutePath(),
-        "--lang1=IT",
+        "--lang1=" + lang1,
         "--lang2=EN",
-        "--lang1Stoplist=" + STOPLISTS + "it.txt",
+        "--lang1Stoplist=" + STOPLISTS + stoplist,
         "--lang2Stoplist=" + STOPLISTS + "en.txt",
         "--dictInfo=SomeWikiData",
 
-        "--input3=" + WIKISPLIT + "english.data",
-        "--input3Name=enwiktionary.english",
-        "--input3Format=enwiktionary",
-        "--input3LangPattern=Italian",
-        "--input3LangCodePattern=it",
-        "--input3EnIndex=2",
-        "--input3PageLimit=1000",
+        "--input4=" + WIKISPLIT + data,
+        "--input4Name=" + dictName,
+        "--input4Format=enwiktionary",
+        "--input4LangPattern=" + langPattern,
+        "--input4LangCodePattern=" + langCode,
+        "--input4EnIndex=2",
+        "--input4PageLimit=1000",
 
         "--print=" + result.getPath() + ".text",
     });
@@ -85,7 +108,6 @@ public class DictionaryBuilderTest extends TestCase {
     checkGolden(name, result); 
   }
 
-  
   public void testGermanCombined() throws Exception {
     final String name = "de-en.quickdic";
     final File result = new File(TEST_OUTPUTS + name);
@@ -119,7 +141,7 @@ public class DictionaryBuilderTest extends TestCase {
 
     // Check it again.
     final Dictionary dict = new Dictionary(new RandomAccessFile(dictFile.getAbsolutePath(), "r"));
-    final PrintStream out = new PrintStream(new File(dictFile.getName() + ".text"));
+    final PrintStream out = new PrintStream(new File(dictFile.getPath() + ".text"));
     dict.print(out);
     out.close();
     assertFilesEqual(GOLDENS + dictName + ".text", dictFile.getPath() + ".text");