From d85bf93776e18e55a5fccddb649d4e5081702314 Mon Sep 17 00:00:00 2001 From: xibbar Date: Tue, 26 Mar 2013 14:55:04 +0000 Subject: * test/psych/test_*.rb: use require_relative to require local library git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39944 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/psych/test_alias_and_anchor.rb | 2 +- test/psych/test_array.rb | 2 +- test/psych/test_boolean.rb | 2 +- test/psych/test_class.rb | 2 +- test/psych/test_coder.rb | 2 +- test/psych/test_date_time.rb | 2 +- test/psych/test_deprecated.rb | 2 +- test/psych/test_document.rb | 2 +- test/psych/test_emitter.rb | 2 +- test/psych/test_encoding.rb | 2 +- test/psych/test_engine_manager.rb | 2 +- test/psych/test_exception.rb | 2 +- test/psych/test_hash.rb | 2 +- test/psych/test_json_tree.rb | 2 +- test/psych/test_merge_keys.rb | 2 +- test/psych/test_nil.rb | 2 +- test/psych/test_null.rb | 2 +- test/psych/test_numeric.rb | 2 +- test/psych/test_object.rb | 2 +- test/psych/test_object_references.rb | 2 +- test/psych/test_omap.rb | 2 +- test/psych/test_parser.rb | 2 +- test/psych/test_psych.rb | 2 +- test/psych/test_scalar.rb | 2 +- test/psych/test_scalar_scanner.rb | 2 +- test/psych/test_serialize_subclasses.rb | 2 +- test/psych/test_set.rb | 2 +- test/psych/test_stream.rb | 2 +- test/psych/test_string.rb | 2 +- test/psych/test_struct.rb | 2 +- test/psych/test_symbol.rb | 2 +- test/psych/test_tainted.rb | 2 +- test/psych/test_to_yaml_properties.rb | 2 +- test/psych/test_tree_builder.rb | 2 +- test/psych/test_yaml.rb | 2 +- test/psych/test_yamldbm.rb | 2 +- test/psych/test_yamlstore.rb | 2 +- 37 files changed, 37 insertions(+), 37 deletions(-) diff --git a/test/psych/test_alias_and_anchor.rb b/test/psych/test_alias_and_anchor.rb index 7cb5a6e52b..9e2c24013d 100644 --- a/test/psych/test_alias_and_anchor.rb +++ b/test/psych/test_alias_and_anchor.rb @@ -1,4 +1,4 @@ -require 'psych/helper' +require_relative 'helper' class ObjectWithInstanceVariables attr_accessor :var1, :var2 diff --git a/test/psych/test_array.rb b/test/psych/test_array.rb index 747fe95062..960ffd71d8 100644 --- a/test/psych/test_array.rb +++ b/test/psych/test_array.rb @@ -1,4 +1,4 @@ -require 'psych/helper' +require_relative 'helper' module Psych class TestArray < TestCase diff --git a/test/psych/test_boolean.rb b/test/psych/test_boolean.rb index ebfa25e56a..b656f4f90e 100644 --- a/test/psych/test_boolean.rb +++ b/test/psych/test_boolean.rb @@ -1,4 +1,4 @@ -require 'psych/helper' +require_relative 'helper' module Psych ### diff --git a/test/psych/test_class.rb b/test/psych/test_class.rb index 156f2fb0ad..c7f964cc6d 100644 --- a/test/psych/test_class.rb +++ b/test/psych/test_class.rb @@ -1,4 +1,4 @@ -require 'psych/helper' +require_relative 'helper' module Psych class TestClass < TestCase diff --git a/test/psych/test_coder.rb b/test/psych/test_coder.rb index 7539c7d408..4809b13d5d 100644 --- a/test/psych/test_coder.rb +++ b/test/psych/test_coder.rb @@ -1,4 +1,4 @@ -require 'psych/helper' +require_relative 'helper' module Psych class TestCoder < TestCase diff --git a/test/psych/test_date_time.rb b/test/psych/test_date_time.rb index fb76cb3a00..df66d142f6 100644 --- a/test/psych/test_date_time.rb +++ b/test/psych/test_date_time.rb @@ -1,4 +1,4 @@ -require 'psych/helper' +require_relative 'helper' require 'date' module Psych diff --git a/test/psych/test_deprecated.rb b/test/psych/test_deprecated.rb index 3740b6f31c..6d35aeddd7 100644 --- a/test/psych/test_deprecated.rb +++ b/test/psych/test_deprecated.rb @@ -1,4 +1,4 @@ -require 'psych/helper' +require_relative 'helper' module Psych class TestDeprecated < TestCase diff --git a/test/psych/test_document.rb b/test/psych/test_document.rb index 05d9bbfb87..bd77d60084 100644 --- a/test/psych/test_document.rb +++ b/test/psych/test_document.rb @@ -1,4 +1,4 @@ -require 'psych/helper' +require_relative 'helper' module Psych class TestDocument < TestCase diff --git a/test/psych/test_emitter.rb b/test/psych/test_emitter.rb index dfd20e1507..0554ae5f85 100644 --- a/test/psych/test_emitter.rb +++ b/test/psych/test_emitter.rb @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -require 'psych/helper' +require_relative 'helper' module Psych class TestEmitter < TestCase diff --git a/test/psych/test_encoding.rb b/test/psych/test_encoding.rb index 1abee0df16..980ca5c698 100644 --- a/test/psych/test_encoding.rb +++ b/test/psych/test_encoding.rb @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -require 'psych/helper' +require_relative 'helper' module Psych class TestEncoding < TestCase diff --git a/test/psych/test_engine_manager.rb b/test/psych/test_engine_manager.rb index e7bfb2ea72..33a67432eb 100644 --- a/test/psych/test_engine_manager.rb +++ b/test/psych/test_engine_manager.rb @@ -1,4 +1,4 @@ -require 'psych/helper' +require_relative 'helper' require 'yaml' module Psych diff --git a/test/psych/test_exception.rb b/test/psych/test_exception.rb index 46dece4127..d54c7d4fbb 100644 --- a/test/psych/test_exception.rb +++ b/test/psych/test_exception.rb @@ -1,4 +1,4 @@ -require 'psych/helper' +require_relative 'helper' module Psych class TestException < TestCase diff --git a/test/psych/test_hash.rb b/test/psych/test_hash.rb index 4bd4edfc8c..dac7f8d7d8 100644 --- a/test/psych/test_hash.rb +++ b/test/psych/test_hash.rb @@ -1,4 +1,4 @@ -require 'psych/helper' +require_relative 'helper' module Psych class TestHash < TestCase diff --git a/test/psych/test_json_tree.rb b/test/psych/test_json_tree.rb index eed8cf36c4..60f8321e68 100644 --- a/test/psych/test_json_tree.rb +++ b/test/psych/test_json_tree.rb @@ -1,4 +1,4 @@ -require 'psych/helper' +require_relative 'helper' module Psych class TestJSONTree < TestCase diff --git a/test/psych/test_merge_keys.rb b/test/psych/test_merge_keys.rb index c31f9b80c0..d8baba485f 100644 --- a/test/psych/test_merge_keys.rb +++ b/test/psych/test_merge_keys.rb @@ -1,4 +1,4 @@ -require 'psych/helper' +require_relative 'helper' module Psych class TestMergeKeys < TestCase diff --git a/test/psych/test_nil.rb b/test/psych/test_nil.rb index 4f32b7703b..3dbf56279a 100644 --- a/test/psych/test_nil.rb +++ b/test/psych/test_nil.rb @@ -1,4 +1,4 @@ -require 'psych/helper' +require_relative 'helper' module Psych class TestNil < TestCase diff --git a/test/psych/test_null.rb b/test/psych/test_null.rb index 0fee1d2464..1725550443 100644 --- a/test/psych/test_null.rb +++ b/test/psych/test_null.rb @@ -1,4 +1,4 @@ -require 'psych/helper' +require_relative 'helper' module Psych ### diff --git a/test/psych/test_numeric.rb b/test/psych/test_numeric.rb index 0858e799aa..5378b4aaad 100644 --- a/test/psych/test_numeric.rb +++ b/test/psych/test_numeric.rb @@ -1,4 +1,4 @@ -require 'psych/helper' +require_relative 'helper' require 'bigdecimal' module Psych diff --git a/test/psych/test_object.rb b/test/psych/test_object.rb index 6145bb6ada..5e3ce8294f 100644 --- a/test/psych/test_object.rb +++ b/test/psych/test_object.rb @@ -1,4 +1,4 @@ -require 'psych/helper' +require_relative 'helper' module Psych class Tagged diff --git a/test/psych/test_object_references.rb b/test/psych/test_object_references.rb index 51d8085fa0..9e2cf08ad0 100644 --- a/test/psych/test_object_references.rb +++ b/test/psych/test_object_references.rb @@ -1,4 +1,4 @@ -require 'psych/helper' +require_relative 'helper' module Psych class TestObjectReferences < TestCase diff --git a/test/psych/test_omap.rb b/test/psych/test_omap.rb index 34df724998..36edc26c49 100644 --- a/test/psych/test_omap.rb +++ b/test/psych/test_omap.rb @@ -1,4 +1,4 @@ -require 'psych/helper' +require_relative 'helper' module Psych class TestOmap < TestCase diff --git a/test/psych/test_parser.rb b/test/psych/test_parser.rb index acbdd96f5c..0abe0dd398 100644 --- a/test/psych/test_parser.rb +++ b/test/psych/test_parser.rb @@ -1,6 +1,6 @@ # coding: utf-8 -require 'psych/helper' +require_relative 'helper' module Psych class TestParser < TestCase diff --git a/test/psych/test_psych.rb b/test/psych/test_psych.rb index 543367538a..96dde9d5b7 100644 --- a/test/psych/test_psych.rb +++ b/test/psych/test_psych.rb @@ -1,4 +1,4 @@ -require 'psych/helper' +require_relative 'helper' require 'stringio' require 'tempfile' diff --git a/test/psych/test_scalar.rb b/test/psych/test_scalar.rb index 3cf6b0938c..e6b76975a6 100644 --- a/test/psych/test_scalar.rb +++ b/test/psych/test_scalar.rb @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -require 'psych/helper' +require_relative 'helper' module Psych class TestScalar < TestCase diff --git a/test/psych/test_scalar_scanner.rb b/test/psych/test_scalar_scanner.rb index 8483eabc7d..a7bf17c912 100644 --- a/test/psych/test_scalar_scanner.rb +++ b/test/psych/test_scalar_scanner.rb @@ -1,4 +1,4 @@ -require 'psych/helper' +require_relative 'helper' require 'date' module Psych diff --git a/test/psych/test_serialize_subclasses.rb b/test/psych/test_serialize_subclasses.rb index c8221928a1..f597b7a051 100644 --- a/test/psych/test_serialize_subclasses.rb +++ b/test/psych/test_serialize_subclasses.rb @@ -1,4 +1,4 @@ -require 'psych/helper' +require_relative 'helper' module Psych class TestSerializeSubclasses < TestCase diff --git a/test/psych/test_set.rb b/test/psych/test_set.rb index bea67d95b6..921fe2284f 100644 --- a/test/psych/test_set.rb +++ b/test/psych/test_set.rb @@ -1,4 +1,4 @@ -require 'psych/helper' +require_relative 'helper' module Psych class TestSet < TestCase diff --git a/test/psych/test_stream.rb b/test/psych/test_stream.rb index beca365608..7e41178e34 100644 --- a/test/psych/test_stream.rb +++ b/test/psych/test_stream.rb @@ -1,4 +1,4 @@ -require 'psych/helper' +require_relative 'helper' module Psych class TestStream < TestCase diff --git a/test/psych/test_string.rb b/test/psych/test_string.rb index aa6866b618..a2988316f0 100644 --- a/test/psych/test_string.rb +++ b/test/psych/test_string.rb @@ -1,4 +1,4 @@ -require 'psych/helper' +require_relative 'helper' module Psych class TestString < TestCase diff --git a/test/psych/test_struct.rb b/test/psych/test_struct.rb index 977aae08ba..8c7f2513ce 100644 --- a/test/psych/test_struct.rb +++ b/test/psych/test_struct.rb @@ -1,4 +1,4 @@ -require 'psych/helper' +require_relative 'helper' class PsychStructWithIvar < Struct.new(:foo) attr_reader :bar diff --git a/test/psych/test_symbol.rb b/test/psych/test_symbol.rb index 3226141d02..2b4470d184 100644 --- a/test/psych/test_symbol.rb +++ b/test/psych/test_symbol.rb @@ -1,4 +1,4 @@ -require 'psych/helper' +require_relative 'helper' module Psych class TestSymbol < TestCase diff --git a/test/psych/test_tainted.rb b/test/psych/test_tainted.rb index fdcced4cf3..62872b00e0 100644 --- a/test/psych/test_tainted.rb +++ b/test/psych/test_tainted.rb @@ -1,4 +1,4 @@ -require 'psych/helper' +require_relative 'helper' module Psych class TestStringTainted < TestCase diff --git a/test/psych/test_to_yaml_properties.rb b/test/psych/test_to_yaml_properties.rb index 2636becf00..5b4860c435 100644 --- a/test/psych/test_to_yaml_properties.rb +++ b/test/psych/test_to_yaml_properties.rb @@ -1,4 +1,4 @@ -require 'psych/helper' +require_relative 'helper' module Psych class TestToYamlProperties < MiniTest::Unit::TestCase diff --git a/test/psych/test_tree_builder.rb b/test/psych/test_tree_builder.rb index 9a134d5a2d..7ad3ddd8a0 100644 --- a/test/psych/test_tree_builder.rb +++ b/test/psych/test_tree_builder.rb @@ -1,4 +1,4 @@ -require 'psych/helper' +require_relative 'helper' module Psych class TestTreeBuilder < TestCase diff --git a/test/psych/test_yaml.rb b/test/psych/test_yaml.rb index 9891349118..ba86807aaf 100644 --- a/test/psych/test_yaml.rb +++ b/test/psych/test_yaml.rb @@ -2,7 +2,7 @@ # vim:sw=4:ts=4 # $Id$ # -require 'psych/helper' +require_relative 'helper' require 'ostruct' # [ruby-core:01946] diff --git a/test/psych/test_yamldbm.rb b/test/psych/test_yamldbm.rb index d9780035f2..dba9eee2a9 100644 --- a/test/psych/test_yamldbm.rb +++ b/test/psych/test_yamldbm.rb @@ -1,6 +1,6 @@ # -*- coding: UTF-8 -*- -require 'psych/helper' +require_relative 'helper' require 'tmpdir' begin diff --git a/test/psych/test_yamlstore.rb b/test/psych/test_yamlstore.rb index 5d6fcb79b2..19471b1e35 100644 --- a/test/psych/test_yamlstore.rb +++ b/test/psych/test_yamlstore.rb @@ -1,4 +1,4 @@ -require 'psych/helper' +require_relative 'helper' require 'yaml/store' require 'tmpdir' -- cgit v1.2.3