Kouhei Sutou
null+****@clear*****
Mon Nov 3 16:34:01 JST 2014
Kouhei Sutou 2014-11-03 16:34:01 +0900 (Mon, 03 Nov 2014) New Revision: ac14d580c00fcdb2d5363632b2defa4e5ffbe5f6 https://github.com/groonga/groonga/commit/ac14d580c00fcdb2d5363632b2defa4e5ffbe5f6 Message: test query_optimizer: simplify Modified files: test/query_optimizer/helper/query_optimizer.rb test/query_optimizer/suite/test_index.rb test/query_optimizer/suite/test_no_index.rb Modified: test/query_optimizer/helper/query_optimizer.rb (+10 -7) =================================================================== --- test/query_optimizer/helper/query_optimizer.rb 2014-11-03 16:29:12 +0900 (034717a) +++ test/query_optimizer/helper/query_optimizer.rb 2014-11-03 16:34:01 +0900 (1b37f5f) @@ -1,15 +1,18 @@ module QueryOptimizer - def create_expression(domain) - expression = Groonga::Expression.new - expression.define_variable(:domain => domain) - expression + def setup_expression(domain) + @expression = Groonga::Expression.new + @expression.define_variable(:domain => domain) end - def dump_plan(expression, text, options={}) + def teardown_expression + @expression.close + end + + def dump_plan(text, options={}) default_options = { :syntax => :script, } - expression.parse(text, default_options.merge(options)) - expression.dump_plan + @expression.parse(text, default_options.merge(options)) + @expression.dump_plan end end Modified: test/query_optimizer/suite/test_index.rb (+3 -3) =================================================================== --- test/query_optimizer/suite/test_index.rb 2014-11-03 16:29:12 +0900 (51fc3bd) +++ test/query_optimizer/suite/test_index.rb 2014-11-03 16:34:01 +0900 (10dcb10) @@ -14,15 +14,15 @@ class TestIndex < QueryOptimizerTestCase end @logs = Groonga["Logs"] - @expression = create_expression(@logs) + setup_expression(@logs) end def teardown - @expression.close + teardown_expression end def test_match - assert_equal(<<-DUMP, dump_plan(@expression, "message @ 'Groonga'")) + assert_equal(<<-DUMP, dump_plan("message @ 'Groonga'")) [0] op: <match> logical_op: <or> Modified: test/query_optimizer/suite/test_no_index.rb (+3 -3) =================================================================== --- test/query_optimizer/suite/test_no_index.rb 2014-11-03 16:29:12 +0900 (522f3aa) +++ test/query_optimizer/suite/test_no_index.rb 2014-11-03 16:34:01 +0900 (654c98d) @@ -7,15 +7,15 @@ class TestNoIndex < QueryOptimizerTestCase end @logs = Groonga["Logs"] - @expression = create_expression(@logs) + setup_expression(@logs) end def teardown - @expression.close + teardown_expression end def test_plus - assert_equal(<<-DUMP, dump_plan(@expression, "1 + 1")) + assert_equal(<<-DUMP, dump_plan("1 + 1")) sequential search DUMP end -------------- next part -------------- HTML����������������������������...Download