roxml 3.2.2 → 4.1.1

data/test/fixtures/book_with_octal_pages.xml

@@ -1,4 +1,3 @@
 <bookwithoctalpages>
-  <pages_with_to_xml_proc>0357</pages_with_to_xml_proc>
-  <pages_with_type>0357</pages_with_type>
-</bookwithoctalpages>
+  <pages>0357</pages>
+</bookwithoctalpages>

data/test/test_helper.rb

@@ -1,5 +1,4 @@
 require 'rubygems'
-require 'active_support/test_case'
 require_relative './mocks/mocks'
 require_relative './mocks/dictionaries'
 require_relative './support/fixtures'
@@ -31,4 +30,4 @@ def remove_children(xml)
     end
   end
   xml
-end
+end

data/test/unit/definition_test.rb

@@ -1,6 +1,7 @@
 require_relative './../test_helper'
+require 'minitest/autorun'
 
-class TestDefinition < ActiveSupport::TestCase
+class TestDefinition < Minitest::Test
   def assert_hash(opts, kvp)
     assert opts.hash?
     assert !opts.array?
@@ -34,17 +35,15 @@ class TestDefinition < ActiveSupport::TestCase
   end
 
   def test_required_conflicts_with_else
-    assert_raise ArgumentError do
+    assert_raises ArgumentError do
       ROXML::Definition.new(:author, :required => true, :else => 'Johnny')
     end
-    assert_nothing_raised do
-      ROXML::Definition.new(:author, :required => false, :else => 'Johnny')
-    end
+    ROXML::Definition.new(:author, :required => false, :else => 'Johnny')
   end
 
   def test_hash_of_attrs
     opts = ROXML::Definition.new(:attributes, :as => {:key => '@name', :value => '@value'})
-    assert_hash(opts, :attr => 'name', :attr => 'value')
+    assert_hash(opts, :attr => 'value')
   end
 
   def test_hash_with_attr_key_and_text_val
@@ -56,7 +55,7 @@ class TestDefinition < ActiveSupport::TestCase
   def test_hash_with_string_class_for_type
     opts = ROXML::Definition.new(:attributes, :as => {:key => 'name',
                                          :value => 'value'})
-    assert_hash(opts, :text => 'name', :text => 'value')
+    assert_hash(opts, :text => 'value')
   end
 
   def test_hash_with_attr_key_and_content_val
@@ -68,7 +67,7 @@ class TestDefinition < ActiveSupport::TestCase
   def test_hash_with_options
     opts = ROXML::Definition.new(:definitions, :as => {:key => '@dt', :value => '@dd'},
                            :in => :definitions, :from => 'definition')
-    assert_hash(opts, :attr => 'dt', :attr => 'dd')
+    assert_hash(opts, :attr => 'dd')
     assert_equal 'definition', opts.hash.wrapper
   end
 
@@ -96,14 +95,6 @@ class TestDefinition < ActiveSupport::TestCase
     assert_equal :attr, opts.sought_type
   end
 
-  def test_multiple_shorthands_raises
-    assert_raise ArgumentError do
-      assert_deprecated do
-        ROXML::Definition.new(:count, :as => [Float, Integer])
-      end
-    end
-  end
-
   def test_stacked_blocks
     assert_equal 2, ROXML::Definition.new(:count, :as => Integer) {|val| val.to_i }.blocks.size
     assert_equal 2, ROXML::Definition.new(:count, :as => Float) {|val| val.object_id }.blocks.size
@@ -115,35 +106,33 @@ class TestDefinition < ActiveSupport::TestCase
   end
 
   def test_block_shorthand_supports_integer
-    assert_equal nil, ROXML::Definition.new(:floatvalue, :as => Integer).blocks.first.call(" ")
+    assert_nil ROXML::Definition.new(:floatvalue, :as => Integer).blocks.first.call(" ")
     assert_equal 792, ROXML::Definition.new(:floatvalue, :as => Integer).blocks.first.call("792")
-    assert_raise ArgumentError do
-      ROXML::Definition.new(:floatvalue, :as => Integer).blocks.first.call("792.13")
-    end
+    assert_equal 792, ROXML::Definition.new(:floatvalue, :as => Integer).blocks.first.call("792.13")
     assert_equal [792, 12, 328], ROXML::Definition.new(:floatvalue, :as => Integer).blocks.first.call(["792", "12", "328"])
   end
 
   def test_block_shorthand_supports_float
-    assert_equal nil, ROXML::Definition.new(:floatvalue, :as => Float).blocks.first.call("  ")
+    assert_nil ROXML::Definition.new(:floatvalue, :as => Float).blocks.first.call("  ")
     assert_equal 792.13, ROXML::Definition.new(:floatvalue, :as => Float).blocks.first.call("792.13")
     assert_equal 240.0, ROXML::Definition.new(:floatvalue, :as => Float).blocks.first.call("240")
     assert_equal [792.13, 240.0, 3.14], ROXML::Definition.new(:floatvalue, :as => Float).blocks.first.call(["792.13", "240", "3.14"])
   end
 
   def test_block_shorthand_supports_time
-    assert_equal nil, ROXML::Definition.new(:floatvalue, :as => Time).blocks.first.call("  ")
+    assert_nil ROXML::Definition.new(:floatvalue, :as => Time).blocks.first.call("  ")
     assert_equal 31, ROXML::Definition.new(:datevalue, :as => Time).blocks.first.call("12:31am").min
     assert_equal [31, 0, 59], ROXML::Definition.new(:datevalue, :as => Time).blocks.first.call(["12:31am", "3:00pm", "11:59pm"]).map(&:min)
   end
 
   def test_block_shorthand_supports_date
-    assert_equal nil, ROXML::Definition.new(:floatvalue, :as => Date).blocks.first.call("  ")
+    assert_nil ROXML::Definition.new(:floatvalue, :as => Date).blocks.first.call("  ")
     assert_equal "1970-09-03", ROXML::Definition.new(:datevalue, :as => Date).blocks.first.call("September 3rd, 1970").to_s
     assert_equal ["1970-09-03", "1776-07-04"], ROXML::Definition.new(:datevalue, :as => Date).blocks.first.call(["September 3rd, 1970", "1776-07-04"]).map(&:to_s)
   end
 
   def test_block_shorthand_supports_datetime
-    assert_equal nil, ROXML::Definition.new(:floatvalue, :as => DateTime).blocks.first.call("  ")
+    assert_nil ROXML::Definition.new(:floatvalue, :as => DateTime).blocks.first.call("  ")
     assert_equal "1970-09-03T12:05:00+00:00", ROXML::Definition.new(:datevalue, :as => DateTime).blocks.first.call("12:05pm, September 3rd, 1970").to_s
     assert_equal ["1970-09-03T12:05:00+00:00", "1700-05-22T15:00:00+00:00"], ROXML::Definition.new(:datevalue, :as => DateTime).blocks.first.call(["12:05pm, September 3rd, 1970", "3:00pm, May 22, 1700"]).map(&:to_s)
   end
@@ -171,11 +160,21 @@ class TestDefinition < ActiveSupport::TestCase
     assert_equal RoxmlObject, ROXML::Definition.new(:types, :as => [RoxmlObject]).sought_type
   end
 
-  def test_default_works
+  def test_default_for_missing_element_works
     opts = ROXML::Definition.new(:missing, :else => true)
     assert_equal true, opts.to_ref(RoxmlObject.new).value_in(ROXML::XML.parse_string('<xml></xml>'))
   end
 
+  def test_default_for_empty_element_works
+    opts = ROXML::Definition.new(:age, :else => 25)
+    assert_equal 25, opts.to_ref(RoxmlObject.new).value_in(ROXML::XML.parse_string('<xml><age /></xml>'))
+  end
+
+  def test_empty_element_works_without_default
+    opts = ROXML::Definition.new(:age)
+    assert_equal '', opts.to_ref(RoxmlObject.new).value_in(ROXML::XML.parse_string('<xml><age /></xml>'))
+  end
+
   def test_default_works_for_arrays
     opts = ROXML::Definition.new(:missing, :as => [])
     assert_equal [], opts.to_ref(RoxmlObject.new).value_in(ROXML::XML.parse_string('<xml></xml>'))
@@ -226,10 +225,10 @@ class RoxmlObject
   include ROXML
 end
 
-class HashDefinitionTest < ActiveSupport::TestCase
+class HashDefinitionTest < Minitest::Test
   def test_content_detected_as_from
     opts = ROXML::Definition.new(:hash, :as => {:key => :content, :value => :name})
     assert_equal '.', opts.hash.key.name
     assert_equal :text, opts.hash.key.sought_type
   end
-end
+end

data/test/unit/deprecations_test.rb

@@ -1,6 +1,10 @@
 require_relative './../test_helper'
+require 'minitest/autorun'
+require 'active_support/testing/deprecation'
+
+class TestDeprecation < Minitest::Test
+  include ActiveSupport::Testing::Deprecation
 
-class TestDeprecation < ActiveSupport::TestCase
   def test_as_array_not_deprecated
     assert_not_deprecated do
       opts = ROXML::Definition.new(:name, :as => [])
@@ -21,4 +25,21 @@ class TestDeprecation < ActiveSupport::TestCase
       ROXML::Definition.new(:name, :as => OctalInteger)
     end
   end
-end
+
+  def test_as_hash_of_as_type_not_deprecated
+    assert_not_deprecated do
+      opts = ROXML::Definition.new(:name, :as => {:key => :name, :value => {:from => 'value', :as => OctalInteger}})
+      assert opts.hash?
+      assert_equal OctalInteger, opts.hash.value.sought_type
+      assert_equal 'value', opts.hash.value.name
+    end
+  end
+
+  def test_multiple_shorthands_raises
+    assert_raises ArgumentError do
+      assert_deprecated do
+        ROXML::Definition.new(:count, :as => [Float, Integer])
+      end
+    end
+  end
+end

data/test/unit/to_xml_test.rb

@@ -1,6 +1,7 @@
 require_relative './../test_helper'
+require 'minitest/autorun'
 
-class TestHashToXml < ActiveSupport::TestCase
+class TestHashToXml < Minitest::Test
   to_xml_test :dictionary_of_attrs,
               :dictionary_of_mixeds,
               :dictionary_of_texts,
@@ -10,7 +11,7 @@ class TestHashToXml < ActiveSupport::TestCase
               :dictionary_of_attr_name_clashes
 end
 
-class TestOtherToXml < ActiveSupport::TestCase
+class TestOtherToXml < Minitest::Test
   to_xml_test :book => :book_valid,
               :book_with_author_text_attribute => :book_text_with_attribute,
               :uppercase_library => :library_uppercase
@@ -28,7 +29,7 @@ class TestOtherToXml < ActiveSupport::TestCase
   to_xml_test :book_with_wrapped_attr
 end
 
-class TestToXmlWithDefaults < ActiveSupport::TestCase
+class TestToXmlWithDefaults < Minitest::Test
   def test_content_and_attr_defaults_are_represented_in_output
     dict = Person.from_xml(fixture(:nameless_ageless_youth))
 
@@ -37,17 +38,17 @@ class TestToXmlWithDefaults < ActiveSupport::TestCase
   end
 end
 
-class TestToXmlWithBlocks < ActiveSupport::TestCase
+class TestToXmlWithBlocks < Minitest::Test
   def test_pagecount_serialized_properly_after_modification
     b = Book.from_xml(fixture(:book_valid))
     xml = xml_fixture(:book_valid)
-    assert_equal '357', xml.roxml_search('pagecount').first.content
+    assert_equal '357', ROXML::XML.search(xml, 'pagecount').first.content
     assert_equal 357, b.pages
 
     b.pages = 500
     doc = ROXML::XML::Document.new()
     doc.root = b.to_xml
-    assert_equal '500', doc.roxml_search('pagecount').first.content
+    assert_equal '500', ROXML::XML.search(doc, 'pagecount').first.content
   end
 end
 
@@ -72,10 +73,9 @@ end
 class BookWithOctalPages
   include ROXML
 
-  xml_accessor :pages_with_to_xml_proc, :as => Integer, :to_xml => proc {|val| sprintf("%#o", val) }, :required => true
-  xml_accessor :pages_with_type, :as => OctalInteger, :required => true
+  xml_accessor :pages, :as => OctalInteger, :required => true
 end
 
-class TestToXmlWithOverriddenOutput < ActiveSupport::TestCase
+class TestToXmlWithOverriddenOutput < Minitest::Test
   to_xml_test :book_with_octal_pages
 end

data/test/unit/xml_attribute_test.rb

@@ -1,6 +1,7 @@
 require_relative './../test_helper'
+require 'minitest/autorun'
 
-class TestXMLAttribute < ActiveSupport::TestCase
+class TestXMLAttribute < Minitest::Test
   def test_attr_from
     # :attr => *
     book = Book.from_xml(fixture(:book_text_with_attribute))
@@ -36,4 +37,4 @@ class TestXMLAttribute < ActiveSupport::TestCase
     b = BookWithWrappedAttr.from_xml(fixture(:book_with_wrapped_attr))
     assert_equal "0974514055", b.isbn
   end
-end
+end

data/test/unit/xml_block_test.rb

@@ -1,4 +1,5 @@
 require_relative './../test_helper'
+require 'minitest/autorun'
 
 class ArrayWithBlockShorthand
   include ROXML
@@ -14,7 +15,7 @@ class ArrayWithBlock
   end
 end
 
-class TestXMLBlocks < ActiveSupport::TestCase
+class TestXMLBlocks < Minitest::Test
   def test_block_is_applied
     muffins = Muffins.from_xml(fixture(:muffins))
 
@@ -78,4 +79,4 @@ class TestXMLBlocks < ActiveSupport::TestCase
 
     assert_equal [], obj.array
   end
-end
+end

data/test/unit/xml_bool_test.rb

@@ -1,4 +1,5 @@
 require_relative './../test_helper'
+require 'minitest/autorun'
 
 PROC_TRUE = proc {|val| val ? 'TRUE' : 'FALSE'}
 PROC_True = proc {|val| val ? 'True' : 'False'}
@@ -68,7 +69,7 @@ UNEXPECTED_VALUE_XML = %{
 }
 
 
-class TestXMLBool < ActiveSupport::TestCase
+class TestXMLBool < Minitest::Test
   def test_bool_results_for_various_inputs
     x = XmlBool.from_xml(BOOL_XML)
     assert_equal true, x.true_from_TRUE?
@@ -83,12 +84,12 @@ class TestXMLBool < ActiveSupport::TestCase
 
   def test_missing_results_in_nil
     x = XmlBool.from_xml(BOOL_XML)
-    assert_equal nil, x.missing?
+    assert_nil x.missing?
   end
 
   def test_unexpected_value_results_in_nil
     x = XmlBoolUnexpected.from_xml(UNEXPECTED_VALUE_XML)
-    assert_equal nil, x.unexpected?
+    assert_nil x.unexpected?
   end
 
   def test_block_recieves_unexpected_value_rather_than_nil
@@ -97,11 +98,9 @@ class TestXMLBool < ActiveSupport::TestCase
   end
 
   def test_required_raises_on_missing
-    assert_nothing_raised do
-      XmlBoolRequired.from_xml(PRESENT)
-    end
+    XmlBoolRequired.from_xml(PRESENT)
 
-    assert_raise ROXML::RequiredElementMissing do
+    assert_raises ROXML::RequiredElementMissing do
       XmlBoolRequired.from_xml(ABSENT)
     end
   end
@@ -119,4 +118,4 @@ class TestXMLBool < ActiveSupport::TestCase
   end
 
   to_xml_test XmlBool => BOOL_XML
-end
+end

data/test/unit/xml_convention_test.rb

@@ -1,4 +1,5 @@
 require_relative './../test_helper'
+require 'minitest/autorun'
 
 XML_CAMELLOWER = %{
   <bookCase name="Jonas' Books">
@@ -94,7 +95,7 @@ end
 class InheritedBookCaseDefault < ParentBookCaseDefault
 end
 
-class TestXMLConvention < ActiveSupport::TestCase
+class TestXMLConvention < Minitest::Test
   # TODO: Test convention applies to xml_name as well...
 
   def test_default_convention_is_underscore
@@ -132,7 +133,7 @@ class TestXMLConvention < ActiveSupport::TestCase
 
     bc = InheritedBookCaseDefault.from_xml(XML_DASHES)
     assert_has_book_case_info(bc)
-    assert_raise ROXML::RequiredElementMissing do
+    assert_raises ROXML::RequiredElementMissing do
       InheritedBookCaseDefault.from_xml(XML_UNDERSCORE)
     end
   end
@@ -147,4 +148,4 @@ class TestXMLConvention < ActiveSupport::TestCase
     assert_equal 12, bc.book_count
     assert_equal ['GED', 'House of Leaves'], bc.big_books
   end
-end
+end

data/test/unit/xml_hash_test.rb

@@ -1,4 +1,5 @@
 require_relative './../test_helper'
+require 'minitest/autorun'
 
 class BookWithContributorHash
   include ROXML
@@ -7,7 +8,7 @@ class BookWithContributorHash
                              :value => 'name'}
 end
 
-class TestXMLHash < ActiveSupport::TestCase
+class TestXMLHash < Minitest::Test
   def setup
     @contents = {'quaquaversally' => 'adjective: (of a geological formation) sloping downward from the center in all directions.',
                  'tergiversate' => 'To use evasions or ambiguities; equivocate.'}
@@ -26,7 +27,7 @@ class TestXMLHash < ActiveSupport::TestCase
   end
 
   def test_hash_with_object_key_fails
-    assert_raise ArgumentError do
+    assert_raises ArgumentError do
       Class.new do
         include ROXML
 
@@ -37,7 +38,7 @@ class TestXMLHash < ActiveSupport::TestCase
   end
 
   def test_hash_with_object_value_fails
-    assert_raise ArgumentError do
+    assert_raises ArgumentError do
       Class.new do
         include ROXML
 
@@ -103,13 +104,4 @@ class TestXMLHash < ActiveSupport::TestCase
       </dict>
     }).missing_hash)
   end
-
-  def test_as_hash_of_as_type_not_deprecated
-    assert_not_deprecated do
-      opts = ROXML::Definition.new(:name, :as => {:key => :name, :value => {:from => 'value', :as => OctalInteger}})
-      assert opts.hash?
-      assert_equal OctalInteger, opts.hash.value.sought_type
-      assert_equal 'value', opts.hash.value.name
-    end
-  end
-end
+end

data/test/unit/xml_initialize_test.rb

@@ -1,4 +1,5 @@
 require_relative './../test_helper'
+require 'minitest/autorun'
 
 class InheritedBookWithDepth < Book
   xml_reader :depth, :as => Measurement
@@ -13,7 +14,7 @@ class BookWithXmlInitialize < BookWithDepth
   end
 end
 
-class TestXMLInitialize < ActiveSupport::TestCase
+class TestXMLInitialize < Minitest::Test
   def test_initialize_is_run
     m = Measurement.from_xml('<measurement units="hundredths-meters">1130</measurement>')
     assert_equal 11.3, m.value
@@ -31,7 +32,7 @@ class TestXMLInitialize < ActiveSupport::TestCase
   end
 
   def test_initialize_fails_on_missing_required_arg
-    assert_raise ArgumentError do
+    assert_raises ArgumentError do
       BookWithXmlInitialize.from_xml(fixture(:book_with_depth))
     end
   end
@@ -46,4 +47,4 @@ class TestXMLInitialize < ActiveSupport::TestCase
     assert now < b.created_at
     assert_equal "Joe Librarian", b.creator
   end
-end
+end

data/test/unit/xml_name_test.rb

@@ -1,4 +1,5 @@
 require_relative './../test_helper'
+require 'minitest/autorun'
 
 #      Parent        |    Child
 #  :from  | no :from |
@@ -48,7 +49,7 @@ class ParentOfUnnamedChildWithFrom
   xml_accessor :child_accessor_name,:as => Child, :from => 'child_from_name'
 end
 
-class TestXMLName < ActiveSupport::TestCase
+class TestXMLName < Minitest::Test
   def test_from_always_dominates_attribute_name_xml_name_or_not
     parent = ParentOfNamedChildWithFrom.new
     parent.child_accessor_name = Child.new
@@ -138,4 +139,4 @@ module WrapModule
   class InstanceStandin < BaseClass
     xml_reader :name, :in => './'
   end
-end
+end