mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
Wed Jul 18 08:01:10 2012 Takeyuki FUJIOKA <xibbar@ruby-lang.org>
* test/rss/test_dublincore.rb: update test for CGI.escapeHTML. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36423 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
c47cca2f85
commit
08f46f0818
1 changed files with 6 additions and 16 deletions
|
@ -149,14 +149,8 @@ EOR
|
||||||
|
|
||||||
plural_suffix = dc_plural_suffix(name, check_backward_compatibility)
|
plural_suffix = dc_plural_suffix(name, check_backward_compatibility)
|
||||||
plural_reader = "dc_#{name}#{plural_suffix}"
|
plural_reader = "dc_#{name}#{plural_suffix}"
|
||||||
values = parent.__send__(plural_reader).collect do |x|
|
values = parent.__send__(plural_reader).collect(&:value)
|
||||||
val = x.value
|
value = CGI.unescapeHTML(value) if value.kind_of?(String)
|
||||||
if val.kind_of?(String)
|
|
||||||
CGI.escapeHTML(val)
|
|
||||||
else
|
|
||||||
val
|
|
||||||
end
|
|
||||||
end
|
|
||||||
assert_equal([value, value], values)
|
assert_equal([value, value], values)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -170,9 +164,7 @@ EOR
|
||||||
parent = chain_reader(feed, parent_readers)
|
parent = chain_reader(feed, parent_readers)
|
||||||
DC_ELEMENTS.each do |name, value|
|
DC_ELEMENTS.each do |name, value|
|
||||||
parsed_value = parent.__send__("dc_#{name}")
|
parsed_value = parent.__send__("dc_#{name}")
|
||||||
if parsed_value.kind_of?(String)
|
value = CGI.unescapeHTML(value) if value.kind_of?(String)
|
||||||
parsed_value = CGI.escapeHTML(parsed_value)
|
|
||||||
end
|
|
||||||
assert_equal(value, parsed_value)
|
assert_equal(value, parsed_value)
|
||||||
if name == :date
|
if name == :date
|
||||||
t = Time.iso8601("2003-01-01T02:30:23+09:00")
|
t = Time.iso8601("2003-01-01T02:30:23+09:00")
|
||||||
|
@ -206,9 +198,7 @@ EOR
|
||||||
parents.each do |parent_readers|
|
parents.each do |parent_readers|
|
||||||
parent = chain_reader(feed, parent_readers)
|
parent = chain_reader(feed, parent_readers)
|
||||||
parsed_value = parent.__send__("dc_#{name}")
|
parsed_value = parent.__send__("dc_#{name}")
|
||||||
if parsed_value.kind_of?(String)
|
value = CGI.unescapeHTML(value) if value.kind_of?(String)
|
||||||
parsed_value = CGI.escapeHTML(parsed_value)
|
|
||||||
end
|
|
||||||
assert_equal(value, parsed_value)
|
assert_equal(value, parsed_value)
|
||||||
|
|
||||||
plural_suffix = dc_plural_suffix(name, check_backward_compatibility)
|
plural_suffix = dc_plural_suffix(name, check_backward_compatibility)
|
||||||
|
@ -269,8 +259,8 @@ EOR
|
||||||
parent = feed_root.elements[target_xpath]
|
parent = feed_root.elements[target_xpath]
|
||||||
parent.each_element do |elem|
|
parent.each_element do |elem|
|
||||||
if elem.namespace == DC_URI
|
if elem.namespace == DC_URI
|
||||||
assert_equal(CGI.escapeHTML(elem.text),
|
assert_equal(elem.text,
|
||||||
DC_ELEMENTS[elem.name.intern].to_s)
|
CGI.unescapeHTML(DC_ELEMENTS[elem.name.intern].to_s))
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Add table
Reference in a new issue