Kouhei Sutou
null+****@clear*****
Wed Dec 3 22:33:45 JST 2014
Kouhei Sutou 2014-12-03 22:33:45 +0900 (Wed, 03 Dec 2014) New Revision: 70ec712fa815ec47ce1762f9f5dccc061964f6ac https://github.com/ranguba/rroonga/commit/70ec712fa815ec47ce1762f9f5dccc061964f6ac Message: test: update inspected result of expression Groonga updates it. Modified files: test/test-column.rb test/test-expression.rb Modified: test/test-column.rb (+50 -12) =================================================================== --- test/test-column.rb 2014-12-02 22:59:58 +0900 (fdc2ac2) +++ test/test-column.rb 2014-12-03 22:33:45 +0900 (c1f88b9) @@ -169,9 +169,18 @@ class ColumnTest < Test::Unit::TestCase result.records.collect do |record| record["body"] end) - assert_equal("#<Groonga::Expression noname($1:null)" + - "{2body GET_VALUE,0\"drive\",0MATCH}>", - result.expression.inspect) + assert_equal(<<-INSPECTED.chomp, result.expression.inspect) +#<Groonga::Expression #<expr + vars:{ + $1:#<record:hash:Posts id:0(nonexistent)> + }, + codes:{ + 0:<get_value(), modify:2, value:#<column:var_size Posts.body range:Text type:scalar compress:none>>, + 1:<push(), modify:0, value:"drive">, + 2:<match(), modify:0, value:(NULL)> + } +>> + INSPECTED end def test_select_query_from_ctx @@ -200,9 +209,18 @@ class ColumnTest < Test::Unit::TestCase result.records.collect do |record| record["body"] end) - assert_equal("#<Groonga::Expression noname($1:null)" + - "{2body GET_VALUE,0\"drive\",0MATCH}>", - result.expression.inspect) + assert_equal(<<-INSPECTED.chomp, result.expression.inspect) +#<Groonga::Expression #<expr + vars:{ + $1:#<record:hash:Posts id:0(nonexistent)> + }, + codes:{ + 0:<get_value(), modify:2, value:#<column:var_size Posts.body range:Text type:scalar compress:none>>, + 1:<push(), modify:0, value:"drive">, + 2:<match(), modify:0, value:(NULL)> + } +>> + INSPECTED end def test_select_expression @@ -218,9 +236,19 @@ class ColumnTest < Test::Unit::TestCase result.records.collect do |record| record["body"] end) - assert_equal("#<Groonga::Expression noname($1:null)" + - "{0null,2body GET_VALUE,0\"drive\",0MATCH}>", - result.expression.inspect) + assert_equal(<<-INSPECTED.chomp, result.expression.inspect) +#<Groonga::Expression #<expr + vars:{ + $1:#<record:hash:Posts id:0(nonexistent)> + }, + codes:{ + 0:<push(), modify:0, value:#<record:hash:Posts id:0(nonexistent)>>, + 1:<get_value(), modify:2, value:#<column:var_size Posts.body range:Text type:scalar compress:none>>, + 2:<push(), modify:0, value:"drive">, + 3:<match(), modify:0, value:(NULL)> + } +>> + INSPECTED end def test_select_with_block @@ -233,9 +261,19 @@ class ColumnTest < Test::Unit::TestCase result.records.collect do |record| record["body"] end) - assert_equal("#<Groonga::Expression noname($1:null)" + - "{1null,2body GET_VALUE,0\"drive\",0MATCH}>", - result.expression.inspect) + assert_equal(<<-INSPECTED.chomp, result.expression.inspect) +#<Groonga::Expression #<expr + vars:{ + $1:#<record:hash:Posts id:0(nonexistent)> + }, + codes:{ + 0:<push(), modify:1, value:#<record:hash:Posts id:0(nonexistent)>>, + 1:<get_value(), modify:2, value:#<column:var_size Posts.body range:Text type:scalar compress:none>>, + 2:<push(), modify:0, value:"drive">, + 3:<match(), modify:0, value:(NULL)> + } +>> + INSPECTED end def test_set_time Modified: test/test-expression.rb (+69 -14) =================================================================== --- test/test-expression.rb 2014-12-02 22:59:58 +0900 (c8f91f7) +++ test/test-expression.rb 2014-12-03 22:33:45 +0900 (8df23ba) @@ -77,8 +77,17 @@ class ExpressionTest < Test::Unit::TestCase expression.append_operation(Groonga::Operation::PLUS, 2) expression.compile - assert_equal("#<Groonga::Expression noname(){21,01,0PLUS}>", - expression.inspect) + assert_equal(<<-INSPECTED.chomp, expression.inspect) +#<Groonga::Expression #<expr + vars:{ + }, + codes:{ + 0:<push(), modify:2, value:1>, + 1:<push(), modify:0, value:1>, + 2:<plus(), modify:0, value:(NULL)> + } +>> + INSPECTED end def test_snippet @@ -162,14 +171,28 @@ class ExpressionTest < Test::Unit::TestCase @expression.append_object(Groonga["TokenBigram"], Groonga::Operator::PUSH, 1) - assert_equal("#<Groonga::Expression noname(){0TokenBigram}>", - @expression.inspect) + assert_equal(<<-INSPECTED.chomp, @expression.inspect) +#<Groonga::Expression #<expr + vars:{ + }, + codes:{ + 0:<push(), modify:0, value:#<proc:tokenizer TokenBigram arguments:[$1, $2, $3]>> + } +>> + INSPECTED end def test_name @expression.append_object(Groonga["TokenBigram"], "push", 1) - assert_equal("#<Groonga::Expression noname(){0TokenBigram}>", - @expression.inspect) + assert_equal(<<-INSPECTED.chomp, @expression.inspect) +#<Groonga::Expression #<expr + vars:{ + }, + codes:{ + 0:<push(), modify:0, value:#<proc:tokenizer TokenBigram arguments:[$1, $2, $3]>> + } +>> + INSPECTED end end end @@ -183,14 +206,28 @@ class ExpressionTest < Test::Unit::TestCase class OperatorTest < self def test_constant @expression.append_constant(29, Groonga::Operator::PUSH, 1) - assert_equal("#<Groonga::Expression noname(){029}>", - @expression.inspect) + assert_equal(<<-INSPECTED.chomp, @expression.inspect) +#<Groonga::Expression #<expr + vars:{ + }, + codes:{ + 0:<push(), modify:0, value:29> + } +>> + INSPECTED end def test_name @expression.append_constant(29, "push", 1) - assert_equal("#<Groonga::Expression noname(){029}>", - @expression.inspect) + assert_equal(<<-INSPECTED.chomp, @expression.inspect) +#<Groonga::Expression #<expr + vars:{ + }, + codes:{ + 0:<push(), modify:0, value:29> + } +>> + INSPECTED end end end @@ -205,14 +242,32 @@ class ExpressionTest < Test::Unit::TestCase def test_constant @expression.append_operation(Groonga::Operator::PLUS, 2) - assert_equal("#<Groonga::Expression noname(){229,092,0PLUS}>", - @expression.inspect) + assert_equal(<<-INSPECTED.chomp, @expression.inspect) +#<Groonga::Expression #<expr + vars:{ + }, + codes:{ + 0:<push(), modify:2, value:29>, + 1:<push(), modify:0, value:92>, + 2:<plus(), modify:0, value:(NULL)> + } +>> + INSPECTED end def test_name @expression.append_operation("plus", 2) - assert_equal("#<Groonga::Expression noname(){229,092,0PLUS}>", - @expression.inspect) + assert_equal(<<-INSPECTED.chomp, @expression.inspect) +#<Groonga::Expression #<expr + vars:{ + }, + codes:{ + 0:<push(), modify:2, value:29>, + 1:<push(), modify:0, value:92>, + 2:<plus(), modify:0, value:(NULL)> + } +>> + INSPECTED end end -------------- next part -------------- HTML����������������������������...Download