go

[DictionaryPC.git] / src / com / hughes / android / dictionary / DictionaryTest.java

diff --git a/src/com/hughes/android/dictionary/DictionaryTest.java b/src/com/hughes/android/dictionary/DictionaryTest.java
index 6e18a9351396784a24f85dc3ffa680bb7a965ea1..af770e1bb95ae4e2365f2dc858434feabf8ad5d3 100755 (executable)
--- a/src/com/hughes/android/dictionary/DictionaryTest.java
+++ b/src/com/hughes/android/dictionary/DictionaryTest.java
@@ -24,19 +24,19 @@ public class DictionaryTest extends TestCase {
     file.deleteOnExit();\r
 \r
 //    final Dictionary goldenDict;\r
-    final List<Entry> entries = Arrays.asList(\r
-        Entry.parseFromLine("der Hund :: the dog", false),\r
-        Entry.parseFromLine("Die grosse Katze :: The big cat", false), \r
-        Entry.parseFromLine("die Katze :: the cat", false),\r
-        Entry.parseFromLine("gross :: big", false),\r
-        Entry.parseFromLine("Dieb :: thief", false),\r
-        Entry.parseFromLine("rennen :: run", false));\r
+    final List<SimpleEntry> entries = Arrays.asList(\r
+        SimpleEntry.parseFromLine("der Hund :: the dog", false),\r
+        SimpleEntry.parseFromLine("Die grosse Katze :: The big cat", false), \r
+        SimpleEntry.parseFromLine("die Katze :: the cat", false),\r
+        SimpleEntry.parseFromLine("gross :: big", false),\r
+        SimpleEntry.parseFromLine("Dieb :: thief", false),\r
+        SimpleEntry.parseFromLine("rennen :: run", false));\r
 \r
     {\r
       final Dictionary dict = new Dictionary("test", Language.de, Language.en);\r
       dict.entries.addAll(entries);\r
-      DictionaryBuilder.createIndex(dict, Entry.LANG1);\r
-      DictionaryBuilder.createIndex(dict, Entry.LANG2);\r
+      DictionaryBuilder.createIndex(dict, SimpleEntry.LANG1);\r
+      DictionaryBuilder.createIndex(dict, SimpleEntry.LANG2);\r
       final RandomAccessFile raf = new RandomAccessFile(file, "rw");\r
       dict.write(raf);\r
       raf.close();\r
@@ -98,22 +98,22 @@ public class DictionaryTest extends TestCase {
   \r
   public void testTextNorm() throws IOException {\r
     System.out.println("\n\ntestTextNorm");\r
-    final List<Entry> entries = Arrays.asList(\r
-        Entry.parseFromLine("Hund {m} :: dog", true),\r
-        Entry.parseFromLine("'CHRISTOS' :: doh", true),\r
-        Entry.parseFromLine("\"Pick-up\"-Presse {f} :: baler", true),\r
-        Entry.parseFromLine("(Ach was), echt? [auch ironisch] :: No shit! [also ironic]", true),\r
-        Entry.parseFromLine("(akuter) Myokardinfarkt {m} <AMI / MI> :: (acute) myocardial infarction <AMI / MI>", true),\r
-        Entry.parseFromLine("(reine) Vermutung {f} :: guesswork", true),\r
-        Entry.parseFromLine("(mit) 6:1 vorne liegen :: to be 6-1 up [football]", true),\r
-        Entry.parseFromLine("(auf) den Knopf drücken [auch fig.: auslösen] :: to push the button [also fig.: initiate]", false),\r
-        Entry.parseFromLine("Adjektiv {n} /Adj./; Eigenschaftswort {n} [gramm.] | Adjektive {pl}; Eigenschaftswoerter {pl} :: adjective /adj./ | adjectives", true),\r
-        Entry.parseFromLine("Älteste {m,f}; Ältester :: oldest; eldest", true),\r
-        Entry.parseFromLine("\"...\", schloss er an. :: '...,' he added.", true),\r
-        Entry.parseFromLine("besonderer | besondere | besonderes :: extra", false),\r
-        Entry.parseFromLine("| zu Pferde; zu Pferd | reiten :: horseback | on horseback | go on horseback", true),\r
-        Entry.parseFromLine("Hauptaugenmerk {m} | sein Hauptaugenmerk richten auf ::  | to focus (one's) attention on", true),\r
-        Entry.parseFromLine("&#963;-Algebra {f} :: &#963;-field", true)\r
+    final List<SimpleEntry> entries = Arrays.asList(\r
+        SimpleEntry.parseFromLine("Hund {m} :: dog", true),\r
+        SimpleEntry.parseFromLine("'CHRISTOS' :: doh", true),\r
+        SimpleEntry.parseFromLine("\"Pick-up\"-Presse {f} :: baler", true),\r
+        SimpleEntry.parseFromLine("(Ach was), echt? [auch ironisch] :: No shit! [also ironic]", true),\r
+        SimpleEntry.parseFromLine("(akuter) Myokardinfarkt {m} <AMI / MI> :: (acute) myocardial infarction <AMI / MI>", true),\r
+        SimpleEntry.parseFromLine("(reine) Vermutung {f} :: guesswork", true),\r
+        SimpleEntry.parseFromLine("(mit) 6:1 vorne liegen :: to be 6-1 up [football]", true),\r
+        SimpleEntry.parseFromLine("(auf) den Knopf drücken [auch fig.: auslösen] :: to push the button [also fig.: initiate]", false),\r
+        SimpleEntry.parseFromLine("Adjektiv {n} /Adj./; Eigenschaftswort {n} [gramm.] | Adjektive {pl}; Eigenschaftswoerter {pl} :: adjective /adj./ | adjectives", true),\r
+        SimpleEntry.parseFromLine("Älteste {m,f}; Ältester :: oldest; eldest", true),\r
+        SimpleEntry.parseFromLine("\"...\", schloss er an. :: '...,' he added.", true),\r
+        SimpleEntry.parseFromLine("besonderer | besondere | besonderes :: extra", false),\r
+        SimpleEntry.parseFromLine("| zu Pferde; zu Pferd | reiten :: horseback | on horseback | go on horseback", true),\r
+        SimpleEntry.parseFromLine("Hauptaugenmerk {m} | sein Hauptaugenmerk richten auf ::  | to focus (one's) attention on", true),\r
+        SimpleEntry.parseFromLine("&#963;-Algebra {f} :: &#963;-field", true)\r
         );\r
 \r
     assertFalse(entries.contains(null));\r
@@ -122,8 +122,8 @@ public class DictionaryTest extends TestCase {
 \r
     final Dictionary dict = new Dictionary("test", Language.de, Language.en);\r
     dict.entries.addAll(entries);\r
-    DictionaryBuilder.createIndex(dict, Entry.LANG1);\r
-    DictionaryBuilder.createIndex(dict, Entry.LANG2);\r
+    DictionaryBuilder.createIndex(dict, SimpleEntry.LANG1);\r
+    DictionaryBuilder.createIndex(dict, SimpleEntry.LANG2);\r
     \r
     for (int lang = 0; lang <= 1; lang++) {\r
       final LanguageData languageData = dict.languageDatas[lang];\r