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

diff --git a/src/com/hughes/android/dictionary/engine/DictionaryBuilderTest.java b/src/com/hughes/android/dictionary/engine/DictionaryBuilderTest.java
index 7cdb313..c0921c3 100644
--- a/src/com/hughes/android/dictionary/engine/DictionaryBuilderTest.java
+++ b/src/com/hughes/android/dictionary/engine/DictionaryBuilderTest.java
@@ -32,6 +32,27 @@ public class DictionaryBuilderTest extends TestCase {
   public static final String GOLDENS = "testdata/goldens/";
 
   public static final String TEST_OUTPUTS = "testdata/outputs/";
+  
+  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",
+        // 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 {
+    wiktionaryTestWithLangToEn("wiktionary.de_en.quickdic", "DE", "de.txt",
+        "EN.data", "enwiktionary.english", "German", "it");
+  }
+
+  public void testWiktionary_IT_IT() throws Exception {
+    wiktionaryTestWithLangToEn("wiktionary.it_it.quickdic", "IT", "it.txt",
+        "IT.data", "enwiktionary.italian", "Italian", "it");
+  }
 
   // French
   public void testWiktionary_FR_FR() throws Exception {
@@ -53,34 +74,12 @@ public class DictionaryBuilderTest extends TestCase {
         "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");
-  }
-
-  // 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 {