Use require_relative to require local library

* from 1.9 require relative path from the file must use require_relative. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39476 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2022-11-09 12:17:21 -05:00 · 2013-02-24 13:10:46 +00:00 · 2013-02-24 13:10:46 +00:00 · ef33958094
commit ef33958094
parent 66f9135726
56 changed files with 61 additions and 60 deletions
--- 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)
--- 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"
--- 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
--- 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'
--- 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"
--- 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"

--- 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
--- 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
--- 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"

--- 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'
--- 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
--- 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'
--- 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"

--- 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"

--- 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"

--- 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
--- 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"
--- 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"

--- 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"

--- 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"
--- 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"
--- 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"

--- 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"
--- 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"

--- 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"

--- 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"

--- 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"

--- 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"

--- 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"

--- 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"

--- 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"

--- 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"

--- 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"

--- 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"

--- 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"

--- 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"

--- 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"

--- 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"
--- 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"
--- 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"

--- 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"

--- 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"

--- 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"

--- 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"

--- 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"

--- 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"

--- 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"

--- 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"

--- 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"

--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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
--- 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"