libxml-ruby 0.8.1-x86-mswin32-60 → 0.8.2-x86-mswin32-60

data/test/ets_tsr.rb

@@ -1,4 +1,4 @@
-require 'libxml'
+require 'xml'
 
 10_000.times {|n|
 j=XML::Node.new2(nil,"happy#{n}")

data/test/model/shiporder.rnc

@@ -0,0 +1,28 @@
+#
+# relax ng schema in compact syntax; this cannot be used within libxml but
+# was used to write the schema as compact syntax makes it easier to handle.
+# relax ng schema in xml syntax was created using trang.
+#
+namespace xsi = "http://www.w3.org/2001/XMLSchema-instance"
+
+start = shiporder
+
+shiporder  = element shiporder { attribute orderid { text }, 
+                                 attribute xsi:noNamespaceSchemaLocation { text }, 
+                               orderperson, shipto, item* }
+
+orderperson = element orderperson { text }
+
+shipto = element shipto { name, address, city, country }
+
+name = element name { text }
+address = element address { text }
+city = element city { text }
+country = element country { text }
+
+item = element item { title, note?, quantity, price }
+
+title = element title { text }
+note = element note { text }
+quantity = element quantity { text }
+price = element price { text }

data/test/model/shiporder.rng

@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  
+  relax ng schema in compact syntax; this cannot be used within libxml but
+  was used to write the schema as it's easier to understand
+  
+-->
+<grammar xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://relaxng.org/ns/structure/1.0">
+  <start>
+    <ref name="shiporder"/>
+  </start>
+  <define name="shiporder">
+    <element name="shiporder">
+      <attribute name="orderid"/>
+      <attribute name="xsi:noNamespaceSchemaLocation"/>
+      <ref name="orderperson"/>
+      <ref name="shipto"/>
+      <zeroOrMore>
+        <ref name="item"/>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="orderperson">
+    <element name="orderperson">
+      <text/>
+    </element>
+  </define>
+  <define name="shipto">
+    <element name="shipto">
+      <ref name="name"/>
+      <ref name="address"/>
+      <ref name="city"/>
+      <ref name="country"/>
+    </element>
+  </define>
+  <define name="name">
+    <element name="name">
+      <text/>
+    </element>
+  </define>
+  <define name="address">
+    <element name="address">
+      <text/>
+    </element>
+  </define>
+  <define name="city">
+    <element name="city">
+      <text/>
+    </element>
+  </define>
+  <define name="country">
+    <element name="country">
+      <text/>
+    </element>
+  </define>
+  <define name="item">
+    <element name="item">
+      <ref name="title"/>
+      <optional>
+        <ref name="note"/>
+      </optional>
+      <ref name="quantity"/>
+      <ref name="price"/>
+    </element>
+  </define>
+  <define name="title">
+    <element name="title">
+      <text/>
+    </element>
+  </define>
+  <define name="note">
+    <element name="note">
+      <text/>
+    </element>
+  </define>
+  <define name="quantity">
+    <element name="quantity">
+      <text/>
+    </element>
+  </define>
+  <define name="price">
+    <element name="price">
+      <text/>
+    </element>
+  </define>
+</grammar>

data/test/{tc_xml_attributes.rb → tc_attributes.rb}

@@ -1,4 +1,4 @@
-require "libxml"
+require 'xml'
 require 'test/unit'
 
 class AttributesTest < Test::Unit::TestCase
@@ -45,15 +45,6 @@ class AttributesTest < Test::Unit::TestCase
     assert_equal(5, length)
   end
 
-  def test_each_attr
-    result = 0
-    city_member.each_attr do |attr|
-      assert_instance_of(XML::Attr, attr)
-      result += 1
-    end
-    assert_equal(5, result)
-  end
-  
   def test_get_attribute
     attributes = city_member.attributes
     

data/test/{tc_xml_document.rb → tc_document.rb}

@@ -1,4 +1,4 @@
-require "libxml"
+require "xml"
 require 'test/unit'
 
 

data/test/{tc_xml_document_write.rb → tc_document_write.rb}

@@ -1,4 +1,4 @@
-require "libxml"
+require "xml"
 require 'test/unit'
 
 class TC_XML_Document_Write < Test::Unit::TestCase

data/test/{tc_xml_dtd.rb → tc_dtd.rb}

@@ -1,4 +1,4 @@
-require "libxml"
+require "xml"
 require 'test/unit'
 
 class TestDtd < Test::Unit::TestCase

data/test/{tc_xml_html_parser.rb → tc_html_parser.rb}

@@ -1,4 +1,4 @@
-require "libxml"
+require "xml"
 require 'test/unit'
 
 class TC_XML_HTMLParser < Test::Unit::TestCase

data/test/{tc_xml_node.rb → tc_node.rb}

@@ -1,4 +1,4 @@
-require "libxml"
+require "xml"
 require 'test/unit'
 
 class TestNode < Test::Unit::TestCase

data/test/{tc_xml_node_attr.rb → tc_node_attr.rb}

@@ -1,4 +1,4 @@
-require "libxml"
+require "xml"
 require 'test/unit'
 
 class AttrNodeTest < Test::Unit::TestCase

data/test/{tc_xml_node_cdata.rb → tc_node_cdata.rb}

@@ -1,8 +1,8 @@
-require "libxml"
+require 'xml'
 require 'test/unit'
 
 class CDataCommentTest < Test::Unit::TestCase
-  def setup()
+  def setup
     xp = XML::Parser.new()
     str = '<root></root>'
     assert_equal(str, xp.string = str)
@@ -11,22 +11,41 @@ class CDataCommentTest < Test::Unit::TestCase
     @root = @doc.root
   end
 
-  def test_libxml_node_add_cdata_01
+  def test_node_type
+    cnode = XML::Node.new_cdata('test cdata')
+    assert_equal(XML::Node::CDATA_SECTION_NODE, cnode.node_type)
+  end
+
+  def test_add_cdata
     @root << XML::Node.new_cdata('mycdata')
     assert_equal '<root><![CDATA[mycdata]]></root>',
       @root.to_s.gsub(/\n\s*/,'')
   end
 
-  def test_libxml_node_add_cdata_02
+  def test_add_cdata_2
     @root << XML::Node.new_cdata('mycdata')
     assert_equal 'cdata',
     @root.child.node_type_name
   end
 
-  def test_libxml_node_add_cdata_03
+  def test_add_cdata_3
     @root << el = XML::Node.new_cdata('mycdata')
     el << "_this_is_added"
     assert_equal '<root><![CDATA[mycdata_this_is_added]]></root>',
       @root.to_s.gsub(/\n\s*/,'')
   end
+  
+  def test_attributes
+    cnode = XML::Node.new_cdata('test cdata')
+    assert_equal(0, cnode.attributes.length)
+  end
+  
+  def test_set_cdata_attribute
+    cnode = XML::Node.new_cdata('test cdata')
+    
+    # Can't create attributes on non-element nodes
+    assert_raise(ArgumentError) do
+      cnode['attr'] = '123'
+    end
+  end
 end

data/test/{tc_xml_node_comment.rb → tc_node_comment.rb}

@@ -1,4 +1,4 @@
-require "libxml"
+require "xml"
 require 'test/unit'
 
 class NodeCommentTest < Test::Unit::TestCase

data/test/{tc_xml_node_copy.rb → tc_node_copy.rb}

@@ -1,4 +1,4 @@
-require "libxml"
+require "xml"
 require 'test/unit'
 
 # see mailing list archive

data/test/{tc_xml_node_edit.rb → tc_node_edit.rb}

@@ -1,4 +1,4 @@
-require "libxml"
+require "xml"
 require 'test/unit'
 
 class TestNodeEdit < Test::Unit::TestCase

data/test/{tc_xml_node_set.rb → tc_node_set.rb}

@@ -1,4 +1,4 @@
-require "libxml"
+require "xml"
 require 'test/unit'
 
 class TC_XML_Node_Set < Test::Unit::TestCase

data/test/{tc_xml_node_set2.rb → tc_node_set2.rb}

@@ -1,4 +1,4 @@
-require "libxml"
+require "xml"
 require 'test/unit'
 
 class TC_XML_Node_Set2 < Test::Unit::TestCase

data/test/{tc_xml_node_text.rb → tc_node_text.rb}

@@ -1,4 +1,4 @@
-require 'libxml'
+require 'xml'
 require 'test/unit'
 
 class TC_XML_Node_text < Test::Unit::TestCase

data/test/{tc_xml_node_xlink.rb → tc_node_xlink.rb}

@@ -1,5 +1,5 @@
-# $Id: tc_xml_node_xlink.rb 453 2008-07-15 19:36:12Z cfis $
-require "libxml"
+# $Id: tc_node_xlink.rb 481 2008-07-19 08:59:39Z cfis $
+require "xml"
 require 'test/unit'
 
 class TC_XML_Node_XLink < Test::Unit::TestCase

data/test/{tc_xml_parser.rb → tc_parser.rb}

@@ -1,4 +1,4 @@
-require "libxml"
+require "xml"
 require 'test/unit'
 
 class TestParser < Test::Unit::TestCase

data/test/{tc_xml_parser_context.rb → tc_parser_context.rb}

@@ -1,4 +1,4 @@
-require "libxml"
+require "xml"
 require 'test/unit'
 
 class TestParserContext < Test::Unit::TestCase

data/test/{tc_xml_properties.rb → tc_properties.rb}

@@ -1,4 +1,4 @@
-require "libxml"
+require "xml"
 require 'test/unit'
 
 # Properties is deprecated - use attributes instead.
@@ -28,12 +28,6 @@ class TestProperties < Test::Unit::TestCase
     assert_equal('bar', attribute.value)
   end
   
-  def test_each_attr
-    @doc.root.properties.each_attr do |attribute|
-      assert_instance_of(XML::Attr, attribute)
-    end
-  end
-  
   def test_no_properties
     properties = @doc.root.child.properties
     assert_instance_of(XML::Attributes, properties)

data/test/{tc_xml_reader.rb → tc_reader.rb}

@@ -1,4 +1,4 @@
-require 'libxml'
+require 'xml'
 require 'test/unit'
 
 class TC_XML_Reader < Test::Unit::TestCase

data/test/tc_relaxng.rb

@@ -0,0 +1,39 @@
+require "xml"
+require 'test/unit'
+
+class TestRelaxNG < Test::Unit::TestCase
+  def setup
+    xp = XML::Parser.new
+    @doc = XML::Document.file(File.join(File.dirname(__FILE__), 'model/shiporder.xml'))
+  end
+  
+  def teardown
+    @doc = nil
+  end
+  
+  def relaxng
+    document = XML::Document.file(File.join(File.dirname(__FILE__), 'model/shiporder.rng'))
+    relaxng = XML::RelaxNG.document(document)
+  end
+
+  def test_from_doc
+    assert_instance_of(XML::RelaxNG, relaxng)
+  end
+  
+  def test_valid
+    assert(@doc.validate_relaxng(relaxng))
+  end
+  
+  def test_invalid
+    new_node = XML::Node.new('invalid', 'this will mess up validation')
+    @doc.root.child_add(new_node)
+    
+    messages = Hash.new
+    assert(!@doc.validate_relaxng(relaxng) do |message, error|
+      messages[message] = error
+    end)
+
+    expected = {"Did not expect element invalid there\n" => true}
+    assert_equal(expected, messages)
+  end
+end

data/test/{tc_xml_sax_parser.rb → tc_sax_parser.rb}

@@ -1,4 +1,4 @@
-require 'libxml'
+require 'xml'
 require 'test/unit'
 
 # TODO this is woefully inadequate

data/test/{tc_xml_schema.rb → tc_schema.rb}

@@ -1,4 +1,4 @@
-require "libxml"
+require "xml"
 require 'test/unit'
 
 class TestSchema < Test::Unit::TestCase

data/test/{tc_xml_traversal.rb → tc_traversal.rb}

@@ -1,4 +1,4 @@
-require "libxml"
+require 'xml'
 require 'test/unit'
 
 class TestTranversal < Test::Unit::TestCase

data/test/{tc_xml_xinclude.rb → tc_xinclude.rb}

@@ -1,4 +1,4 @@
-require "libxml"
+require 'xml'
 require 'test/unit'
 
 class TestXInclude < Test::Unit::TestCase

data/test/{tc_xml_xpath.rb → tc_xpath.rb}

@@ -1,4 +1,4 @@
-require "libxml"
+require 'xml'
 require "tempfile"
 require "test/unit"
 

data/test/{tc_xml_xpath_context.rb → tc_xpath_context.rb}

@@ -1,4 +1,4 @@
-require "libxml"
+require 'xml'
 require "tempfile"
 require "test/unit"
 

data/test/{tc_xml_xpointer.rb → tc_xpointer.rb}

@@ -1,4 +1,4 @@
-require "libxml"
+require 'xml'
 require "test/unit"
 
 class TC_XML_XPointer < Test::Unit::TestCase

data/test/test_suite.rb

@@ -1,29 +1,30 @@
 require 'tc_well_formed'
-require 'tc_xml_attributes'
-require 'tc_xml_document'
-require 'tc_xml_document_write'
-require 'tc_xml_dtd'
-require 'tc_xml_html_parser'
-require 'tc_xml_node'
-require 'tc_xml_node_attr'
-require 'tc_xml_node_cdata'
-require 'tc_xml_node_comment'
-require 'tc_xml_node_copy'
-require 'tc_xml_node_edit'
-require 'tc_xml_node_set'
-require 'tc_xml_node_set2'
-require 'tc_xml_node_text'
-require 'tc_xml_node_xlink'
-require 'tc_xml_parser'
-require 'tc_xml_parser_context'
-require 'tc_xml_reader'
-require 'tc_xml_sax_parser'
-require 'tc_xml_schema'
-require 'tc_xml_traversal'
-require 'tc_xml_xinclude'
-require 'tc_xml_xpath'
-require 'tc_xml_xpointer'
+require 'tc_attributes'
+require 'tc_document'
+require 'tc_document_write'
+require 'tc_dtd'
+require 'tc_html_parser'
+require 'tc_node'
+require 'tc_node_attr'
+require 'tc_node_cdata'
+require 'tc_node_comment'
+require 'tc_node_copy'
+require 'tc_node_edit'
+require 'tc_node_set'
+require 'tc_node_set2'
+require 'tc_node_text'
+require 'tc_node_xlink'
+require 'tc_parser'
+require 'tc_parser_context'
+require 'tc_reader'
+require 'tc_relaxng'
+require 'tc_sax_parser'
+require 'tc_schema'
+require 'tc_traversal'
+require 'tc_xinclude'
+require 'tc_xpath'
+require 'tc_xpointer'
 
 # Compatibility
-require 'tc_xml_properties'
+require 'tc_properties'
 require 'tc_deprecated_require'