null+****@clear*****
null+****@clear*****
2010年 7月 5日 (月) 17:27:02 JST
Kouhei Sutou 2010-07-05 08:27:02 +0000 (Mon, 05 Jul 2010) New Revision: 80d462c509523ef4b91562f3f1a5b62db8df91e4 Log: follow HTML output change in gqtp. Modified files: test/unit/gqtp/test-load.rb Modified: test/unit/gqtp/test-load.rb (+29 -36) =================================================================== --- test/unit/gqtp/test-load.rb 2010-07-05 08:26:58 +0000 (cb401c3) +++ test/unit/gqtp/test-load.rb 2010-07-05 08:27:02 +0000 (2236064) @@ -29,10 +29,9 @@ class LoadTest < Test::Unit::TestCase def test_table_with_key_with_no_column assert_commands(<<EXPECTED, <<COMMANDS) -[[0,0.0,0.0]] -[[0,0.0,0.0],2] -[[0,0.0,0.0],[[[2],[["_id","UInt32"],["_key","ShortText"]],[2,"bash"],[1,"gcc"]]]] -[[0,0.0,0.0]] +[true] +[2] +[[[2],[["_id","UInt32"],["_key","ShortText"]],[2,"bash"],[1,"gcc"]]] EXPECTED table_create commands 1 ShortText load --table commands @@ -47,11 +46,10 @@ COMMANDS def test_table_with_key_with_one_column assert_commands(<<EXPECTED, <<COMMANDS) -[[0,0.0,0.0]] -[[0,0.0,0.0]] -[[0,0.0,0.0],2] -[[0,0.0,0.0],[[[2],[["_id","UInt32"],["_key","ShortText"],["body","ShortText"]],[2,"bash","a shell"],[1,"gcc","a compiler"]]]] -[[0,0.0,0.0]] +[true] +[true] +[2] +[[[2],[["_id","UInt32"],["_key","ShortText"],["body","ShortText"]],[2,"bash","a shell"],[1,"gcc","a compiler"]]] EXPECTED table_create commands 1 ShortText column_create commands body 0 ShortText @@ -67,12 +65,11 @@ COMMANDS def test_table_with_key_with_two_columns assert_commands(<<EXPECTED, <<COMMANDS) -[[0,0.0,0.0]] -[[0,0.0,0.0]] -[[0,0.0,0.0]] -[[0,0.0,0.0],2] -[[0,0.0,0.0],[[[2],[["_id","UInt32"],["_key","ShortText"],["location","ShortText"],["body","ShortText"]],[2,"bash","/bin/bash","a shell"],[1,"gcc","/usr/bin/gcc","a compiler"]]]] -[[0,0.0,0.0]] +[true] +[true] +[true] +[2] +[[[2],[["_id","UInt32"],["_key","ShortText"],["location","ShortText"],["body","ShortText"]],[2,"bash","/bin/bash","a shell"],[1,"gcc","/usr/bin/gcc","a compiler"]]] EXPECTED table_create commands 1 ShortText column_create commands body 0 ShortText @@ -89,12 +86,11 @@ COMMANDS def test_key_at_not_first_position assert_commands(<<EXPECTED, <<COMMANDS) -[[0,0.0,0.0]] -[[0,0.0,0.0]] -[[0,0.0,0.0]] -[[0,0.0,0.0],2] -[[0,0.0,0.0],[[[2],[["_id","UInt32"],["_key","ShortText"],["location","ShortText"],["body","ShortText"]],[2,"bash","/bin/bash","a shell"],[1,"gcc","/usr/bin/gcc","a compiler"]]]] -[[0,0.0,0.0]] +[true] +[true] +[true] +[2] +[[[2],[["_id","UInt32"],["_key","ShortText"],["location","ShortText"],["body","ShortText"]],[2,"bash","/bin/bash","a shell"],[1,"gcc","/usr/bin/gcc","a compiler"]]] EXPECTED table_create commands 1 ShortText column_create commands body 0 ShortText @@ -111,10 +107,9 @@ COMMANDS def test_table_with_no_key_with_no_column assert_commands(<<EXPECTED, <<COMMANDS) -[[0,0.0,0.0]] -[[0,0.0,0.0],2] -[[0,0.0,0.0],[[[2],[["_id","UInt32"]],[1],[2]]]] -[[0,0.0,0.0]] +[true] +[2] +[[[2],[["_id","UInt32"]],[1],[2]]] EXPECTED table_create commands 3 load --table commands @@ -129,11 +124,10 @@ COMMANDS def test_table_with_no_key_with_one_column assert_commands(<<EXPECTED, <<COMMANDS) -[[0,0.0,0.0]] -[[0,0.0,0.0]] -[[0,0.0,0.0],2] -[[0,0.0,0.0],[[[2],[["_id","UInt32"],["body","ShortText"]],[1,\"a compiler\"],[2,\"a shell\"]]]] -[[0,0.0,0.0]] +[true] +[true] +[2] +[[[2],[["_id","UInt32"],["body","ShortText"]],[1,\"a compiler\"],[2,\"a shell\"]]] EXPECTED table_create commands 3 column_create commands body 0 ShortText @@ -149,12 +143,11 @@ COMMANDS def test_table_with_no_key_with_two_columns assert_commands(<<EXPECTED, <<COMMANDS) -[[0,0.0,0.0]] -[[0,0.0,0.0]] -[[0,0.0,0.0]] -[[0,0.0,0.0],2] -[[0,0.0,0.0],[[[2],[["_id","UInt32"],["location","ShortText"],["body","ShortText"]],[1,"/usr/bin/gcc","a compiler"],[2,"/bin/bash","a shell"]]]] -[[0,0.0,0.0]] +[true] +[true] +[true] +[2] +[[[2],[["_id","UInt32"],["location","ShortText"],["body","ShortText"]],[1,"/usr/bin/gcc","a compiler"],[2,"/bin/bash","a shell"]]] EXPECTED table_create commands 3 column_create commands body 0 ShortText