X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=src%2Fcom%2Fhughes%2Fandroid%2Fdictionary%2Fengine%2FDictionaryTest.java;h=c3f4c4ee45f9696763f755b92683c2cd041f5423;hb=253466ba45a33fcc3ba3a399cfa2f243392db0b0;hp=a462897a91e8ef14e27b315e8ee36b4a2bcd86ef;hpb=9a0850fd39f27b5cf08dbf63510f523d8bceff5d;p=DictionaryPC.git

diff --git a/src/com/hughes/android/dictionary/engine/DictionaryTest.java b/src/com/hughes/android/dictionary/engine/DictionaryTest.java
index a462897..c3f4c4e 100644
--- a/src/com/hughes/android/dictionary/engine/DictionaryTest.java
+++ b/src/com/hughes/android/dictionary/engine/DictionaryTest.java
@@ -1,16 +1,35 @@
+// Copyright 2011 Google Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package com.hughes.android.dictionary.engine;
 
 import java.io.IOException;
 import java.io.RandomAccessFile;
+import java.util.Arrays;
+import java.util.List;
 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.CollectionUtil;
 
 
 public class DictionaryTest extends TestCase {
+  
+  static final String TEST_OUTPUTS = com.hughes.android.dictionary.engine.DictionaryBuilderTest.TEST_OUTPUTS;
+  public static final String OUTPUTS = "data/outputs/";
 
   @Override
   protected void setUp() {
@@ -24,35 +43,36 @@ 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("The numeral 00\tzeranta (noun) {m|f|inv}", 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);
     
-    assertEquals("de", deIndex.shortName);
-    assertEquals("de->en", deIndex.longName);
+    assertEquals("DE", deIndex.shortName);
+    assertEquals("DE->EN", deIndex.longName);
     
     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("dictcc", dict.pairEntries.get(0).entrySource.name);
+    assertEquals("chemnitz", dict.pairEntries.get(1).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);
     
@@ -102,7 +122,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);
     
@@ -133,7 +153,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(TEST_OUTPUTS + "de-en.quickdic", "r");
     final Dictionary dict = new Dictionary(raf);
     final Index deIndex = dict.indices.get(0);
     
@@ -143,5 +163,48 @@ public class DictionaryTest extends TestCase {
     raf.close();
   }
 
+  public void testMultiSearch() throws IOException {
+    final RandomAccessFile raf = new RandomAccessFile(TEST_OUTPUTS + "de-en.quickdic", "r");
+    final Dictionary dict = new Dictionary(raf);
+    final Index deIndex = dict.indices.get(0);
+
+    {
+    final List<RowBase> rows = deIndex.multiWordSearch(Arrays.asList("aaa", "aaab"), new AtomicBoolean(false));
+    System.out.println(CollectionUtil.join(rows, "\n  "));
+    assertTrue(rows.toString(), rows.size() > 0);
+    }
+    
+    raf.close();
+  }
+
+  public void testMultiSearchBig() throws IOException {
+    final RandomAccessFile raf = new RandomAccessFile(OUTPUTS + "DE-EN_chemnitz_enwiktionary.quickdic", "r");
+    final Dictionary dict = new Dictionary(raf);
+    final Index enIndex = dict.indices.get(1);
+
+    {
+    final List<RowBase> rows = enIndex.multiWordSearch(Arrays.asList("train", "station"), new AtomicBoolean(false));
+    System.out.println(CollectionUtil.join(rows, "\n  "));
+    assertTrue(rows.toString(), rows.size() > 0);
+    assertEquals("Bahnhof {{de-noun|g=m|genitive=Bahnhofs|genitive2=Bahnhofes|plural=Bahnhöfe}}\ttrain station", rows.get(0).toString());
+    }
+
+    {
+    final List<RowBase> rows = enIndex.multiWordSearch(Arrays.asList("a", "train", "station"), new AtomicBoolean(false));
+    System.out.println(CollectionUtil.join(rows, "\n  "));
+    assertTrue(rows.toString(), rows.size() > 0);
+    assertEquals("Bahnhofsuhr {{de-noun|g=f|plural=Bahnhofsuhren}}\tstation clock (at a train station)", rows.get(0).toString());
+    }
+
+    {
+    final List<RowBase> rows = enIndex.multiWordSearch(Arrays.asList("a", "station"), new AtomicBoolean(false));
+    // TODO: bug, "a" isn't in stoplist for now...
+    System.out.println(CollectionUtil.join(rows, "\n  "));
+    assertTrue(rows.toString(), rows.size() == 0);
+    //assertEquals("Bahnhofsuhr {{de-noun|g=f|plural=Bahnhofsuhren}}\tstation clock (at a train station)", rows.get(0).toString());
+    }
+
+    raf.close();
+  }
 
 }