diff --git a/activesupport/test/xml_mini/jdom_engine_test.rb b/activesupport/test/xml_mini/jdom_engine_test.rb index 816d57972c4fa1039344df424cf1eab64840b47e..66b15aed4a5c2973286484b5261418ce4d3dcd5b 100644 --- a/activesupport/test/xml_mini/jdom_engine_test.rb +++ b/activesupport/test/xml_mini/jdom_engine_test.rb @@ -4,17 +4,15 @@ require "active_support/core_ext/hash/conversions" class JDOMEngineTest < ActiveSupport::TestCase - include ActiveSupport - FILES_DIR = File.dirname(__FILE__) + "/../fixtures/xml" def setup - @default_backend = XmlMini.backend - XmlMini.backend = "JDOM" + @default_backend = ActiveSupport::XmlMini.backend + ActiveSupport::XmlMini.backend = "JDOM" end def teardown - XmlMini.backend = @default_backend + ActiveSupport::XmlMini.backend = @default_backend end def test_file_from_xml @@ -84,13 +82,13 @@ def test_exception_thrown_on_expansion_attack end def test_setting_JDOM_as_backend - XmlMini.backend = "JDOM" - assert_equal XmlMini_JDOM, XmlMini.backend + ActiveSupport::XmlMini.backend = "JDOM" + assert_equal ActiveSupport::XmlMini_JDOM, ActiveSupport::XmlMini.backend end def test_blank_returns_empty_hash - assert_equal({}, XmlMini.parse(nil)) - assert_equal({}, XmlMini.parse("")) + assert_equal({}, ActiveSupport::XmlMini.parse(nil)) + assert_equal({}, ActiveSupport::XmlMini.parse("")) end def test_array_type_makes_an_array @@ -175,8 +173,8 @@ def test_children_with_non_adjacent_text private def assert_equal_rexml(xml) - parsed_xml = XmlMini.parse(xml) - hash = XmlMini.with_backend("REXML") { XmlMini.parse(xml) } + parsed_xml = ActiveSupport::XmlMini.parse(xml) + hash = ActiveSupport::XmlMini.with_backend("REXML") { ActiveSupport::XmlMini.parse(xml) } assert_equal(hash, parsed_xml) end end diff --git a/activesupport/test/xml_mini/libxml_engine_test.rb b/activesupport/test/xml_mini/libxml_engine_test.rb index 81b0d3c407b49e54483e96ea6fb1b2e708fa45fa..ae3a5562e0fa38a3a3a4520d857244d4ed59b88c 100644 --- a/activesupport/test/xml_mini/libxml_engine_test.rb +++ b/activesupport/test/xml_mini/libxml_engine_test.rb @@ -8,17 +8,15 @@ require "active_support/core_ext/hash/conversions" class LibxmlEngineTest < ActiveSupport::TestCase - include ActiveSupport - def setup - @default_backend = XmlMini.backend - XmlMini.backend = "LibXML" + @default_backend = ActiveSupport::XmlMini.backend + ActiveSupport::XmlMini.backend = "LibXML" LibXML::XML::Error.set_handler(&lambda { |error| }) #silence libxml, exceptions will do end def teardown - XmlMini.backend = @default_backend + ActiveSupport::XmlMini.backend = @default_backend end def test_exception_thrown_on_expansion_attack @@ -42,13 +40,13 @@ def test_exception_thrown_on_expansion_attack end def test_setting_libxml_as_backend - XmlMini.backend = "LibXML" - assert_equal XmlMini_LibXML, XmlMini.backend + ActiveSupport::XmlMini.backend = "LibXML" + assert_equal ActiveSupport::XmlMini_LibXML, ActiveSupport::XmlMini.backend end def test_blank_returns_empty_hash - assert_equal({}, XmlMini.parse(nil)) - assert_equal({}, XmlMini.parse("")) + assert_equal({}, ActiveSupport::XmlMini.parse(nil)) + assert_equal({}, ActiveSupport::XmlMini.parse("")) end def test_array_type_makes_an_array @@ -193,9 +191,9 @@ def test_children_with_blank_text_and_attribute private def assert_equal_rexml(xml) - parsed_xml = XmlMini.parse(xml) + parsed_xml = ActiveSupport::XmlMini.parse(xml) xml.rewind if xml.respond_to?(:rewind) - hash = XmlMini.with_backend("REXML") { XmlMini.parse(xml) } + hash = ActiveSupport::XmlMini.with_backend("REXML") { ActiveSupport::XmlMini.parse(xml) } assert_equal(hash, parsed_xml) end end diff --git a/activesupport/test/xml_mini/libxmlsax_engine_test.rb b/activesupport/test/xml_mini/libxmlsax_engine_test.rb index e25fa2813c3609e552a12aed787d6ff7c7246125..f52afd273e3e2a6aec9eeda2d834f4648068f1f3 100644 --- a/activesupport/test/xml_mini/libxmlsax_engine_test.rb +++ b/activesupport/test/xml_mini/libxmlsax_engine_test.rb @@ -8,15 +8,13 @@ require "active_support/core_ext/hash/conversions" class LibXMLSAXEngineTest < ActiveSupport::TestCase - include ActiveSupport - def setup - @default_backend = XmlMini.backend - XmlMini.backend = "LibXMLSAX" + @default_backend = ActiveSupport::XmlMini.backend + ActiveSupport::XmlMini.backend = "LibXMLSAX" end def teardown - XmlMini.backend = @default_backend + ActiveSupport::XmlMini.backend = @default_backend end def test_exception_thrown_on_expansion_attack @@ -42,13 +40,13 @@ def test_exception_thrown_on_expansion_attack end def test_setting_libxml_as_backend - XmlMini.backend = "LibXMLSAX" - assert_equal XmlMini_LibXMLSAX, XmlMini.backend + ActiveSupport::XmlMini.backend = "LibXMLSAX" + assert_equal ActiveSupport::XmlMini_LibXMLSAX, ActiveSupport::XmlMini.backend end def test_blank_returns_empty_hash - assert_equal({}, XmlMini.parse(nil)) - assert_equal({}, XmlMini.parse("")) + assert_equal({}, ActiveSupport::XmlMini.parse(nil)) + assert_equal({}, ActiveSupport::XmlMini.parse("")) end def test_array_type_makes_an_array @@ -185,9 +183,9 @@ def test_children_with_blank_text private def assert_equal_rexml(xml) - parsed_xml = XmlMini.parse(xml) + parsed_xml = ActiveSupport::XmlMini.parse(xml) xml.rewind if xml.respond_to?(:rewind) - hash = XmlMini.with_backend("REXML") { XmlMini.parse(xml) } + hash = ActiveSupport::XmlMini.with_backend("REXML") { ActiveSupport::XmlMini.parse(xml) } assert_equal(hash, parsed_xml) end end