ferret 0.10.14 → 0.11.0

data/test/unit/index/tc_index.rb

@@ -66,6 +66,10 @@ class IndexTest < Test::Unit::TestCase
     assert_equal("four", index[5]["field3"])
     q = "field3:f*"
     check_results(index, q, [5, 7])
+    q = "*:(one AND NOT three)"
+    check_results(index, q, [0, 3, 4, 6])
+    q = "*:(one AND (NOT three))"
+    check_results(index, q, [0, 3, 4, 6])
     q = "two AND field3:f*"
     check_results(index, q, [5, 7])
     assert_equal("five", index.doc(7)["field3"])
@@ -146,7 +150,7 @@ class IndexTest < Test::Unit::TestCase
     fs_path = File.expand_path(File.join(File.dirname(__FILE__), '../../temp/fsdir'))
 
     Dir[File.join(fs_path, "*")].each {|path| begin File.delete(path) rescue nil end}
-    assert_raise(IOError) do
+    assert_raise(FileNotFoundError) do
       Index.new(:path => fs_path,
                 :create_if_missing => false,
                 :default_field => :xxx)
@@ -534,7 +538,7 @@ class IndexTest < Test::Unit::TestCase
     assert_equal("20051023", index[top_docs.hits[2].doc][:date])
     top_docs = index.search("one two three four",
                             :sort => [sf_date, SortField::SCORE])
-    return
+
     assert_equal("19390912", index[top_docs.hits[0].doc][:date])
     assert_equal("three four", index[top_docs.hits[0].doc][:content])
     assert_equal("19390912", index[top_docs.hits[1].doc][:date])

data/test/unit/index/tc_index_writer.rb

@@ -21,10 +21,10 @@ class IndexWriterTest < Test::Unit::TestCase
     assert(! wlock.locked?)
     assert(! clock.locked?)
     iw = IndexWriter.new(:dir => @dir, :create => true)
-    assert(@dir.exists?("segments"))
+    assert(@dir.exists?("segments.gen"))
     assert(wlock.locked?)
     iw.close()
-    assert(@dir.exists?("segments"))
+    assert(@dir.exists?("segments.gen"))
     assert(! wlock.locked?)
     assert(! clock.locked?)
   end

data/test/unit/query_parser/tc_query_parser.rb

@@ -34,6 +34,7 @@ class QueryParserTest < Test::Unit::TestCase
       ['>aaa', '{aaa>'],
       ['>=aaa', '[aaa>'],
       ['<aaa', '<aaa}'],
+      ['[A>', '[a>'],
       ['field:<=aaa', 'field:<aaa]'],
       ['REQ one REQ two', '+one +two'],
       ['REQ one two', '+one two'],
@@ -50,6 +51,7 @@ class QueryParserTest < Test::Unit::TestCase
       ['NOT one NOT two', '-one -two'],
       ['NOT one two', '-one two'],
       ['one NOT two', 'one -two'],
+      ['NOT two', '-two +*'],
       ['one two', 'one two'],
       ['one OR two', 'one two'],
       ['one AND two', '+one +two'],
@@ -157,8 +159,10 @@ class QueryParserTest < Test::Unit::TestCase
   
   def do_test_query_parse_exception_raised(str)
     parser = Ferret::QueryParser.new(:default_field => "xxx",
-                                     :fields => ["f1", "f2", "f3"])
-    assert_raise(Ferret::QueryParser::QueryParseException) do
+                                     :fields => ["f1", "f2", "f3"],
+                                     :handle_parse_errors => false)
+    assert_raise(Ferret::QueryParser::QueryParseException,
+                 str + " should have failed") do
       parser.parse(str)
     end
   end
@@ -190,13 +194,24 @@ class QueryParserTest < Test::Unit::TestCase
   
   def test_bad_queries
     parser = Ferret::QueryParser.new(:default_field => "xxx",
-                                     :fields => ["f1", "f2"],
-                                     :handle_parse_errors => true)
+                                     :fields => ["f1", "f2"])
 
     pairs = [
       ['::*word', 'word'],
       ['::*&)(*^&*(', ''],
-      ['::*&one)(*two(*&"', '"one two"~1']
+      ['::*&one)(*two(*&"', '"one two"~1'],
+      [':', ''],
+      ['[, ]', ''],
+      ['{, }', ''],
+      ['!', ''],
+      ['+', ''],
+      ['~', ''],
+      ['^', ''],
+      ['-', ''],
+      ['|', ''],
+      ['<, >', ''],
+      ['=', ''],
+      ['<script>', 'script']
     ]
       
     pairs.each do |query_str, expected|

data/test/unit/search/tc_index_searcher.rb

@@ -34,7 +34,9 @@ class SearcherTest < Test::Unit::TestCase
   end
 
   def check_hits(query, expected, top=nil, total_hits=nil)
-    top_docs = @searcher.search(query)
+    options = {}
+    options[:limit] = expected.size + 1 if (expected.size > 10) 
+    top_docs = @searcher.search(query, options)
     assert_equal(expected.length, top_docs.hits.size)
     assert_equal(top, top_docs.hits[0].doc) if top
     if total_hits

data/test/unit/search/tm_searcher.rb

@@ -54,6 +54,8 @@ module SearcherTests
     check_docs(tq, {:limit => 6, :offset => 2}, expected[2,6])
     check_docs(tq, {:limit => 2, :offset => expected.length}, [])
     check_docs(tq, {:limit => 2, :offset => expected.length + 100}, [])
+    check_docs(tq, {:limit => :all}, expected)
+    check_docs(tq, {:limit => :all, :offset => 2}, expected[2..-1])
   end
 
   def test_multi_term_query
@@ -108,7 +110,7 @@ module SearcherTests
 
     bq = BooleanQuery.new()
     bq.add_query(tq2, :must_not)
-    check_hits(bq, [])
+    check_hits(bq, [0,1,4,5,7,9,10,12,13,15,16,17])
 
     bq = BooleanQuery.new()
     bq.add_query(tq2, :should)

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: ferret
 version: !ruby/object:Gem::Version 
-  version: 0.10.14
-date: 2007-01-16 00:00:00 +11:00
+  version: 0.11.0
+date: 2007-02-25 00:00:00 +11:00
 summary: Ruby indexing library.
 require_paths: 
 - lib
@@ -204,6 +204,7 @@ files:
 - test/threading/thread_safety_index_test.rb
 - test/threading/thread_safety_test.rb
 - test/threading/number_to_spoken.rb
+- test/threading/thread_safety_read_write_test.rb
 test_files: []
 
 rdoc_options: