X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=src%2Fcom%2Fhughes%2Fandroid%2Fdictionary%2Fengine%2FDictionaryTest.java;h=2662cbbb633e40f81b34035b3e17fec51185a992;hb=a20a499019fba423a37dd843dfb5adc20c76bc1f;hp=3de220b0db7de98609172b8aa543904142fdad54;hpb=4b7bd1a73f94d1dc94ae3ef0a316f91fce21550d;p=DictionaryPC.git

diff --git a/src/com/hughes/android/dictionary/engine/DictionaryTest.java b/src/com/hughes/android/dictionary/engine/DictionaryTest.java
index 3de220b..2662cbb 100644
--- a/src/com/hughes/android/dictionary/engine/DictionaryTest.java
+++ b/src/com/hughes/android/dictionary/engine/DictionaryTest.java
@@ -74,18 +74,18 @@ public class DictionaryTest extends TestCase {
     raf.close();
   }
 
-  public void testFr() throws IOException {
-      final RandomAccessFile raf = new RandomAccessFile(OUTPUTS + "FR.quickdic", "r");
-      final Dictionary dict = new Dictionary(raf);
-      final Index frIndex = dict.indices.get(0);
-      
-      // Now they're all cached, we shouldn't have to search.
+//  public void testFr() throws IOException {
+//      final RandomAccessFile raf = new RandomAccessFile(OUTPUTS + "FR.quickdic", "r");
+//      final Dictionary dict = new Dictionary(raf);
+//      final Index frIndex = dict.indices.get(0);
+//      
+//      // Now they're all cached, we shouldn't have to search.
 //      for (final IndexEntry indexEntry : frIndex.sortedIndexEntries) {
 //          System.out.println(indexEntry.token);
 //      }
-
-      raf.close();
-  }
+//
+//      raf.close();
+//  }
 
   
   public void testDeEnWiktionary() throws IOException {
@@ -304,36 +304,36 @@ public class DictionaryTest extends TestCase {
   }
 
   public void testMultiSearchBigAF() throws IOException {
-    final RandomAccessFile raf = new RandomAccessFile(OUTPUTS + "EN-AF.quickdic", "r");
+    final RandomAccessFile raf = new RandomAccessFile(OUTPUTS + "AF-EN.quickdic", "r");
     final Dictionary dict = new Dictionary(raf);
-    final Index enIndex = dict.indices.get(0);
+    final Index enIndex = dict.indices.get(1);
 
     {
     final List<RowBase> rows = enIndex.multiWordSearch("pig eats", Arrays.asList("pig", "eats"), new AtomicBoolean(false));
     System.out.println(CollectionUtil.join(rows, "\n  "));
     assertTrue(rows.toString(), rows.size() > 0);
-    assertEquals("pig (someone who overeats or eats rapidly) (noun)\tvark", rows.get(0).toString());
+    assertEquals("vark\tpig (someone who overeats or eats rapidly) (noun)", rows.get(0).toString());
     }
 
     {
     final List<RowBase> rows = enIndex.multiWordSearch("pig eat", Arrays.asList("pig", "eat"), new AtomicBoolean(false));
     System.out.println(CollectionUtil.join(rows, "\n  "));
     assertTrue(rows.toString(), rows.size() > 0);
-    assertEquals("pig (someone who overeats or eats rapidly) (noun)\tvark", rows.get(0).toString());
+    assertEquals("vark\tpig (someone who overeats or eats rapidly) (noun)", rows.get(0).toString());
     }
 
     {
     final List<RowBase> rows = enIndex.multiWordSearch("pi ea", Arrays.asList("pi", "ea"), new AtomicBoolean(false));
     System.out.println(CollectionUtil.join(rows, "\n  "));
     assertTrue(rows.toString(), rows.size() > 0);
-    assertTrue(rows.toString().contains("pig (someone who overeats or eats rapidly) (noun)\tvark"));
+    assertTrue(rows.toString().contains("vark\tpig (someone who overeats or eats rapidly) (noun)"));
     }
 
     {
     final List<RowBase> rows = enIndex.multiWordSearch("p eat", Arrays.asList("p", "eat"), new AtomicBoolean(false));
     System.out.println(CollectionUtil.join(rows, "\n  "));
     assertTrue(rows.toString(), rows.size() > 0);
-    assertTrue(rows.toString().contains("pig (someone who overeats or eats rapidly) (noun)\tvark"));
+    assertTrue(rows.toString().contains("vark\tpig (someone who overeats or eats rapidly) (noun)"));
     }