null+****@clear*****
null+****@clear*****
2010年 6月 25日 (金) 15:32:34 JST
Kouhei Sutou 2010-06-25 06:32:34 +0000 (Fri, 25 Jun 2010)
New Revision: e37597b401e0a28934707d49cf0f918177c93331
Log:
follow XML format change.
Modified files:
test/unit/http/test-http-select-basic.rb
Modified: test/unit/http/test-http-select-basic.rb (+31 -26)
===================================================================
--- test/unit/http/test-http-select-basic.rb 2010-06-25 06:26:47 +0000 (1346a05)
+++ test/unit/http/test-http-select-basic.rb 2010-06-25 06:32:34 +0000 (63facd6)
@@ -785,32 +785,37 @@ EOF
load_many_users
expected = <<EOF
<?xml version="1.0" encoding="utf-8"?>
-<SEGMENTS>
-<SEGMENT>
-<RESULTPAGE>
-<RESULTSET OFFSET="2" LIMIT="3" NHITS="5">
-<HIT NO="3">
-<FIELD NAME="_id">1</FIELD>
-<FIELD NAME="_key">moritan</FIELD>
-<FIELD NAME="real_name">モリタン</FIELD>
-<FIELD NAME="hp">100</FIELD>
-</HIT>
-<HIT NO="4">
-<FIELD NAME="_id">3</FIELD>
-<FIELD NAME="_key">ryoqun</FIELD>
-<FIELD NAME="real_name">Ryo Onodera</FIELD>
-<FIELD NAME="hp">200</FIELD>
-</HIT>
-<HIT NO="5">
-<FIELD NAME="_id">2</FIELD>
-<FIELD NAME="_key">taporobo</FIELD>
-<FIELD NAME="real_name">タポロボ</FIELD>
-<FIELD NAME="hp">100</FIELD>
-</HIT>
-</RESULTSET>
-</RESULTPAGE>
-</SEGMENT>
-</SEGMENTS>
+<RESULT CODE="0" UP="0.0" ELAPSED="0.0"><RESULTPAGE>
+<RESULTSET>
+<NHITS>5</NHITS>
+<COLUMNS>
+<COLUMN>
+<TEXT>_id</TEXT>
+<TEXT>UInt32</TEXT></COLUMN>
+<COLUMN>
+<TEXT>_key</TEXT>
+<TEXT>ShortText</TEXT></COLUMN>
+<COLUMN>
+<TEXT>real_name</TEXT>
+<TEXT>ShortText</TEXT></COLUMN>
+<COLUMN>
+<TEXT>hp</TEXT>
+<TEXT>Int32</TEXT></COLUMN></COLUMNS>
+<HIT>
+<INT>1</INT>
+<TEXT>moritan</TEXT>
+<TEXT>モリタン</TEXT>
+<INT>100</INT></HIT>
+<HIT>
+<INT>3</INT>
+<TEXT>ryoqun</TEXT>
+<TEXT>Ryo Onodera</TEXT>
+<INT>200</INT></HIT>
+<HIT>
+<INT>2</INT>
+<TEXT>taporobo</TEXT>
+<TEXT>タポロボ</TEXT>
+<INT>100</INT></HIT></RESULTSET></RESULTPAGE></RESULT>
EOF
assert_select_xml(expected.strip,
{:table => "users", :sortby => "_key", :offset => 2,