X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=src%2Fcom%2Fhughes%2Fandroid%2Fdictionary%2Fengine%2FDictionaryBuilderTest.java;h=c0921c39e5b60df53d07b02cbaa76910794cabcb;hb=794c2989d4ff4c456c9aa1066150c6d51a5aae84;hp=99e4e84a9438518ef1142768151e81dd9dfadb0e;hpb=ca23379690d2ec13909fc52044d8d65166bde27c;p=DictionaryPC.git

diff --git a/src/com/hughes/android/dictionary/engine/DictionaryBuilderTest.java b/src/com/hughes/android/dictionary/engine/DictionaryBuilderTest.java
index 99e4e84..c0921c3 100644
--- a/src/com/hughes/android/dictionary/engine/DictionaryBuilderTest.java
+++ b/src/com/hughes/android/dictionary/engine/DictionaryBuilderTest.java
@@ -27,28 +27,21 @@ import junit.framework.TestCase;
 public class DictionaryBuilderTest extends TestCase {
   
   public static final String TEST_INPUTS = "testdata/inputs/";
-  public static final String WIKISPLIT = "../DictionaryData/inputs/enWikiSplit/";
-  public static final String STOPLISTS = "../DictionaryData/inputs/stoplists/";
+  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 = "testdata/outputs/";
-
-  // Chinese
-  public void testWiktionary_ZH_ZH() throws Exception {
-    wiktionaryTestWithLangToEn("wiktionary.zh_zh.quickdic", "ZH", "empty.txt",
-        "ZH.data", "enwiktionary.chinese", "Chinese|Mandarin|Cantonese", "zh");
+  
+  public void testWiktionary_IT_EN() throws Exception {
+    wiktionaryTestWithLangToEn("wiktionary.it_en.quickdic", "IT", "it.txt",
+        "EN.data", "enwiktionary.english", "Italian", "it");
   }
 
   public void testWiktionary_ZH_EN() throws Exception {
     wiktionaryTestWithLangToEn("wiktionary.zh_en.quickdic", "ZH", "empty.txt",
-        "EN.data", "enwiktionary.english", "Chinese|Mandarin|Cantonese", "zh");
-  }
-
-  
-  // German
-  public void testWiktionary_DE_DE() throws Exception {
-    wiktionaryTestWithLangToEn("wiktionary.de_de.quickdic", "DE", "de.txt",
-        "DE.data", "enwiktionary.german", "German", "it");
+        // These missing "e" prevents a complete match, forcing the name to be printed
+        "EN.data", "enwiktionary.english", "Chinese|Mandarin|Cantones", "zh");
   }
 
   public void testWiktionary_DE_EN() throws Exception {
@@ -56,15 +49,35 @@ public class DictionaryBuilderTest extends TestCase {
         "EN.data", "enwiktionary.english", "German", "it");
   }
 
-  // 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");
+  // French
+  public void testWiktionary_FR_FR() throws Exception {
+    wiktionaryTestWithLangToEn("wiktionary.fr_fr.quickdic", "FR", "fr.txt",
+        "FR.data", "enwiktionary.french", "French", "fr");
+  }
+
+  
+  // Arabic
+  public void testWiktionary_AR_AR() throws Exception {
+    wiktionaryTestWithLangToEn("wiktionary.ar_ar.quickdic", "AR", "empty.txt",
+        "AR.data", "enwiktionary.arabic", "Arabic", "ar");
+  }
+
+  // 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");
+  }
+
+  // German
+  public void testWiktionary_DE_DE() throws Exception {
+    wiktionaryTestWithLangToEn("wiktionary.de_de.quickdic", "DE", "de.txt",
+        "DE.data", "enwiktionary.german", "German", "it");
   }
 
   public void wiktionaryTestWithLangToEn(final String name, final String lang1,