diff options
author | nahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-11-25 07:31:33 +0000 |
---|---|---|
committer | nahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-11-25 07:31:33 +0000 |
commit | 6a09e1d9664f86b7deb576fb0dfe57e10503bb85 (patch) | |
tree | 49dc2abcb7640c805848e543d4e5d110cbde5ad6 /test/xsd | |
parent | ec373c3e1c332f814225c3d49ded8217545470e2 (diff) |
* lib/soap/**/*.rb, lib/wsdl/**/*.rb, lib/xsd/**/*.rb: changed license; GPL2 -> Ruby's.
* lib/soap/rpc/driver.rb, lib/soap/wsdlDriver.rb, lib/soap/streamHandler.rb: add interface to streamhandler.
* lib/soap/marshal.rb: raise error if parse fails.
* lib/soap/netHttpClient.rb: add https support. Patched by Oliver M. Bolzer.
* lib/soap/netHttpClient.rb: dump HTTP response message body by itself.
* lib/soap/rpc/driver.rb, lib/soap/rpc/proxy.rb, lib/soap/wsdlDriver.rb: add driver#mandatorycharset interface to foce using charset for parsing response from buggy server.
* lib/soap/encodingstyle/soapHandler.rb: support Apache Axis's half typed multi-ref array.
* lib/soap/mapping/factory.rb, lib/soap/mapping/registry.rb: map SOAPStruct which has multi-accessors which name are the same, to an array.
* lib/soap/rpc/element.rb: fixed illegal parameter order.
* lib/soap/rpc/element.rb: element name of response message could have the name other than 'return'.
* lib/wsdl/operation.rb, lib/wsdl/operationBinding.rb, lib/wsdl/soap/classDefCreator.rb, lib/wsdl/soap/methodDefCreator.rb, lib/wsdl/soap/methodDefCreatorSupport.rb: WSDL/1.1 allows plural fault definition in a operation. [ruby-talk:84948]
* test/wsdl/multiplefault.wsdl, test/wsdl/test_multiplefault.rb: add test for above fix.
* lib/wsdl/soap/complexType.rb: support WSDL array definition with maxOccures="unbound".
* lib/xsd/charset.rb: use cp932 under emx. Patched by Siena. / SHINAGAWA, Norihide in [ruby-dev:21972]
* lib/xsd/xmlparser/parser.rb: set @charset nil by default. Nil means 'follow encoding declaration in XML'.
* sample/soap/digraph.rb, sample/wsdl/amazon/wsdlDriver.rb, sample/wsdl/googleSearch/sampleClient.rb, sample/wsdl/googleSearch/wsdlDriver.rb, test/wsdl/test_emptycomplextype.rb, test/wsdl/marshal/test_wsdlmarshal.rb, test/xsd/test_xmlschemaparser.rb: use File.open(...) { |f| f.read } instead of File.open(...).read. [ruby-dev:21964]
* test/wsdl/emptycomplextype.wsdl, test/wsdl/test_emptycomplextype.rb: simplify the test case.
* test/wsdl/axisArray/*: add tests for axis's array encoding.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5022 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/xsd')
-rw-r--r-- | test/xsd/test_xmlschemaparser.rb | 9 | ||||
-rw-r--r-- | test/xsd/xmlschema.xml | 5 |
2 files changed, 6 insertions, 8 deletions
diff --git a/test/xsd/test_xmlschemaparser.rb b/test/xsd/test_xmlschemaparser.rb index b362120540..ab9421c954 100644 --- a/test/xsd/test_xmlschemaparser.rb +++ b/test/xsd/test_xmlschemaparser.rb @@ -6,16 +6,17 @@ module XSD class TestXMLSchemaParser < Test::Unit::TestCase - def self.setup(filename) - @@filename = filename + def setup + @file = File.join(File.dirname(__FILE__), 'xmlschema.xml') end def test_wsdl - @wsdl = WSDL::XMLSchema::Parser.new.parse(File.open(@@filename).read) + @wsdl = WSDL::XMLSchema::Parser.new.parse(File.open(@file) { |f| f.read }) + assert_equal(WSDL::XMLSchema::Schema, @wsdl.class) + assert_equal(1, @wsdl.collect_elements.size) end end -TestXMLSchemaParser.setup(File.join(File.dirname(__FILE__), 'xmlschema.xml')) end diff --git a/test/xsd/xmlschema.xml b/test/xsd/xmlschema.xml index 0e9914e64b..018bd0cc67 100644 --- a/test/xsd/xmlschema.xml +++ b/test/xsd/xmlschema.xml @@ -1,11 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <xs:schema - xmlns:mstns="http://www.winfessor.com/SoapBoxWebService/MessageDataSet.xsd" - xmlns="http://www.winfessor.com/SoapBoxWebService/MessageDataSet.xsd" attributeFormDefault="qualified" elementFormDefault="qualified" - targetNamespace="http://www.winfessor.com/SoapBoxWebService/MessageDataSet.xsd" - id="MessageDataSet" + targetNamespace="urn:jp.gr.jin.rrr.example.fakeschema" xmlns:xs="http://www.w3.org/2001/XMLSchema"> <xs:element name="MessageDataSet"> <xs:complexType> |