diff options
| author | Willem van Bergen <willem@vanbergen.org> | 2010-01-01 13:44:42 +0100 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2010-01-01 13:18:03 -0800 |
| commit | 689984ddd3a482b5c0986fdf1889323f096050fa (patch) | |
| tree | fdccbe76a57e6ef2847da5375ae586a462acea7a /activesupport/test | |
| parent | 96a2b3905ce14df8f25b1646d3b110505bf8820b (diff) | |
| download | rails-689984ddd3a482b5c0986fdf1889323f096050fa.tar.gz rails-689984ddd3a482b5c0986fdf1889323f096050fa.tar.bz2 rails-689984ddd3a482b5c0986fdf1889323f096050fa.zip | |
Fixed some bugs and fixed some tests in new SAX-based XmlMini backends.
[#3636 state:committed]
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Diffstat (limited to 'activesupport/test')
| -rw-r--r-- | activesupport/test/core_ext/hash_ext_test.rb | 8 | ||||
| -rw-r--r-- | activesupport/test/xml_mini/libxmlsax_engine_test.rb | 8 | ||||
| -rw-r--r-- | activesupport/test/xml_mini/nokogirisax_engine_test.rb | 5 |
3 files changed, 12 insertions, 9 deletions
diff --git a/activesupport/test/core_ext/hash_ext_test.rb b/activesupport/test/core_ext/hash_ext_test.rb index 4642bb1330..5b1d53ac7b 100644 --- a/activesupport/test/core_ext/hash_ext_test.rb +++ b/activesupport/test/core_ext/hash_ext_test.rb @@ -902,9 +902,11 @@ class HashToXmlTest < Test::Unit::TestCase def test_expansion_count_is_limited expected = { - 'ActiveSupport::XmlMini_REXML' => 'RuntimeError', - 'ActiveSupport::XmlMini_Nokogiri' => 'Nokogiri::XML::SyntaxError', - 'ActiveSupport::XmlMini_LibXML' => 'LibXML::XML::Error', + 'ActiveSupport::XmlMini_REXML' => 'RuntimeError', + 'ActiveSupport::XmlMini_Nokogiri' => 'Nokogiri::XML::SyntaxError', + 'ActiveSupport::XmlMini_NokogiriSAX' => 'RuntimeError', + 'ActiveSupport::XmlMini_LibXML' => 'LibXML::XML::Error', + 'ActiveSupport::XmlMini_LibXMLSAX' => 'LibXML::XML::Error', }[ActiveSupport::XmlMini.backend.name].constantize assert_raise expected do diff --git a/activesupport/test/xml_mini/libxmlsax_engine_test.rb b/activesupport/test/xml_mini/libxmlsax_engine_test.rb index 6d5b3673fa..864810099e 100644 --- a/activesupport/test/xml_mini/libxmlsax_engine_test.rb +++ b/activesupport/test/xml_mini/libxmlsax_engine_test.rb @@ -14,8 +14,6 @@ class LibXMLSAXEngineTest < Test::Unit::TestCase def setup @default_backend = XmlMini.backend XmlMini.backend = 'LibXMLSAX' - - LibXML::XML::Error.set_handler(&lambda { |error| }) #silence libxml, exceptions will do end def teardown @@ -24,7 +22,8 @@ class LibXMLSAXEngineTest < Test::Unit::TestCase def test_exception_thrown_on_expansion_attack assert_raise LibXML::XML::Error do - attack_xml = %{<?xml version="1.0" encoding="UTF-8"?> + attack_xml = <<-EOT + <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE member [ <!ENTITY a "&b;&b;&b;&b;&b;&b;&b;&b;&b;&b;"> <!ENTITY b "&c;&c;&c;&c;&c;&c;&c;&c;&c;&c;"> @@ -37,7 +36,8 @@ class LibXMLSAXEngineTest < Test::Unit::TestCase <member> &a; </member> - } + EOT + Hash.from_xml(attack_xml) end end diff --git a/activesupport/test/xml_mini/nokogirisax_engine_test.rb b/activesupport/test/xml_mini/nokogirisax_engine_test.rb index 43f1cda0e0..1149d0fecc 100644 --- a/activesupport/test/xml_mini/nokogirisax_engine_test.rb +++ b/activesupport/test/xml_mini/nokogirisax_engine_test.rb @@ -8,7 +8,7 @@ rescue LoadError # Skip nokogiri tests else -class NokogiriEngineTest < Test::Unit::TestCase +class NokogiriSAXEngineTest < Test::Unit::TestCase include ActiveSupport def setup @@ -36,7 +36,7 @@ class NokogiriEngineTest < Test::Unit::TestCase end def test_exception_thrown_on_expansion_attack - assert_raise Nokogiri::XML::SyntaxError do + assert_raise RuntimeError do attack_xml = <<-EOT <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE member [ @@ -52,6 +52,7 @@ class NokogiriEngineTest < Test::Unit::TestCase &a; </member> EOT + Hash.from_xml(attack_xml) end end |