libxml-ruby 1.1.4 → 2.0.0

data/test/tc_document_write.rb

@@ -1,118 +1,187 @@
-require 'xml'
-require 'tmpdir'
-require 'test/unit'
-
-class TestDocumentWrite < Test::Unit::TestCase
-  def setup
-    # Strip spaces to make testing easier
-    XML.default_keep_blanks = false
-    file = File.join(File.dirname(__FILE__), 'model/bands.xml')
-    @doc = XML::Document.file(file)
-  end
-
-  def teardown
-    XML.default_keep_blanks = true
-    @doc = nil
-  end
-
-  # ---  to_s tests  ---
-  def test_to_s_default
-    # Default to_s has indentation
-    assert_equal("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<bands genre=\"metal\">\n  <m\303\266tley_cr\303\274e country=\"us\">An American heavy metal band formed in Los Angeles, California in 1981.</m\303\266tley_cr\303\274e>\n  <iron_maiden country=\"uk\">British heavy metal band formed in 1975.</iron_maiden>\n</bands>\n",
-                 @doc.to_s)
-  end
-
-  def test_to_s_no_global_indentation
-    # No indentation due to global setting
-    XML.indent_tree_output = false
-    assert_equal("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<bands genre=\"metal\">\n<m\303\266tley_cr\303\274e country=\"us\">An American heavy metal band formed in Los Angeles, California in 1981.</m\303\266tley_cr\303\274e>\n<iron_maiden country=\"uk\">British heavy metal band formed in 1975.</iron_maiden>\n</bands>\n",
-                 @doc.to_s)
-  ensure
-    XML.indent_tree_output = true
-  end
-
-  def test_to_s_no_indentation
-    # No indentation due to local setting
-    assert_equal("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<bands genre=\"metal\"><m\303\266tley_cr\303\274e country=\"us\">An American heavy metal band formed in Los Angeles, California in 1981.</m\303\266tley_cr\303\274e><iron_maiden country=\"uk\">British heavy metal band formed in 1975.</iron_maiden></bands>\n",
-                 @doc.to_s(:indent => false))
-  end
-
-  def test_to_s_encoding
-    # Test encodings
-
-    # UTF8:
-    # ö - c3 b6 in hex, \303\266 in octal
-    # ü - c3 bc in hex, \303\274 in octal
-    assert_equal("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<bands genre=\"metal\">\n  <m\303\266tley_cr\303\274e country=\"us\">An American heavy metal band formed in Los Angeles, California in 1981.</m\303\266tley_cr\303\274e>\n  <iron_maiden country=\"uk\">British heavy metal band formed in 1975.</iron_maiden>\n</bands>\n",
-                 @doc.to_s(:encoding => XML::Encoding::UTF_8))
-
-    # ISO_8859_1:
-    # ö - f6 in hex, \366 in octal
-    # ü - fc in hex, \374 in octal
-    assert_equal("<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n<bands genre=\"metal\">\n  <m\366tley_cr\374e country=\"us\">An American heavy metal band formed in Los Angeles, California in 1981.</m\366tley_cr\374e>\n  <iron_maiden country=\"uk\">British heavy metal band formed in 1975.</iron_maiden>\n</bands>\n",
-                 @doc.to_s(:encoding => XML::Encoding::ISO_8859_1))
-
-
-    # Invalid encoding
-    error = assert_raise(ArgumentError) do
-      @doc.to_s(:encoding => -9999)
-    end
-    assert_equal('Unknown encoding value: -9999', error.to_s)
-  end
-
-  # --- save tests -----
-  def test_save_utf8
-    temp_filename = File.join(Dir.tmpdir, "tc_document_write_test_save_utf8.xml")
-
-    bytes = @doc.save(temp_filename)
-    assert_equal(271, bytes)
-
-    contents = File.read(temp_filename)
-    assert_equal("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<bands genre=\"metal\">\n  <m\303\266tley_cr\303\274e country=\"us\">An American heavy metal band formed in Los Angeles, California in 1981.</m\303\266tley_cr\303\274e>\n  <iron_maiden country=\"uk\">British heavy metal band formed in 1975.</iron_maiden>\n</bands>\n",
-               contents)
-  ensure
-    File.delete(temp_filename)
-  end
-
-  def test_save_utf8_no_indents
-    temp_filename = File.join(Dir.tmpdir, "tc_document_write_test_save_utf8_no_indents.xml")
-
-    bytes = @doc.save(temp_filename, :indent => false)
-    assert_equal(264, bytes)
-
-    contents = File.read(temp_filename)
-    assert_equal("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<bands genre=\"metal\"><m\303\266tley_cr\303\274e country=\"us\">An American heavy metal band formed in Los Angeles, California in 1981.</m\303\266tley_cr\303\274e><iron_maiden country=\"uk\">British heavy metal band formed in 1975.</iron_maiden></bands>\n",
-               contents)
-  ensure
-    File.delete(temp_filename)
-  end
-
-  def test_save_iso_8859_1
-    temp_filename = File.join(Dir.tmpdir, "tc_document_write_test_save_iso_8859_1.xml")
-    bytes = @doc.save(temp_filename, :encoding => XML::Encoding::ISO_8859_1)
-    assert_equal(272, bytes)
-
-    contents = File.read(temp_filename)
-    assert_equal("<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n<bands genre=\"metal\">\n  <m\366tley_cr\374e country=\"us\">An American heavy metal band formed in Los Angeles, California in 1981.</m\366tley_cr\374e>\n  <iron_maiden country=\"uk\">British heavy metal band formed in 1975.</iron_maiden>\n</bands>\n",
-                 contents)
-  ensure
-    File.delete(temp_filename)
-  end
-
-  def test_save_iso_8859_1_no_indent
-    temp_filename = File.join(Dir.tmpdir, "tc_document_write_test_save_iso_8859_1_no_indent.xml")
-    bytes = @doc.save(temp_filename, :indent => false, :encoding => XML::Encoding::ISO_8859_1)
-    assert_equal(265, bytes)
-
-    contents = File.read(temp_filename)
-    assert_equal("<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n<bands genre=\"metal\"><m\366tley_cr\374e country=\"us\">An American heavy metal band formed in Los Angeles, California in 1981.</m\366tley_cr\374e><iron_maiden country=\"uk\">British heavy metal band formed in 1975.</iron_maiden></bands>\n",
-                 contents)
-  ensure
-    File.delete(temp_filename)
-  end
-
-  # --- Debug ---
-  def test_debug
-    assert(@doc.debug)
-  end
+# encoding: UTF-8
+
+require './test_helper'
+require 'tmpdir'
+require 'test/unit'
+
+class TestDocumentWrite < Test::Unit::TestCase
+  def setup
+    load_encoding("utf-8")
+  end
+
+  def teardown
+    XML.default_keep_blanks = true
+    @doc = nil
+  end
+
+  def load_encoding(name)
+    @encoding = Encoding.find(name) if defined?(Encoding)
+    @file_name = "model/bands.#{name.downcase}.xml"
+
+    # Strip spaces to make testing easier
+    XML.default_keep_blanks = false
+    file = File.join(File.dirname(__FILE__), @file_name)
+    @doc = XML::Document.file(file)
+  end
+
+  # ---  to_s tests  ---
+  def test_to_s_default
+    # Default to_s has indentation
+    if defined?(Encoding)
+      assert_equal("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<bands genre=\"metal\">\n  <m\u00F6tley_cr\u00FCe country=\"us\">M\u00F6tley Cr\u00FCe is an American heavy metal band formed in Los Angeles, California in 1981.</m\u00F6tley_cr\u00FCe>\n  <iron_maiden country=\"uk\">Iron Maiden is a British heavy metal band formed in 1975.</iron_maiden>\n</bands>\n",
+                   @doc.to_s)
+    else
+      assert_equal("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<bands genre=\"metal\">\n  <m\303\266tley_cr\303\274e country=\"us\">M\303\266tley Cr\303\274e is an American heavy metal band formed in Los Angeles, California in 1981.</m\303\266tley_cr\303\274e>\n  <iron_maiden country=\"uk\">Iron Maiden is a British heavy metal band formed in 1975.</iron_maiden>\n</bands>\n",
+                   @doc.to_s)
+    end
+  end
+
+  def test_to_s_no_global_indentation
+    # No indentation due to global setting
+    XML.indent_tree_output = false
+    value = @doc.to_s
+
+    if defined?(Encoding)
+      assert_equal(Encoding::UTF_8, value.encoding)
+      assert_equal("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<bands genre=\"metal\">\n<m\u00F6tley_cr\u00FCe country=\"us\">M\u00F6tley Cr\u00FCe is an American heavy metal band formed in Los Angeles, California in 1981.</m\u00F6tley_cr\u00FCe>\n<iron_maiden country=\"uk\">Iron Maiden is a British heavy metal band formed in 1975.</iron_maiden>\n</bands>\n",
+                   value)
+    else
+      assert_equal("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<bands genre=\"metal\">\n<m\303\266tley_cr\303\274e country=\"us\">M\303\266tley Cr\303\274e is an American heavy metal band formed in Los Angeles, California in 1981.</m\303\266tley_cr\303\274e>\n<iron_maiden country=\"uk\">Iron Maiden is a British heavy metal band formed in 1975.</iron_maiden>\n</bands>\n",
+                   value)
+    end
+  ensure
+    XML.indent_tree_output = true
+  end
+
+  def test_to_s_no_indentation
+    # No indentation due to local setting
+    value = @doc.to_s(:indent => false)
+    if defined?(Encoding)
+      assert_equal(Encoding::UTF_8, value.encoding)
+      assert_equal("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<bands genre=\"metal\"><m\u00F6tley_cr\u00FCe country=\"us\">M\u00F6tley Cr\u00FCe is an American heavy metal band formed in Los Angeles, California in 1981.</m\u00F6tley_cr\u00FCe><iron_maiden country=\"uk\">Iron Maiden is a British heavy metal band formed in 1975.</iron_maiden></bands>\n",
+                   value)
+    else
+      assert_equal("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<bands genre=\"metal\"><m\303\266tley_cr\303\274e country=\"us\">M\303\266tley Cr\303\274e is an American heavy metal band formed in Los Angeles, California in 1981.</m\303\266tley_cr\303\274e><iron_maiden country=\"uk\">Iron Maiden is a British heavy metal band formed in 1975.</iron_maiden></bands>\n",
+                   value)
+    end
+  end
+
+  def test_to_s_encoding
+    # Test encodings
+
+    # UTF8:
+    # ö - c3 b6 in hex, \303\266 in octal
+    # ü - c3 bc in hex, \303\274 in octal
+    value = @doc.to_s(:encoding => XML::Encoding::UTF_8)
+    if defined?(Encoding)
+      assert_equal(Encoding::UTF_8, value.encoding)
+      assert_equal("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<bands genre=\"metal\">\n  <m\u00F6tley_cr\u00FCe country=\"us\">M\u00F6tley Cr\u00FCe is an American heavy metal band formed in Los Angeles, California in 1981.</m\u00F6tley_cr\u00FCe>\n  <iron_maiden country=\"uk\">Iron Maiden is a British heavy metal band formed in 1975.</iron_maiden>\n</bands>\n",
+                   value)
+    else
+      assert_equal("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<bands genre=\"metal\">\n  <m\303\266tley_cr\303\274e country=\"us\">M\303\266tley Cr\303\274e is an American heavy metal band formed in Los Angeles, California in 1981.</m\303\266tley_cr\303\274e>\n  <iron_maiden country=\"uk\">Iron Maiden is a British heavy metal band formed in 1975.</iron_maiden>\n</bands>\n",
+                   value)
+    end
+
+    # ISO_8859_1:
+    # ö - f6 in hex, \366 in octal
+    # ü - fc in hex, \374 in octal
+    value = @doc.to_s(:encoding => XML::Encoding::ISO_8859_1)
+    if defined?(Encoding)
+      assert_equal(Encoding::ISO8859_1, value.encoding)
+      assert_equal("<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n<bands genre=\"metal\">\n  <m\xF6tley_cr\xFCe country=\"us\">M\xF6tley Cr\xFCe is an American heavy metal band formed in Los Angeles, California in 1981.</m\xF6tley_cr\xFCe>\n  <iron_maiden country=\"uk\">Iron Maiden is a British heavy metal band formed in 1975.</iron_maiden>\n</bands>\n".force_encoding(Encoding::ISO8859_1),
+                   @doc.to_s(:encoding => XML::Encoding::ISO_8859_1))
+    else
+      assert_equal("<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n<bands genre=\"metal\">\n  <m\366tley_cr\374e country=\"us\">M\366tley Cr\374e is an American heavy metal band formed in Los Angeles, California in 1981.</m\366tley_cr\374e>\n  <iron_maiden country=\"uk\">Iron Maiden is a British heavy metal band formed in 1975.</iron_maiden>\n</bands>\n",
+                   @doc.to_s(:encoding => XML::Encoding::ISO_8859_1))
+    end
+    
+    # Invalid encoding
+    error = assert_raise(ArgumentError) do
+      @doc.to_s(:encoding => -9999)
+    end
+    assert_equal('Unknown encoding value: -9999', error.to_s)
+  end
+
+  # --- save tests -----
+  def test_save_utf8
+    temp_filename = File.join(Dir.tmpdir, "tc_document_write_test_save_utf8.xml")
+
+    bytes = @doc.save(temp_filename)
+    assert_equal(305, bytes)
+
+    if defined?(Encoding)
+      contents = File.read(temp_filename, nil, nil, :encoding => Encoding::UTF_8)
+      assert_equal(Encoding::UTF_8, contents.encoding)
+      assert_equal("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<bands genre=\"metal\">\n  <m\u00F6tley_cr\u00FCe country=\"us\">M\u00F6tley Cr\u00FCe is an American heavy metal band formed in Los Angeles, California in 1981.</m\u00F6tley_cr\u00FCe>\n  <iron_maiden country=\"uk\">Iron Maiden is a British heavy metal band formed in 1975.</iron_maiden>\n</bands>\n",
+                    contents)
+    else
+      contents = File.read(temp_filename)
+      assert_equal("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<bands genre=\"metal\">\n  <m\303\266tley_cr\303\274e country=\"us\">M\303\266tley Cr\303\274e is an American heavy metal band formed in Los Angeles, California in 1981.</m\303\266tley_cr\303\274e>\n  <iron_maiden country=\"uk\">Iron Maiden is a British heavy metal band formed in 1975.</iron_maiden>\n</bands>\n",
+                 contents)
+    end
+  ensure
+    File.delete(temp_filename)
+  end
+
+  def test_save_utf8_no_indents
+    temp_filename = File.join(Dir.tmpdir, "tc_document_write_test_save_utf8_no_indents.xml")
+
+    bytes = @doc.save(temp_filename, :indent => false)
+    assert_equal(298, bytes)
+
+    if defined?(Encoding)
+      contents = File.read(temp_filename, nil, nil, :encoding => Encoding::UTF_8)
+      assert_equal("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<bands genre=\"metal\"><m\u00F6tley_cr\u00FCe country=\"us\">M\u00F6tley Cr\u00FCe is an American heavy metal band formed in Los Angeles, California in 1981.</m\u00F6tley_cr\u00FCe><iron_maiden country=\"uk\">Iron Maiden is a British heavy metal band formed in 1975.</iron_maiden></bands>\n",
+                 contents)
+    else
+      contents = File.read(temp_filename)
+      assert_equal("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<bands genre=\"metal\"><m\303\266tley_cr\303\274e country=\"us\">M\303\266tley Cr\303\274e is an American heavy metal band formed in Los Angeles, California in 1981.</m\303\266tley_cr\303\274e><iron_maiden country=\"uk\">Iron Maiden is a British heavy metal band formed in 1975.</iron_maiden></bands>\n",
+                 contents)
+    end
+  ensure
+    File.delete(temp_filename)
+  end
+
+  def test_save_iso_8859_1
+    temp_filename = File.join(Dir.tmpdir, "tc_document_write_test_save_iso_8859_1.xml")
+    bytes = @doc.save(temp_filename, :encoding => XML::Encoding::ISO_8859_1)
+    assert_equal(304, bytes)
+
+    if defined?(Encoding)
+      contents = File.read(temp_filename, nil, nil, :encoding => Encoding::ISO8859_1)
+      assert_equal(Encoding::ISO8859_1, contents.encoding)
+      assert_equal("<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n<bands genre=\"metal\">\n  <m\xF6tley_cr\xFCe country=\"us\">M\xF6tley Cr\xFCe is an American heavy metal band formed in Los Angeles, California in 1981.</m\xF6tley_cr\xFCe>\n  <iron_maiden country=\"uk\">Iron Maiden is a British heavy metal band formed in 1975.</iron_maiden>\n</bands>\n".force_encoding(Encoding::ISO8859_1),
+                 contents)
+    else
+      contents = File.read(temp_filename)
+      assert_equal("<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n<bands genre=\"metal\">\n  <m\xF6tley_cr\xFCe country=\"us\">M\xF6tley Cr\xFCe is an American heavy metal band formed in Los Angeles, California in 1981.</m\xF6tley_cr\xFCe>\n  <iron_maiden country=\"uk\">Iron Maiden is a British heavy metal band formed in 1975.</iron_maiden>\n</bands>\n",
+                 contents)
+    end
+  ensure
+    File.delete(temp_filename)
+  end
+
+  def test_save_iso_8859_1_no_indent
+    temp_filename = File.join(Dir.tmpdir, "tc_document_write_test_save_iso_8859_1_no_indent.xml")
+    bytes = @doc.save(temp_filename, :indent => false, :encoding => XML::Encoding::ISO_8859_1)
+    assert_equal(297, bytes)
+
+    if defined?(Encoding)
+      contents = File.read(temp_filename, nil, nil, :encoding => Encoding::ISO8859_1)
+      assert_equal(Encoding::ISO8859_1, contents.encoding)
+      assert_equal("<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n<bands genre=\"metal\"><m\xF6tley_cr\xFCe country=\"us\">M\xF6tley Cr\xFCe is an American heavy metal band formed in Los Angeles, California in 1981.</m\xF6tley_cr\xFCe><iron_maiden country=\"uk\">Iron Maiden is a British heavy metal band formed in 1975.</iron_maiden></bands>\n".force_encoding(Encoding::ISO8859_1),
+                   contents)
+    else
+      contents = File.read(temp_filename)
+      assert_equal("<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n<bands genre=\"metal\"><m\xF6tley_cr\xFCe country=\"us\">M\xF6tley Cr\xFCe is an American heavy metal band formed in Los Angeles, California in 1981.</m\xF6tley_cr\xFCe><iron_maiden country=\"uk\">Iron Maiden is a British heavy metal band formed in 1975.</iron_maiden></bands>\n",
+                   contents)
+    end
+  ensure
+    File.delete(temp_filename)
+  end
+
+  # --- Debug ---
+  def test_debug
+    assert(@doc.debug)
+  end
 end

data/test/tc_dtd.rb

@@ -1,123 +1,125 @@
-require "xml"
-require 'test/unit'
-
-class TestDtd < Test::Unit::TestCase
-  def setup
-    xp = XML::Parser.string(<<-EOS)
-      <root>
-        <head a="ee" id="1">Colorado</head>
-        <descr>Lots of nice mountains</descr>
-      </root>
-    EOS
-    @doc = xp.parse
-  end
-
-  def teardown
-    @doc = nil
-  end
-  
-  def dtd
-    XML::Dtd.new(<<-EOS)
-      <!ELEMENT root (head, descr)>
-      <!ELEMENT head (#PCDATA)>
-      <!ATTLIST head
-        id NMTOKEN #REQUIRED
-        a CDATA #IMPLIED
-      >
-      <!ELEMENT descr (#PCDATA)>
-    EOS
-  end
-  
-  def test_internal_subset
-    xhtml_dtd = XML::Dtd.new "-//W3C//DTD XHTML 1.0 Transitional//EN", "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd", nil, nil, true
-		assert xhtml_dtd.name.nil?
-		assert_equal "-//W3C//DTD XHTML 1.0 Transitional//EN", xhtml_dtd.external_id
-		assert_equal "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd", xhtml_dtd.uri
-		assert_equal "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd", xhtml_dtd.system_id
-
-    xhtml_dtd = XML::Dtd.new "-//W3C//DTD XHTML 1.0 Transitional//EN", "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd", "xhtml1", nil, true
-		assert_equal "xhtml1", xhtml_dtd.name
-		assert_equal "-//W3C//DTD XHTML 1.0 Transitional//EN", xhtml_dtd.external_id
-		assert_equal "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd", xhtml_dtd.uri
-		assert_equal "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd", xhtml_dtd.system_id
-	end
-
-  def test_external_subset
-    xhtml_dtd = XML::Dtd.new "-//W3C//DTD XHTML 1.0 Transitional//EN", "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd", nil
-		assert xhtml_dtd.name.nil?
-		assert_equal "-//W3C//DTD XHTML 1.0 Transitional//EN", xhtml_dtd.external_id
-		assert_equal "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd", xhtml_dtd.uri
-		assert_equal "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd", xhtml_dtd.system_id
-
-    xhtml_dtd = XML::Dtd.new "-//W3C//DTD XHTML 1.0 Transitional//EN", "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd", "xhtml1"
-		assert_equal "xhtml1", xhtml_dtd.name
-		assert_equal "-//W3C//DTD XHTML 1.0 Transitional//EN", xhtml_dtd.external_id
-		assert_equal "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd", xhtml_dtd.uri
-		assert_equal "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd", xhtml_dtd.system_id
-	end
-
-  def test_valid
-    assert(@doc.validate(dtd))
-  end
-
-  def test_invalid
-    new_node = XML::Node.new('invalid', 'this will mess up validation')
-    @doc.root.child_add(new_node)
-
-    messages = Hash.new
-    error = assert_raise(XML::Error) do
-      @doc.validate(dtd)
-    end
-
-    # Check the error worked
-    assert_not_nil(error)
-    assert_kind_of(XML::Error, error)
-    assert_equal("Error: No declaration for element invalid.", error.message)
-    assert_equal(XML::Error::VALID, error.domain)
-    assert_equal(XML::Error::DTD_UNKNOWN_ELEM, error.code)
-    assert_equal(XML::Error::ERROR, error.level)
-    assert_nil(error.file)
-    assert_nil(error.line)
-    assert_equal('invalid', error.str1)
-    assert_equal('invalid', error.str2)
-    assert_nil(error.str3)
-    assert_equal(0, error.int1)
-    assert_equal(0, error.int2)
-    assert_not_nil(error.node)
-    assert_equal('invalid', error.node.name)
-  end
-
-  def test_external_dtd
-    xml = <<-EOS
-      <!DOCTYPE test PUBLIC "-//TEST" "test.dtd" []>
-      <test>
-        <title>T1</title>
-      </test>
-    EOS
-
-    errors = Array.new
-    XML::Error.set_handler do |error|
-      errors << error
-    end
-
-    XML.default_load_external_dtd = false
-    doc = XML::Parser.string(xml).parse
-    assert_equal(0, errors.length)
-
-    errors.clear
-    XML.default_load_external_dtd = true
-    doc = XML::Parser.string(xml).parse
-    assert_equal(1, errors.length)
-    assert_equal("Warning: failed to load external entity \"test.dtd\" at :1.",
-                 errors[0].to_s)
-
-    errors = Array.new
-    doc = XML::Parser.string(xml, :options => XML::Parser::Options::DTDLOAD).parse
-    assert_equal(1, errors.length)
-    assert_equal("Warning: failed to load external entity \"test.dtd\" at :1.",
-                 errors[0].to_s)
-  ensure
-    XML.default_load_external_dtd = false
-    XML::Error.reset_handler
-  end
-end
+# encoding: UTF-8
+
+require './test_helper'
+
+require 'test/unit'
+
+class TestDtd < Test::Unit::TestCase
+  def setup
+    xp = XML::Parser.string(<<-EOS)
+      <root>
+        <head a="ee" id="1">Colorado</head>
+        <descr>Lots of nice mountains</descr>
+      </root>
+    EOS
+    @doc = xp.parse
+  end
+
+  def teardown
+    @doc = nil
+  end
+  
+  def dtd
+    XML::Dtd.new(<<-EOS)
+      <!ELEMENT root (head, descr)>
+      <!ELEMENT head (#PCDATA)>
+      <!ATTLIST head
+        id NMTOKEN #REQUIRED
+        a CDATA #IMPLIED
+      >
+      <!ELEMENT descr (#PCDATA)>
+    EOS
+  end
+  
+  def test_internal_subset
+    xhtml_dtd = XML::Dtd.new "-//W3C//DTD XHTML 1.0 Transitional//EN", "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd", nil, nil, true
+		assert xhtml_dtd.name.nil?
+		assert_equal "-//W3C//DTD XHTML 1.0 Transitional//EN", xhtml_dtd.external_id
+		assert_equal "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd", xhtml_dtd.uri
+		assert_equal "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd", xhtml_dtd.system_id
+
+    xhtml_dtd = XML::Dtd.new "-//W3C//DTD XHTML 1.0 Transitional//EN", "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd", "xhtml1", nil, true
+		assert_equal "xhtml1", xhtml_dtd.name
+		assert_equal "-//W3C//DTD XHTML 1.0 Transitional//EN", xhtml_dtd.external_id
+		assert_equal "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd", xhtml_dtd.uri
+		assert_equal "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd", xhtml_dtd.system_id
+	end
+
+  def test_external_subset
+    xhtml_dtd = XML::Dtd.new "-//W3C//DTD XHTML 1.0 Transitional//EN", "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd", nil
+		assert xhtml_dtd.name.nil?
+		assert_equal "-//W3C//DTD XHTML 1.0 Transitional//EN", xhtml_dtd.external_id
+		assert_equal "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd", xhtml_dtd.uri
+		assert_equal "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd", xhtml_dtd.system_id
+
+    xhtml_dtd = XML::Dtd.new "-//W3C//DTD XHTML 1.0 Transitional//EN", "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd", "xhtml1"
+		assert_equal "xhtml1", xhtml_dtd.name
+		assert_equal "-//W3C//DTD XHTML 1.0 Transitional//EN", xhtml_dtd.external_id
+		assert_equal "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd", xhtml_dtd.uri
+		assert_equal "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd", xhtml_dtd.system_id
+	end
+
+  def test_valid
+    assert(@doc.validate(dtd))
+  end
+
+  def test_invalid
+    new_node = XML::Node.new('invalid', 'this will mess up validation')
+    @doc.root << new_node
+
+    error = assert_raise(XML::Error) do
+      @doc.validate(dtd)
+    end
+
+    # Check the error worked
+    assert_not_nil(error)
+    assert_kind_of(XML::Error, error)
+    assert_equal("Error: No declaration for element invalid.", error.message)
+    assert_equal(XML::Error::VALID, error.domain)
+    assert_equal(XML::Error::DTD_UNKNOWN_ELEM, error.code)
+    assert_equal(XML::Error::ERROR, error.level)
+    assert_nil(error.file)
+    assert_nil(error.line)
+    assert_equal('invalid', error.str1)
+    assert_equal('invalid', error.str2)
+    assert_nil(error.str3)
+    assert_equal(0, error.int1)
+    assert_equal(0, error.int2)
+    assert_not_nil(error.node)
+    assert_equal('invalid', error.node.name)
+  end
+
+  def test_external_dtd
+    xml = <<-EOS
+      <!DOCTYPE test PUBLIC "-//TEST" "test.dtd" []>
+      <test>
+        <title>T1</title>
+      </test>
+    EOS
+
+    errors = Array.new
+    XML::Error.set_handler do |error|
+      errors << error
+    end
+
+    XML.default_load_external_dtd = false
+    doc = XML::Parser.string(xml).parse
+    assert_equal(0, errors.length)
+
+    errors.clear
+    XML.default_load_external_dtd = true
+    doc = XML::Parser.string(xml).parse
+    assert_equal(1, errors.length)
+    assert_equal("Warning: failed to load external entity \"test.dtd\" at :1.",
+                 errors[0].to_s)
+
+    errors = Array.new
+    doc = XML::Parser.string(xml, :options => XML::Parser::Options::DTDLOAD).parse
+    assert_equal(1, errors.length)
+    assert_equal("Warning: failed to load external entity \"test.dtd\" at :1.",
+                 errors[0].to_s)
+  ensure
+    XML.default_load_external_dtd = false
+    XML::Error.reset_handler
+  end
+end