X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=src%2Fcom%2Fhughes%2Fandroid%2Fdictionary%2Fengine%2FDictionaryTest.java;h=53b3a916f692f303075ac0e5c16d39b4ffeea449;hb=e2eb68726dc1efce8d833502c211e445bfc2230b;hp=696b8bed29801d4fc06ac1130666f96ecef369ff;hpb=a8052a74747df9244c098041dc82c745f64d51c6;p=DictionaryPC.git

diff --git a/src/com/hughes/android/dictionary/engine/DictionaryTest.java b/src/com/hughes/android/dictionary/engine/DictionaryTest.java
index 696b8be..53b3a91 100644
--- a/src/com/hughes/android/dictionary/engine/DictionaryTest.java
+++ b/src/com/hughes/android/dictionary/engine/DictionaryTest.java
@@ -21,10 +21,13 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import junit.framework.TestCase;
 
 import com.hughes.android.dictionary.engine.Index.IndexEntry;
-import com.hughes.android.dictionary.engine.PairEntry.Row;
+import com.hughes.util.ListUtil;
 
 
 public class DictionaryTest extends TestCase {
+  
+  static final String TEST_OUTPUTS = com.hughes.android.dictionary.engine.DictionaryBuilderTest.TEST_OUTPUTS;
+  public static final String OUTPUTS = "../DictionaryData/outputs/";
 
   @Override
   protected void setUp() {
@@ -38,18 +41,18 @@ public class DictionaryTest extends TestCase {
   }
 
   public void testEnItWiktionary() throws IOException {
-    final RandomAccessFile raf = new RandomAccessFile("dictOutputs/EN-IT_enwiktionary.quickdic", "r");
+    final RandomAccessFile raf = new RandomAccessFile(OUTPUTS + "EN-IT_enwiktionary.quickdic", "r");
     final Dictionary dict = new Dictionary(raf);
     final Index enIndex = dict.indices.get(0);
     
-    final PairEntry.Row row = (Row) enIndex.rows.get(2);
-    assertEquals("z", row.getRawText(false));
+    final RowBase row = enIndex.rows.get(4);
+    assertEquals("eagle (A gold coin with a face value of $10.00) (noun)\tmoneta di dieci dollari", row.getRawText(false));
 
     raf.close();
   }
 
   public void testGermanMetadata() throws IOException {
-    final RandomAccessFile raf = new RandomAccessFile("testdata/de-en.quickdic", "r");
+    final RandomAccessFile raf = new RandomAccessFile(TEST_OUTPUTS + "de-en.quickdic", "r");
     final Dictionary dict = new Dictionary(raf);
     final Index deIndex = dict.indices.get(0);
     
@@ -58,15 +61,16 @@ public class DictionaryTest extends TestCase {
     
     assertEquals(2, dict.sources.size());
     assertEquals("chemnitz", dict.sources.get(0).name);
-    assertEquals(0, dict.sources.get(0).pairEntryStart);
     assertEquals("dictcc", dict.sources.get(1).name);
-    assertEquals(113, dict.sources.get(1).pairEntryStart);
+    
+    assertEquals("chemnitz", dict.pairEntries.get(0).entrySource.name);
+    assertEquals("dictcc", ListUtil.getLast(dict.pairEntries).entrySource.name);
     
     raf.close();
   }
   
   public void testGermanIndex() throws IOException {
-    final RandomAccessFile raf = new RandomAccessFile("testdata/de-en.quickdic", "r");
+    final RandomAccessFile raf = new RandomAccessFile(TEST_OUTPUTS + "de-en.quickdic", "r");
     final Dictionary dict = new Dictionary(raf);
     final Index deIndex = dict.indices.get(0);
     
@@ -116,7 +120,7 @@ public class DictionaryTest extends TestCase {
   }
 
   public void testGermanTokenRows() throws IOException {
-    final RandomAccessFile raf = new RandomAccessFile("testdata/de-en.quickdic", "r");
+    final RandomAccessFile raf = new RandomAccessFile(TEST_OUTPUTS + "de-en.quickdic", "r");
     final Dictionary dict = new Dictionary(raf);
     final Index deIndex = dict.indices.get(0);
     
@@ -147,7 +151,7 @@ public class DictionaryTest extends TestCase {
   }
   
   public void testChemnitz() throws IOException {
-    final RandomAccessFile raf = new RandomAccessFile("dictOutputs/de-en_chemnitz.quickdic", "r");
+    final RandomAccessFile raf = new RandomAccessFile(OUTPUTS + "/de-en_chemnitz.quickdic", "r");
     final Dictionary dict = new Dictionary(raf);
     final Index deIndex = dict.indices.get(0);