testunitxml 0.1.4 → 0.1.5

data/lib/test/unit/xml/doctype_mixin.rb

@@ -1,3 +1,6 @@
+
+require 'test/unit/xml/notationdecl_mixin'
+
 module REXML
 
   # The REXML::DocType mix-in adds methods that are useful for
@@ -7,12 +10,22 @@ module REXML
     
     # This method retrieves the public identifier identifying the document's DTD.
     def public
-      @long_name
+      case @external_id
+      when "SYSTEM"
+        nil
+      when "PUBLIC"
+        strip_quotes(@long_name)
+      end
     end
     
     # This method retrieves the system identifier identifying the document's DTD
     def system
-      @uri
+      case @external_id
+      when "SYSTEM"
+        strip_quotes(@long_name)
+      when "PUBLIC"
+        @uri.kind_of?(String) ? strip_quotes(@uri) : nil
+      end
     end
     
     # This method returns a list of notations that have been declared in the
@@ -28,5 +41,14 @@ module REXML
         notation_decl.name == name
       }
     end
+    
+    private
+    
+    def strip_quotes(quoted_string)
+      quoted_string =~ /^[\'\"].*[\�\"]$/ ?
+        quoted_string[1, quoted_string.length-2] :
+        quoted_string
+    end
+    
   end
 end

data/lib/test/unit/xml/xml_assertions.rb

@@ -5,6 +5,7 @@ require 'test/unit/xml/attributes_mixin' # Must be required after rexml/document
 require 'test/unit/xml/doctype_mixin' # Must be required after rexml/document
 require 'test/unit/xml/notationdecl_mixin' # Must be required after rexml/document
 require 'test/unit'
+require 'test/unit/xml/conditionals'
 require 'test/unit/xml/xmlequalfilter'
 require 'test/unit/xml/nodeiterator'
 
@@ -15,7 +16,7 @@ meant to be mixed in to test classes such as Test::Unit::TestCase.
 module Test
   module Unit
     module XML
-
+      
       # This method checks whether two well-formed XML documents are equal.
       # Two XML documents are considered equal if:
       # * They contain the same type of nodes, in the same order,
@@ -105,6 +106,23 @@ EOT
         end
       end
       
+      
+      # This method compares two XML documents and returns +true+ if they are
+      # _not_ equal, +false+ otherwise. This is the inverse of assert_xml_equal.
+      def assert_xml_not_equal(expected_doc, actual_doc, message = nil)
+        expected_doc = parse_xml(expected_doc)
+        actual_doc = parse_xml(actual_doc)
+        _wrap_assertion do
+          full_message = build_message(message, <<EOT, actual_doc.inspect, expected_doc.inspect)
+
+<?> expected not to be equal to
+<?> but was equal.
+EOT
+          assert_block(full_message){ ! are_equal?(expected_doc, actual_doc)}
+        end
+      end
+      
+      
       private
       
       def parse_xml(xml)
@@ -119,8 +137,9 @@ EOT
       end
       
       def are_equal?(expected_doc, actual_doc)
+        comparator = Conditionals.create
         iterate(expected_doc, actual_doc) do |expected_node, actual_node|
-          unless compare_xml_nodes(expected_node, actual_node)
+          unless comparator.compare_xml_nodes(expected_node, actual_node)
             return false
           end
         end
@@ -137,118 +156,7 @@ EOT
           yield expected_node, actual_node
         end
       end
-      
-      def compare_xml_nodes(expected_node, actual_node)
-        return false unless actual_node.instance_of? expected_node.class
-        case actual_node
-        when REXML::Document
-          # TODO: Implement Document comparison
-          true
-        when REXML::DocType
-          compare_doctypes(expected_node, actual_node)
-        when REXML::Element :
-          compare_elements(expected_node, actual_node)
-        when REXML::CData
-          compare_texts(expected_node, actual_node)
-        when REXML::Text
-          compare_texts(expected_node, actual_node)
-        when REXML::Comment
-          compare_comments(expected_node, actual_node)
-        when REXML::Instruction
-          compare_pi(expected_node, actual_node)
-        when REXML::XMLDecl
-          compare_xml_declaration(expected_node, actual_node)
-        #when REXML::Entity
-        #  compare_xml_entities(expected_node, actual_node)
-        else
-          puts "Unknown node type #{actual_node.class}"
-          false
-        end
-      end
-      
-      def compare_doctypes(expected_node, actual_node)
-        return compare_system_id(expected_node.system, actual_node.system) &&
-          expected_node.public == actual_node.public &&
-          compare_xml_internal_dtd_subset(expected_node, actual_node)
-      end
-      
-      def compare_system_id(expected_id, actual_id)
-        is_expected_urn = expected_id =~ /^urn:/i
-        is_actual_urn = actual_id =~ /^urn:/i
-        if is_expected_urn || is_actual_urn
-          expected_id == actual_id
-        else
-          true
-        end
-      end
-      
-      def compare_elements(expected_node, actual_node)
-        return  expected_node.name == actual_node.name &&
-                expected_node.namespace() == actual_node.namespace() &&
-                compare_attributes(expected_node.attributes, actual_node.attributes)
-      end
-            
-      def compare_attributes(expected_attributes, actual_attributes)
-        return false unless attribute_count(expected_attributes) == attribute_count(actual_attributes)
-        expected_attributes.each_attribute do |expected_attribute|
-          expected_prefix = expected_attribute.prefix()
-          unless expected_prefix == 'xmlns' then
-            expected_name = expected_attribute.name
-            expected_namespace = expected_attribute.namespace
-            actual_attribute = actual_attributes.get_attribute_ns(expected_namespace, expected_name)
-            return false unless actual_attribute
-            return false if expected_attribute != actual_attribute
-          end
-        end
-        true
-      end
-      
-      def attribute_count(attributes)
-        # Do not count namespace declarations
-        attributes.size - attributes.prefixes.size
-      end
-          
-      def compare_texts(expected_node, actual_node)
-        expected_node.value.eql?(actual_node.value)
-      end  
-      
-      def compare_comments(expected_node, actual_node)
-        expected_node == actual_node
-      end
-      
-      def compare_pi(expected_pi, actual_pi)
-        return expected_pi.target == actual_pi.target &&
-               expected_pi.content == actual_pi.content
-      end
-      
-      def compare_xml_declaration(expected_decl, actual_decl)
-        return expected_decl == actual_decl
-      end
-      
-      def compare_xml_internal_dtd_subset(expected_node, actual_node)
-        expected_subset = expected_node.children()
-        actual_subset = actual_node.children()
-        return false unless expected_subset.length == actual_subset.length
-        expected_subset.inject(true) { |memo, expected_decl|
-          case expected_decl
-          when REXML::Entity
-            memo &&
-            expected_decl.value == actual_node.entities[expected_decl.name].value &&
-            expected_decl.ndata == actual_node.entities[expected_decl.name].ndata
-          when REXML::NotationDecl
-            actual_notation_decl = actual_node.notation(expected_decl.name)
-            memo &&
-            actual_notation_decl != nil &&
-            expected_decl.name == actual_notation_decl.name &&
-            expected_decl.public == actual_notation_decl.public &&
-            expected_decl.system == actual_notation_decl.system
-          when REXML::Comment
-            true
-          else
-            raise "Unexpected node type in internal DTD subset of expected document: " + expected_decl.inspect
-          end
-        }
-      end
+
     end
   end
 end

data/test/tc_attributes_mixin.rb

@@ -0,0 +1,37 @@
+#! /usr/local/bin/ruby
+
+
+@@lib_path = File.join(File.dirname(__FILE__), "..", "lib")
+$:.unshift @@lib_path 
+
+require 'test/unit'
+require 'rexml/document'
+require 'test/unit/xml/attributes_mixin.rb'
+
+class TestAttributes < Test::Unit::TestCase
+
+  def setup
+    @ns_a = "urn:x-test:a"
+    @ns_b = "urn:x-test:b"
+    element_string = <<-"XMLEND"
+    <test xmlns:a="#{@ns_a}"
+          xmlns:b="#{@ns_b}"
+          a = "1"
+          b = '2'
+          a:c = "3"
+          a:d = '4'
+          a:e = "5"
+          b:f = "6"/>
+    XMLEND
+    @attributes = REXML::Document.new(element_string).root.attributes
+  end
+  
+  def test_get_attribute_ns
+    assert_equal("1", @attributes.get_attribute_ns("", "a").value)
+    assert_equal("2", @attributes.get_attribute_ns("", "b").value)
+    assert_equal("3", @attributes.get_attribute_ns(@ns_a, "c").value)
+    assert_equal("4", @attributes.get_attribute_ns(@ns_a, "d").value)
+    assert_equal("5", @attributes.get_attribute_ns(@ns_a, "e").value)
+    assert_equal("6", @attributes.get_attribute_ns(@ns_b, "f").value)
+  end
+end

data/test/tc_doctype_mixin.rb

@@ -0,0 +1,71 @@
+#! /usr/local/bin/ruby
+
+
+@@lib_path = File.join(File.dirname(__FILE__), "..", "lib")
+$:.unshift @@lib_path 
+
+require 'test/unit'
+require 'rexml/document'
+require 'test/unit/xml/doctype_mixin.rb'
+
+class TestDoctype < Test::Unit::TestCase
+
+  def setup
+    @sysid = "urn:x-test:sysid1"
+    @notid1 = "urn:x-test:notation1"
+    @notid2 = "urn:x-test:notation2"
+    document_string1 = <<-"XMLEND"
+    <!DOCTYPE r SYSTEM "#{@sysid}" [
+      <!NOTATION n1 SYSTEM "#{@notid1}">
+      <!NOTATION n2 SYSTEM "#{@notid2}">
+    ]>
+    <r/>
+    XMLEND
+    @doctype1 = REXML::Document.new(document_string1).doctype
+    
+    @pubid = "TEST_ID"
+    document_string2 = <<-"XMLEND"
+    <!DOCTYPE r PUBLIC "#{@pubid}">
+    <r/>
+    XMLEND
+    @doctype2 = REXML::Document.new(document_string2).doctype
+
+    document_string3 = <<-"XMLEND"
+    <!DOCTYPE r PUBLIC "#{@pubid}" "#{@sysid}">
+    <r/>
+    XMLEND
+    @doctype3 = REXML::Document.new(document_string3).doctype
+  
+  end
+   
+  def test_public
+    assert_equal(nil, @doctype1.public)
+    assert_equal(@pubid, @doctype2.public)
+    assert_equal(@pubid, @doctype3.public)
+  end
+  
+  def test_system
+    assert_equal(@sysid, @doctype1.system)
+    assert_equal(nil, @doctype2.system)
+    assert_equal(@sysid, @doctype3.system)
+  end
+
+  def test_notation
+    assert_equal(@notid1, @doctype1.notation("n1").system)
+    assert_equal(@notid2, @doctype1.notation("n2").system)
+  end
+  
+  def test_notations
+    notations = @doctype1.notations
+    assert_equal(2, notations.length)
+    assert_equal(@notid1, find_notation(notations, "n1").system)
+    assert_equal(@notid2, find_notation(notations, "n2").system)
+  end
+  
+  def find_notation(notations, name)
+    notations.find { |notation|
+      name == notation.name
+    }
+  end
+  
+end

data/test/tc_notationdecl_mixin.rb

@@ -1,50 +1,68 @@
-#! /usr/bin/ruby
+#! /usr/local/bin/ruby
 
 
 @@lib_path = File.join(File.dirname(__FILE__), "..", "lib")
 $:.unshift @@lib_path 
 
-require 'test/unit/xml'
+require 'test/unit'
+require 'rexml/document'
+require 'test/unit/xml/doctype_mixin'
+require 'test/unit/xml/notationdecl_mixin'
 
 class TestNotationDecl < Test::Unit::TestCase
 
   def setup
-    doc_string = <<-'XMLEND'
+    @pubid1 = "TEST1"
+    @pubid2 = "TEST2"
+    @sysid2 = "urn:x-henrikmartensson.org:test2"
+    @pubid3 = "TEST3"
+    @pubid4 = "TEST4"
+    @sysid4 = "urn:x-henrikmartensson.org:test4"
+    @pubid5 = "TEST5"
+    @sysid5 = "urn:x-henrikmartensson.org:test5"
+    @pubid6 = "TEST6"
+    @sysid6 = "urn:x-henrikmartensson.org:test6"
+    @sysid7 = "urn:x-henrikmartensson.org:test7"
+    doc_string = <<-"XMLEND"
     <!DOCTYPE r SYSTEM "urn:x-henrikmartensson:test" [
-      <!NOTATION n1 PUBLIC "TEST1">
-      <!NOTATION n2 PUBLIC "TEST2" "urn:x-henrikmartensson.org:test2">
-      <!NOTATION n3 PUBLIC 'TEST3'>
-      <!NOTATION n4 PUBLIC 'TEST4' 'urn:x-henrikmartensson.org:test4'>
-      <!NOTATION n5 PUBLIC "TEST5" 'urn:x-henrikmartensson.org:test5'>
-      <!NOTATION n6 PUBLIC 'TEST6' "urn:x-henrikmartensson.org:test6">
-      <!NOTATION n7 SYSTEM "urn:x-henrikmartensson.org:test7">
+      <!NOTATION n1 PUBLIC "#{@pubid1}">
+      <!NOTATION n2 PUBLIC "#{@pubid2}" "#{@sysid2}">
+      <!NOTATION n3 PUBLIC '#{@pubid3}'>
+      <!NOTATION n4 PUBLIC '#{@pubid4}' '#{@sysid4}'>
+      <!NOTATION n5 PUBLIC "#{@pubid5}" '#{@sysid5}'>
+      <!NOTATION n6 PUBLIC '#{@pubid6}' "#{@sysid6}">
+      <!NOTATION n7 SYSTEM "#{@sysid7}">
     ]>
     <r/>
     XMLEND
     @doctype = REXML::Document.new(doc_string).doctype
   end
   
+  def test_name
+    assert_equal('n1', @doctype.notation('n1').name)
+  end
+  
   def test_public
-    assert_equal('TEST1', @doctype.notation('n1').public)
-    assert_equal('TEST2', @doctype.notation('n2').public)
-    assert_equal('TEST3', @doctype.notation('n3').public)
-    assert_equal('TEST4', @doctype.notation('n4').public)
+    assert_equal(@pubid1, @doctype.notation('n1').public)
+    assert_equal(@pubid2, @doctype.notation('n2').public)
+    assert_equal(@pubid3, @doctype.notation('n3').public)
+    assert_equal(@pubid4, @doctype.notation('n4').public)
     # The TEST5 and TEST6 assertions have been commented out because
     # REXML 3.1.2 does not parse the notations correctly.
-    #assert_equal('TEST5', @doctype.notation('n5').public)
-    #assert_equal('TEST6', @doctype.notation('n6').public)
+    #assert_equal(@pubid5, @doctype.notation('n5').public)
+    #assert_equal(@pubid6, @doctype.notation('n6').public)
     assert_nil(@doctype.notation('n7').public)
   end
   
   def test_system
-    assert_equal("urn:x-henrikmartensson.org:test2", @doctype.notation('n2').system)
+    assert_equal(@sysid2, @doctype.notation('n2').system)
     assert_nil(@doctype.notation('n3').system)
-    assert_equal("urn:x-henrikmartensson.org:test4", @doctype.notation('n4').system)
+    assert_equal(@sysid4, @doctype.notation('n4').system)
     # The TEST5 and TEST6 assertions have been commented out because
     # REXML 3.1.2 does not parse the notations correctly.
-    #assert_equal('urn:x-henrikmartensson.org:test5', @doctype.notation('n5').system)
-    #assert_equal('urn:x-henrikmartensson.org:test6', @doctype.notation('n6').system)
-    assert_equal("urn:x-henrikmartensson.org:test7", @doctype.notation('n7').system)
+    #assert_equal(@sysid5, @doctype.notation('n5').system)
+    #assert_equal(@sysid6, @doctype.notation('n6').system)
+    assert_equal(@sysid7, @doctype.notation('n7').system)
   end
 
 end

data/test/tc_testunitxml.rb

@@ -290,5 +290,26 @@ class TestTestUnitXml < Test::Unit::TestCase
     check_assertion_failure(string1, string3)
     check_assertion_failure(string4, string5)
   end
+  
+  def test_xml_not_equal
+    assert_xml_not_equal(@element1, @element2)
+    assert_xml_not_equal(@element1, @element3)
+    assert_xml_not_equal(@element1, @element4)
+    assert_xml_not_equal(@element1, @element5)
+  end
+  
+  def test_entity_in_attribute
+    # This test was propmpted by a bug report from
+    # Paul Battley
+    xml_string = '<root text="This &amp; that"/>'
+    doc_original = REXML::Document.new(xml_string)
+    doc_clone = doc_original.dup
+    assert_xml_equal(doc_original, doc_clone)
+    
+    xml_different = '<root text="this &amp; that"/>'
+    doc_different = REXML::Document.new(xml_different)
+    assert_xml_not_equal(doc_original, doc_different)
+  end
+  
     
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: testunitxml
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
-date: 2006-01-23 00:00:00 +01:00
+  version: 0.1.5
+date: 2006-04-18 00:00:00 +02:00
 summary: Unit test suite for XML documents
 require_paths: 
 - lib
@@ -48,6 +48,7 @@ files:
 - docs/html/files/lib/test/unit
 - docs/html/files/lib/test/unit/xml_rb.html
 - docs/html/files/lib/test/unit/xml
+- docs/html/files/lib/test/unit/xml/conditionals_rb.html
 - docs/html/files/lib/test/unit/xml/xmlequalfilter_rb.html
 - docs/html/files/lib/test/unit/xml/nodeiterator_rb.html
 - docs/html/files/lib/test/unit/xml/attributes_mixin_rb.html
@@ -79,23 +80,29 @@ files:
 - docs/html/classes/Test/Unit/XML.html
 - docs/html/classes/Test/Unit/TestCase.html
 - docs/html/classes/Test/Unit/XML.src/M000009.html
+- docs/html/classes/Test/Unit/XML.src/M000010.html
+- docs/html/classes/Test/Unit/XML/Conditionals.src
 - docs/html/classes/Test/Unit/XML/NodeIterator.src
 - docs/html/classes/Test/Unit/XML/NodeIterator
 - docs/html/classes/Test/Unit/XML/XmlEqualFilter.src
+- docs/html/classes/Test/Unit/XML/Conditionals.html
 - docs/html/classes/Test/Unit/XML/NodeIterator.html
 - docs/html/classes/Test/Unit/XML/XmlEqualFilter.html
-- docs/html/classes/Test/Unit/XML/NodeIterator.src/M000010.html
-- docs/html/classes/Test/Unit/XML/NodeIterator.src/M000011.html
-- docs/html/classes/Test/Unit/XML/NodeIterator.src/M000012.html
+- docs/html/classes/Test/Unit/XML/Conditionals.src/M000011.html
+- docs/html/classes/Test/Unit/XML/Conditionals.src/M000012.html
 - docs/html/classes/Test/Unit/XML/NodeIterator.src/M000013.html
+- docs/html/classes/Test/Unit/XML/NodeIterator.src/M000014.html
+- docs/html/classes/Test/Unit/XML/NodeIterator.src/M000015.html
+- docs/html/classes/Test/Unit/XML/NodeIterator.src/M000016.html
 - docs/html/classes/Test/Unit/XML/NodeIterator/NullNodeFilter.src
 - docs/html/classes/Test/Unit/XML/NodeIterator/NullNodeFilter.html
-- docs/html/classes/Test/Unit/XML/NodeIterator/NullNodeFilter.src/M000014.html
-- docs/html/classes/Test/Unit/XML/XmlEqualFilter.src/M000015.html
+- docs/html/classes/Test/Unit/XML/NodeIterator/NullNodeFilter.src/M000017.html
+- docs/html/classes/Test/Unit/XML/XmlEqualFilter.src/M000018.html
 - lib/test
 - lib/test/unit
 - lib/test/unit/xml
 - lib/test/unit/xml.rb
+- lib/test/unit/xml/conditionals.rb
 - lib/test/unit/xml/xmlequalfilter.rb
 - lib/test/unit/xml/nodeiterator.rb
 - lib/test/unit/xml/attributes_mixin.rb
@@ -103,9 +110,11 @@ files:
 - lib/test/unit/xml/doctype_mixin.rb
 - lib/test/unit/xml/notationdecl_mixin.rb
 - test/data
+- test/tc_attributes_mixin.rb
 - test/tc_testunitxml.rb
 - test/tc_notationdecl_mixin.rb
 - test/ts_testunitxml.rb
+- test/tc_doctype_mixin.rb
 - test/data/test1.xml
 test_files: 
 - test/ts_testunitxml.rb