diff options
56 files changed, 61 insertions, 60 deletions
diff --git a/test/rexml/rexml_test_utils.rb b/test/rexml/rexml_test_utils.rb index 916e73674d..57fe65ca73 100644 --- a/test/rexml/rexml_test_utils.rb +++ b/test/rexml/rexml_test_utils.rb @@ -1,3 +1,4 @@ +require 'test/unit' module REXMLTestUtils def fixture_path(*components) File.join(File.dirname(__FILE__), "data", *components) diff --git a/test/rexml/test_contrib.rb b/test/rexml/test_contrib.rb index db7c18d027..356dfc1425 100644 --- a/test/rexml/test_contrib.rb +++ b/test/rexml/test_contrib.rb @@ -1,6 +1,6 @@ # coding: binary -require "rexml_test_utils" +require_relative "rexml_test_utils" require "rexml/document" require "rexml/parseexception" diff --git a/test/rexml/test_core.rb b/test/rexml/test_core.rb index 0865aa9747..7040ad60bf 100644 --- a/test/rexml/test_core.rb +++ b/test/rexml/test_core.rb @@ -1,6 +1,6 @@ # coding: binary -require "rexml_test_utils" +require_relative "rexml_test_utils" require "rexml/document" require "rexml/parseexception" @@ -9,7 +9,7 @@ require "rexml/source" require "rexml/formatters/pretty" require "rexml/undefinednamespaceexception" -require "listener" +require_relative "listener" class Tester < Test::Unit::TestCase include REXMLTestUtils diff --git a/test/rexml/test_encoding.rb b/test/rexml/test_encoding.rb index 9bcdfb3118..a3fda1e392 100644 --- a/test/rexml/test_encoding.rb +++ b/test/rexml/test_encoding.rb @@ -1,6 +1,6 @@ # coding: binary -require "rexml_test_utils" +require_relative "rexml_test_utils" require 'rexml/source' require 'rexml/document' diff --git a/test/rexml/test_jaxen.rb b/test/rexml/test_jaxen.rb index 222cf79c60..05cb818a6b 100644 --- a/test/rexml/test_jaxen.rb +++ b/test/rexml/test_jaxen.rb @@ -1,4 +1,4 @@ -require 'rexml_test_utils' +require_relative 'rexml_test_utils' require "rexml/document" require "rexml/xpath" diff --git a/test/rexml/test_light.rb b/test/rexml/test_light.rb index 1b56159254..9ce0fb52d8 100644 --- a/test/rexml/test_light.rb +++ b/test/rexml/test_light.rb @@ -1,4 +1,4 @@ -require "rexml_test_utils" +require_relative "rexml_test_utils" require "rexml/light/node" require "rexml/parsers/lightparser" diff --git a/test/rexml/test_lightparser.rb b/test/rexml/test_lightparser.rb index 1728921434..c32c1b8ee7 100644 --- a/test/rexml/test_lightparser.rb +++ b/test/rexml/test_lightparser.rb @@ -1,4 +1,4 @@ -require 'rexml_test_utils' +require_relative 'rexml_test_utils' require 'rexml/parsers/lightparser' class LightParserTester < Test::Unit::TestCase diff --git a/test/rexml/test_listener.rb b/test/rexml/test_listener.rb index 0afbdcd5ff..a3d763c5da 100644 --- a/test/rexml/test_listener.rb +++ b/test/rexml/test_listener.rb @@ -1,6 +1,6 @@ # coding: binary -require 'rexml_test_utils' +require_relative 'rexml_test_utils' require 'rexml/document' require 'rexml/streamlistener' @@ -82,16 +82,16 @@ class BaseTester < Test::Unit::TestCase end def test_accents - source = '<?xml version="1.0" encoding="ISO-8859-1"?> + source = %[<?xml version="1.0" encoding="ISO-8859-1"?> <g> -<f a="é" /> -</g>' +<f a="\xE9" /> +</g>] doc = REXML::Document.new( source ) a = doc.elements['/g/f'].attribute('a') if a.value.respond_to? :force_encoding a.value.force_encoding('binary') end - assert_equal( 'é', a.value) + assert_equal( "\xC3\xA9", a.value) doc = REXML::Document.parse_stream( File::new(fixture_path("stream_accents.xml")), AccentListener::new diff --git a/test/rexml/test_namespace.rb b/test/rexml/test_namespace.rb index 6ab16b6342..f855203fc8 100644 --- a/test/rexml/test_namespace.rb +++ b/test/rexml/test_namespace.rb @@ -1,4 +1,4 @@ -require "rexml_test_utils" +require_relative "rexml_test_utils" require "rexml/document" diff --git a/test/rexml/test_order.rb b/test/rexml/test_order.rb index 3f874c2052..3fcbf9778b 100644 --- a/test/rexml/test_order.rb +++ b/test/rexml/test_order.rb @@ -1,4 +1,4 @@ -require 'rexml_test_utils' +require_relative 'rexml_test_utils' require 'rexml/document' begin require 'zlib' diff --git a/test/rexml/test_rexml_issuezilla.rb b/test/rexml/test_rexml_issuezilla.rb index a0ebfa77dd..2a12006bac 100644 --- a/test/rexml/test_rexml_issuezilla.rb +++ b/test/rexml/test_rexml_issuezilla.rb @@ -1,4 +1,4 @@ -require 'rexml_test_utils' +require_relative 'rexml_test_utils' require 'rexml/document' class TestIssuezillaParsing < Test::Unit::TestCase diff --git a/test/rexml/test_sax.rb b/test/rexml/test_sax.rb index 8873e1703d..4a9db404d0 100644 --- a/test/rexml/test_sax.rb +++ b/test/rexml/test_sax.rb @@ -1,4 +1,4 @@ -require "rexml_test_utils" +require_relative "rexml_test_utils" require 'rexml/sax2listener' require 'rexml/parsers/sax2parser' require 'rexml/document' diff --git a/test/rexml/test_xpath.rb b/test/rexml/test_xpath.rb index 4ccd4edeaf..927909a5f2 100644 --- a/test/rexml/test_xpath.rb +++ b/test/rexml/test_xpath.rb @@ -1,4 +1,4 @@ -require "rexml_test_utils" +require_relative "rexml_test_utils" require "rexml/document" diff --git a/test/rss/rss-testcase.rb b/test/rss/rss-testcase.rb index 4943fc9017..2e39433d4a 100644 --- a/test/rss/rss-testcase.rb +++ b/test/rss/rss-testcase.rb @@ -1,7 +1,7 @@ require "erb" require "test/unit" -require 'rss-assertions' +require_relative 'rss-assertions' require "rss" diff --git a/test/rss/test_1.0.rb b/test/rss/test_1.0.rb index cb9f715eec..758eecf51d 100644 --- a/test/rss/test_1.0.rb +++ b/test/rss/test_1.0.rb @@ -1,6 +1,6 @@ require "rexml/document" -require "rss-testcase" +require_relative "rss-testcase" require "rss/1.0" diff --git a/test/rss/test_2.0.rb b/test/rss/test_2.0.rb index 5695110e81..37285cefa3 100644 --- a/test/rss/test_2.0.rb +++ b/test/rss/test_2.0.rb @@ -1,6 +1,6 @@ require "rexml/document" -require "rss-testcase" +require_relative "rss-testcase" module RSS class TestRSS20Core < TestCase diff --git a/test/rss/test_accessor.rb b/test/rss/test_accessor.rb index f2b8508a6d..ea15316a5d 100644 --- a/test/rss/test_accessor.rb +++ b/test/rss/test_accessor.rb @@ -1,4 +1,4 @@ -require "rss-testcase" +require_relative "rss-testcase" require "rss/1.0" require "rss/2.0" diff --git a/test/rss/test_atom.rb b/test/rss/test_atom.rb index e0ae108698..557cb80324 100644 --- a/test/rss/test_atom.rb +++ b/test/rss/test_atom.rb @@ -1,6 +1,6 @@ require "rexml/document" -require "rss-testcase" +require_relative "rss-testcase" require "rss/atom" diff --git a/test/rss/test_content.rb b/test/rss/test_content.rb index f59b0c8e83..13f22a2152 100644 --- a/test/rss/test_content.rb +++ b/test/rss/test_content.rb @@ -1,7 +1,7 @@ require "cgi" require "rexml/document" -require "rss-testcase" +require_relative "rss-testcase" require "rss/content" diff --git a/test/rss/test_dublincore.rb b/test/rss/test_dublincore.rb index dcafdd3932..eb03d84957 100644 --- a/test/rss/test_dublincore.rb +++ b/test/rss/test_dublincore.rb @@ -1,7 +1,7 @@ require "cgi" require "rexml/document" -require "rss-testcase" +require_relative "rss-testcase" require "rss/1.0" require "rss/dublincore" diff --git a/test/rss/test_image.rb b/test/rss/test_image.rb index 101b7ffda2..d8f0b26103 100644 --- a/test/rss/test_image.rb +++ b/test/rss/test_image.rb @@ -1,7 +1,7 @@ require "cgi" require "rexml/document" -require "rss-testcase" +require_relative "rss-testcase" require "rss/1.0" require "rss/image" diff --git a/test/rss/test_inherit.rb b/test/rss/test_inherit.rb index f73096f478..8b640dc319 100644 --- a/test/rss/test_inherit.rb +++ b/test/rss/test_inherit.rb @@ -1,4 +1,4 @@ -require "rss-testcase" +require_relative "rss-testcase" require "rss/1.0" diff --git a/test/rss/test_itunes.rb b/test/rss/test_itunes.rb index 283459d910..ec06337f7d 100644 --- a/test/rss/test_itunes.rb +++ b/test/rss/test_itunes.rb @@ -1,7 +1,7 @@ require "cgi" require "rexml/document" -require "rss-testcase" +require_relative "rss-testcase" require "rss/2.0" require "rss/itunes" diff --git a/test/rss/test_maker_0.9.rb b/test/rss/test_maker_0.9.rb index c36a0be580..f6e39c60b7 100644 --- a/test/rss/test_maker_0.9.rb +++ b/test/rss/test_maker_0.9.rb @@ -1,4 +1,4 @@ -require "rss-testcase" +require_relative "rss-testcase" require "rss/maker" diff --git a/test/rss/test_maker_1.0.rb b/test/rss/test_maker_1.0.rb index b465556979..b31abb9908 100644 --- a/test/rss/test_maker_1.0.rb +++ b/test/rss/test_maker_1.0.rb @@ -1,4 +1,4 @@ -require "rss-testcase" +require_relative "rss-testcase" require "rss/maker" diff --git a/test/rss/test_maker_2.0.rb b/test/rss/test_maker_2.0.rb index 530c3cc85f..48c0f91f48 100644 --- a/test/rss/test_maker_2.0.rb +++ b/test/rss/test_maker_2.0.rb @@ -1,4 +1,4 @@ -require "rss-testcase" +require_relative "rss-testcase" require "rss/maker" diff --git a/test/rss/test_maker_atom_entry.rb b/test/rss/test_maker_atom_entry.rb index 4275bdc685..9618723e62 100644 --- a/test/rss/test_maker_atom_entry.rb +++ b/test/rss/test_maker_atom_entry.rb @@ -1,4 +1,4 @@ -require "rss-testcase" +require_relative "rss-testcase" require "rss/maker" diff --git a/test/rss/test_maker_atom_feed.rb b/test/rss/test_maker_atom_feed.rb index 58a55c43ff..d86600113d 100644 --- a/test/rss/test_maker_atom_feed.rb +++ b/test/rss/test_maker_atom_feed.rb @@ -1,4 +1,4 @@ -require "rss-testcase" +require_relative "rss-testcase" require "rss/maker" diff --git a/test/rss/test_maker_content.rb b/test/rss/test_maker_content.rb index 393adcb715..ba884f16a3 100644 --- a/test/rss/test_maker_content.rb +++ b/test/rss/test_maker_content.rb @@ -1,4 +1,4 @@ -require "rss-testcase" +require_relative "rss-testcase" require "rss/maker" diff --git a/test/rss/test_maker_dc.rb b/test/rss/test_maker_dc.rb index 626ec8d753..977350ca75 100644 --- a/test/rss/test_maker_dc.rb +++ b/test/rss/test_maker_dc.rb @@ -1,4 +1,4 @@ -require "rss-testcase" +require_relative "rss-testcase" require "rss/maker" diff --git a/test/rss/test_maker_image.rb b/test/rss/test_maker_image.rb index 4fba2cf795..d01654c91b 100644 --- a/test/rss/test_maker_image.rb +++ b/test/rss/test_maker_image.rb @@ -1,4 +1,4 @@ -require "rss-testcase" +require_relative "rss-testcase" require "rss/maker" diff --git a/test/rss/test_maker_itunes.rb b/test/rss/test_maker_itunes.rb index 21a4dd1f29..f19e30d012 100644 --- a/test/rss/test_maker_itunes.rb +++ b/test/rss/test_maker_itunes.rb @@ -1,4 +1,4 @@ -require "rss-testcase" +require_relative "rss-testcase" require "rss/maker" diff --git a/test/rss/test_maker_slash.rb b/test/rss/test_maker_slash.rb index f2fbf9a231..ea95a99b68 100644 --- a/test/rss/test_maker_slash.rb +++ b/test/rss/test_maker_slash.rb @@ -1,4 +1,4 @@ -require "rss-testcase" +require_relative "rss-testcase" require "rss/maker" diff --git a/test/rss/test_maker_sy.rb b/test/rss/test_maker_sy.rb index 3f026b5c9c..7117e3af0c 100644 --- a/test/rss/test_maker_sy.rb +++ b/test/rss/test_maker_sy.rb @@ -1,4 +1,4 @@ -require "rss-testcase" +require_relative "rss-testcase" require "rss/maker" diff --git a/test/rss/test_maker_taxo.rb b/test/rss/test_maker_taxo.rb index c5cf18adc1..4c4c2e336a 100644 --- a/test/rss/test_maker_taxo.rb +++ b/test/rss/test_maker_taxo.rb @@ -1,4 +1,4 @@ -require "rss-testcase" +require_relative "rss-testcase" require "rss/maker" diff --git a/test/rss/test_maker_trackback.rb b/test/rss/test_maker_trackback.rb index d9fe2ad01d..411bf319ca 100644 --- a/test/rss/test_maker_trackback.rb +++ b/test/rss/test_maker_trackback.rb @@ -1,4 +1,4 @@ -require "rss-testcase" +require_relative "rss-testcase" require "rss/maker" diff --git a/test/rss/test_maker_xml-stylesheet.rb b/test/rss/test_maker_xml-stylesheet.rb index c1dd6f71ed..4f7c62aaeb 100644 --- a/test/rss/test_maker_xml-stylesheet.rb +++ b/test/rss/test_maker_xml-stylesheet.rb @@ -1,4 +1,4 @@ -require "rss-testcase" +require_relative "rss-testcase" require "rss/maker" diff --git a/test/rss/test_parser.rb b/test/rss/test_parser.rb index e9ab668214..833146b980 100644 --- a/test/rss/test_parser.rb +++ b/test/rss/test_parser.rb @@ -1,6 +1,6 @@ require "tempfile" -require "rss-testcase" +require_relative "rss-testcase" require "rss/1.0" require "rss/dublincore" diff --git a/test/rss/test_parser_1.0.rb b/test/rss/test_parser_1.0.rb index dca10e6f40..2efecdaf35 100644 --- a/test/rss/test_parser_1.0.rb +++ b/test/rss/test_parser_1.0.rb @@ -1,4 +1,4 @@ -require "rss-testcase" +require_relative "rss-testcase" require "rss/1.0" require "rss/dublincore" diff --git a/test/rss/test_parser_2.0.rb b/test/rss/test_parser_2.0.rb index 249347d3dc..68c7d1cca0 100644 --- a/test/rss/test_parser_2.0.rb +++ b/test/rss/test_parser_2.0.rb @@ -1,4 +1,4 @@ -require "rss-testcase" +require_relative "rss-testcase" require "rss/2.0" diff --git a/test/rss/test_parser_atom_entry.rb b/test/rss/test_parser_atom_entry.rb index c2572d7a3b..352fbbe7f9 100644 --- a/test/rss/test_parser_atom_entry.rb +++ b/test/rss/test_parser_atom_entry.rb @@ -1,4 +1,4 @@ -require "rss-testcase" +require_relative "rss-testcase" require "rss/atom" diff --git a/test/rss/test_parser_atom_feed.rb b/test/rss/test_parser_atom_feed.rb index 4358cc8898..a5731b2f67 100644 --- a/test/rss/test_parser_atom_feed.rb +++ b/test/rss/test_parser_atom_feed.rb @@ -1,4 +1,4 @@ -require "rss-testcase" +require_relative "rss-testcase" require "rss/atom" diff --git a/test/rss/test_setup_maker_0.9.rb b/test/rss/test_setup_maker_0.9.rb index 0bcb0cbdc9..2714b9cece 100644 --- a/test/rss/test_setup_maker_0.9.rb +++ b/test/rss/test_setup_maker_0.9.rb @@ -1,4 +1,4 @@ -require "rss-testcase" +require_relative "rss-testcase" require "rss/maker" diff --git a/test/rss/test_setup_maker_1.0.rb b/test/rss/test_setup_maker_1.0.rb index 9f7bb1c1e8..0408ca911e 100644 --- a/test/rss/test_setup_maker_1.0.rb +++ b/test/rss/test_setup_maker_1.0.rb @@ -1,4 +1,4 @@ -require "rss-testcase" +require_relative "rss-testcase" require "rss/maker" diff --git a/test/rss/test_setup_maker_2.0.rb b/test/rss/test_setup_maker_2.0.rb index 17a066a8a0..fcf1f57836 100644 --- a/test/rss/test_setup_maker_2.0.rb +++ b/test/rss/test_setup_maker_2.0.rb @@ -1,4 +1,4 @@ -require "rss-testcase" +require_relative "rss-testcase" require "rss/maker" diff --git a/test/rss/test_setup_maker_atom_entry.rb b/test/rss/test_setup_maker_atom_entry.rb index 6f3df65f3f..ec9df5e70a 100644 --- a/test/rss/test_setup_maker_atom_entry.rb +++ b/test/rss/test_setup_maker_atom_entry.rb @@ -1,4 +1,4 @@ -require "rss-testcase" +require_relative "rss-testcase" require "rss/maker" diff --git a/test/rss/test_setup_maker_atom_feed.rb b/test/rss/test_setup_maker_atom_feed.rb index 978b3cf123..ad2c6939d2 100644 --- a/test/rss/test_setup_maker_atom_feed.rb +++ b/test/rss/test_setup_maker_atom_feed.rb @@ -1,4 +1,4 @@ -require "rss-testcase" +require_relative "rss-testcase" require "rss/maker" diff --git a/test/rss/test_setup_maker_itunes.rb b/test/rss/test_setup_maker_itunes.rb index 1f0372d6e7..509d94f13b 100644 --- a/test/rss/test_setup_maker_itunes.rb +++ b/test/rss/test_setup_maker_itunes.rb @@ -1,4 +1,4 @@ -require "rss-testcase" +require_relative "rss-testcase" require "rss/maker" diff --git a/test/rss/test_setup_maker_slash.rb b/test/rss/test_setup_maker_slash.rb index 07fa5bb342..cd12db9f91 100644 --- a/test/rss/test_setup_maker_slash.rb +++ b/test/rss/test_setup_maker_slash.rb @@ -1,4 +1,4 @@ -require "rss-testcase" +require_relative "rss-testcase" require "rss/maker" diff --git a/test/rss/test_slash.rb b/test/rss/test_slash.rb index aec0a868f5..757e7879f2 100644 --- a/test/rss/test_slash.rb +++ b/test/rss/test_slash.rb @@ -1,7 +1,7 @@ require "cgi" require "rexml/document" -require "rss-testcase" +require_relative "rss-testcase" require "rss/1.0" require "rss/slash" diff --git a/test/rss/test_syndication.rb b/test/rss/test_syndication.rb index 69d6f44464..17875f1954 100644 --- a/test/rss/test_syndication.rb +++ b/test/rss/test_syndication.rb @@ -1,7 +1,7 @@ require "cgi" require "rexml/document" -require "rss-testcase" +require_relative "rss-testcase" require "rss/1.0" require "rss/syndication" diff --git a/test/rss/test_taxonomy.rb b/test/rss/test_taxonomy.rb index 0370555d87..34937e4367 100644 --- a/test/rss/test_taxonomy.rb +++ b/test/rss/test_taxonomy.rb @@ -1,6 +1,6 @@ require "cgi" -require "rss-testcase" +require_relative "rss-testcase" require "rss/1.0" require "rss/2.0" diff --git a/test/rss/test_to_s.rb b/test/rss/test_to_s.rb index 4b38737bef..4ef83ce18b 100644 --- a/test/rss/test_to_s.rb +++ b/test/rss/test_to_s.rb @@ -1,6 +1,6 @@ require "rexml/document" -require "rss-testcase" +require_relative "rss-testcase" require "rss/maker" require "rss/1.0" diff --git a/test/rss/test_trackback.rb b/test/rss/test_trackback.rb index 433e884deb..8560c254f0 100644 --- a/test/rss/test_trackback.rb +++ b/test/rss/test_trackback.rb @@ -1,7 +1,7 @@ require "cgi" require "rexml/document" -require "rss-testcase" +require_relative "rss-testcase" require "rss/1.0" require "rss/2.0" diff --git a/test/rss/test_version.rb b/test/rss/test_version.rb index 17679012d3..d2175ab76a 100644 --- a/test/rss/test_version.rb +++ b/test/rss/test_version.rb @@ -1,4 +1,4 @@ -require "rss-testcase" +require_relative "rss-testcase" module RSS class TestVersion < TestCase diff --git a/test/rss/test_xml-stylesheet.rb b/test/rss/test_xml-stylesheet.rb index 6edafaeaa0..c67922f4ec 100644 --- a/test/rss/test_xml-stylesheet.rb +++ b/test/rss/test_xml-stylesheet.rb @@ -1,6 +1,6 @@ require "rexml/document" -require "rss-testcase" +require_relative "rss-testcase" require "rss/1.0" require "rss/xml-stylesheet" |