Make rake test work under 1.9 as well

vihai · Oct 22, 2010 · 6959acf · 6959acf
1 parent 9f52b4d
commit 6959acf
Show file tree

Hide file tree

Showing 17 changed files with 22 additions and 21 deletions.
diff --git a/test/mocks/dictionaries.rb b/test/mocks/dictionaries.rb
@@ -1,4 +1,4 @@
-require 'lib/roxml'
+require_relative "./../../lib/roxml"
 
 class DictionaryOfAttrs
   include ROXML

diff --git a/test/mocks/mocks.rb b/test/mocks/mocks.rb
@@ -1,4 +1,4 @@
-require "lib/roxml"
+require_relative "./../../lib/roxml"
 
 class Muffins
   include ROXML

diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -1,8 +1,8 @@
 require 'rubygems'
 require 'active_support/test_case'
-require 'test/mocks/mocks'
-require 'test/mocks/dictionaries'
-require 'test/support/fixtures'
+require_relative './mocks/mocks'
+require_relative './mocks/dictionaries'
+require_relative './support/fixtures'
 
 def to_xml_test(*names)
   names = names.first if names.size == 1 && names.first.is_a?(Hash)

diff --git a/test/unit/definition_test.rb b/test/unit/definition_test.rb
@@ -1,4 +1,4 @@
-require 'test/test_helper'
+require_relative './../test_helper'
 
 class TestDefinition < ActiveSupport::TestCase
   def assert_hash(opts, kvp)
@@ -24,7 +24,7 @@ def test_block_shorthand_in_array_means_array
     opts = ROXML::Definition.new(:intarray, :as => [Integer])
     assert opts.array?
     assert_equal :text, opts.sought_type
-    assert 1, opts.blocks.size
+    assert_equal 1, opts.blocks.size
   end
 
   def test_required

diff --git a/test/unit/deprecations_test.rb b/test/unit/deprecations_test.rb
@@ -1,4 +1,4 @@
-require 'test/test_helper'
+require_relative './../test_helper'
 
 class TestDeprecation < ActiveSupport::TestCase
   def test_as_array_not_deprecated

diff --git a/test/unit/to_xml_test.rb b/test/unit/to_xml_test.rb
@@ -1,4 +1,4 @@
-require 'test/test_helper'
+require_relative './../test_helper'
 
 class TestHashToXml < ActiveSupport::TestCase
   to_xml_test :dictionary_of_attrs,

diff --git a/test/unit/xml_attribute_test.rb b/test/unit/xml_attribute_test.rb
@@ -1,4 +1,4 @@
-require 'test/test_helper'
+require_relative './../test_helper'
 
 class TestXMLAttribute < ActiveSupport::TestCase
   def test_attr_from

diff --git a/test/unit/xml_block_test.rb b/test/unit/xml_block_test.rb
@@ -1,4 +1,4 @@
-require 'test/test_helper'
+require_relative './../test_helper'
 
 class ArrayWithBlockShorthand
   include ROXML

diff --git a/test/unit/xml_bool_test.rb b/test/unit/xml_bool_test.rb
@@ -1,4 +1,4 @@
-require 'test/test_helper'
+require_relative './../test_helper'
 
 PROC_TRUE = proc {|val| val ? 'TRUE' : 'FALSE'}
 PROC_True = proc {|val| val ? 'True' : 'False'}

diff --git a/test/unit/xml_convention_test.rb b/test/unit/xml_convention_test.rb
@@ -1,4 +1,4 @@
-require 'test/test_helper'
+require_relative './../test_helper'
 
 XML_CAMELLOWER = %{
   <bookCase name="Jonas' Books">

diff --git a/test/unit/xml_hash_test.rb b/test/unit/xml_hash_test.rb
@@ -1,4 +1,4 @@
-require 'test/test_helper'
+require_relative './../test_helper'
 
 class BookWithContributorHash
   include ROXML

diff --git a/test/unit/xml_initialize_test.rb b/test/unit/xml_initialize_test.rb
@@ -1,4 +1,4 @@
-require 'test/test_helper'
+require_relative './../test_helper'
 
 class InheritedBookWithDepth < Book
   xml_reader :depth, :as => Measurement

diff --git a/test/unit/xml_name_test.rb b/test/unit/xml_name_test.rb
@@ -1,4 +1,4 @@
-require 'test/test_helper'
+require_relative './../test_helper'
 
 #      Parent        |    Child
 #  :from  | no :from |

diff --git a/test/unit/xml_namespace_test.rb b/test/unit/xml_namespace_test.rb
@@ -1,4 +1,4 @@
-require 'test/test_helper'
+require_relative './../test_helper'
 
 class TestDefaultXMLNamespaces < ActiveSupport::TestCase
   def setup

diff --git a/test/unit/xml_object_test.rb b/test/unit/xml_object_test.rb
@@ -1,4 +1,5 @@
-require 'test/test_helper'
+# encoding: utf-8
+require_relative './../test_helper'
 
 class EmptyCart
   include ROXML
@@ -171,7 +172,7 @@ def test_more_recursion
     node = taxonomies.taxonomies.first.nodes.first
     assert_equal 'Africa', node.name
     assert_equal 'Algeria', node.nodes.first.name
-    assert_equal ['Algiers', "Gharda\303\257a", 'El Oued', 'Timimoun', 'Annaba'],
+    assert_equal ['Algiers', "Ghardaïa", 'El Oued', 'Timimoun', 'Annaba'],
       node.nodes.first.nodes.map(&:name)
   end
 

diff --git a/test/unit/xml_required_test.rb b/test/unit/xml_required_test.rb
@@ -1,4 +1,4 @@
-require 'test/test_helper'
+require_relative './../test_helper'
 
 class TestXMLRequired < ActiveSupport::TestCase
   def setup

diff --git a/test/unit/xml_text_test.rb b/test/unit/xml_text_test.rb
@@ -1,4 +1,4 @@
-require 'test/test_helper'
+require_relative './../test_helper'
 
 class TestXMLText < ActiveSupport::TestCase
   # Test a simple mapping with no composition