soap4r 1.5.5.20061022 → 1.5.6
Sign up to get free protection for your applications and to get access to all the features.
- data/bin/wsdl2ruby.rb +8 -8
- data/lib/soap/XMLSchemaDatatypes.rb +1 -1
- data/lib/soap/XMLSchemaDatatypes1999.rb +1 -1
- data/lib/soap/attachment.rb +1 -1
- data/lib/soap/baseData.rb +102 -54
- data/lib/soap/cgistub.rb +1 -1
- data/lib/soap/charset.rb +1 -1
- data/lib/soap/driver.rb +1 -1
- data/lib/soap/element.rb +20 -12
- data/lib/soap/encodingstyle/aspDotNetHandler.rb +2 -2
- data/lib/soap/encodingstyle/handler.rb +1 -1
- data/lib/soap/encodingstyle/literalHandler.rb +29 -73
- data/lib/soap/encodingstyle/soapHandler.rb +8 -7
- data/lib/soap/filter.rb +10 -0
- data/lib/soap/filter/filterchain.rb +51 -0
- data/lib/soap/filter/handler.rb +31 -0
- data/lib/soap/generator.rb +11 -3
- data/lib/soap/header/handler.rb +6 -5
- data/lib/soap/header/handlerset.rb +7 -7
- data/lib/soap/header/simplehandler.rb +1 -1
- data/lib/soap/httpconfigloader.rb +7 -2
- data/lib/soap/mapping.rb +1 -1
- data/lib/soap/mapping/encodedregistry.rb +36 -26
- data/lib/soap/mapping/encodedregistry.rb~ +531 -0
- data/lib/soap/mapping/factory.rb +2 -2
- data/lib/soap/mapping/literalregistry.rb +107 -67
- data/lib/soap/mapping/mapping.rb +92 -112
- data/lib/soap/mapping/registry.rb +25 -8
- data/lib/soap/mapping/rubytypeFactory.rb +1 -1
- data/lib/soap/mapping/schemadefinition.rb +163 -0
- data/lib/soap/mapping/typeMap.rb +7 -1
- data/lib/soap/mapping/wsdlencodedregistry.rb +2 -2
- data/lib/soap/mapping/wsdlliteralregistry.rb +14 -23
- data/lib/soap/mappingRegistry.rb +1 -1
- data/lib/soap/marshal.rb +1 -1
- data/lib/soap/namespace.rb +1 -1
- data/lib/soap/netHttpClient.rb +43 -13
- data/lib/soap/parser.rb +40 -42
- data/lib/soap/processor.rb +1 -1
- data/lib/soap/property.rb +7 -7
- data/lib/soap/proxy.rb +1 -1
- data/lib/soap/qname.rb +1 -1
- data/lib/soap/rpc/cgistub.rb +34 -1
- data/lib/soap/rpc/driver.rb +2 -1
- data/lib/soap/rpc/element.rb +42 -15
- data/lib/soap/rpc/httpserver.rb +13 -1
- data/lib/soap/rpc/proxy.rb +51 -41
- data/lib/soap/rpc/router.rb +88 -33
- data/lib/soap/rpc/rpc.rb +1 -1
- data/lib/soap/rpc/soaplet.rb +51 -3
- data/lib/soap/rpc/standaloneServer.rb +1 -1
- data/lib/soap/rpcRouter.rb +1 -1
- data/lib/soap/rpcUtils.rb +1 -1
- data/lib/soap/server.rb +1 -1
- data/lib/soap/soap.rb +2 -2
- data/lib/soap/standaloneServer.rb +1 -1
- data/lib/soap/streamHandler.rb +13 -4
- data/lib/soap/wsdlDriver.rb +11 -15
- data/lib/tags +5144 -0
- data/lib/wsdl/binding.rb +1 -1
- data/lib/wsdl/data.rb +1 -1
- data/lib/wsdl/definitions.rb +1 -1
- data/lib/wsdl/documentation.rb +1 -1
- data/lib/wsdl/import.rb +1 -1
- data/lib/wsdl/importer.rb +1 -1
- data/lib/wsdl/info.rb +1 -1
- data/lib/wsdl/message.rb +1 -1
- data/lib/wsdl/operation.rb +10 -7
- data/lib/wsdl/operationBinding.rb +19 -5
- data/lib/wsdl/param.rb +11 -3
- data/lib/wsdl/parser.rb +4 -3
- data/lib/wsdl/part.rb +1 -1
- data/lib/wsdl/port.rb +1 -1
- data/lib/wsdl/portType.rb +1 -1
- data/lib/wsdl/service.rb +1 -1
- data/lib/wsdl/soap/address.rb +1 -1
- data/lib/wsdl/soap/binding.rb +1 -1
- data/lib/wsdl/soap/body.rb +3 -1
- data/lib/wsdl/soap/cgiStubCreator.rb +1 -1
- data/lib/wsdl/soap/classDefCreator.rb +78 -14
- data/lib/wsdl/soap/classDefCreatorSupport.rb +28 -11
- data/lib/wsdl/soap/clientSkeltonCreator.rb +3 -2
- data/lib/wsdl/soap/complexType.rb +8 -11
- data/lib/wsdl/soap/data.rb +1 -1
- data/lib/wsdl/soap/definitions.rb +49 -4
- data/lib/wsdl/soap/driverCreator.rb +1 -1
- data/lib/wsdl/soap/element.rb +3 -2
- data/lib/wsdl/soap/encodedMappingRegistryCreator.rb +1 -1
- data/lib/wsdl/soap/fault.rb +1 -1
- data/lib/wsdl/soap/header.rb +1 -1
- data/lib/wsdl/soap/headerfault.rb +1 -1
- data/lib/wsdl/soap/literalMappingRegistryCreator.rb +41 -21
- data/lib/wsdl/soap/mappingRegistryCreator.rb +2 -1
- data/lib/wsdl/soap/mappingRegistryCreatorSupport.rb +45 -19
- data/lib/wsdl/soap/methodDefCreator.rb +28 -17
- data/lib/wsdl/soap/operation.rb +11 -11
- data/lib/wsdl/soap/servantSkeltonCreator.rb +3 -2
- data/lib/wsdl/soap/standaloneServerStubCreator.rb +1 -1
- data/lib/wsdl/soap/wsdl2ruby.rb +8 -2
- data/lib/wsdl/types.rb +1 -1
- data/lib/wsdl/wsdl.rb +1 -1
- data/lib/wsdl/xmlSchema/all.rb +1 -1
- data/lib/wsdl/xmlSchema/annotation.rb +1 -1
- data/lib/wsdl/xmlSchema/any.rb +10 -5
- data/lib/wsdl/xmlSchema/attribute.rb +1 -1
- data/lib/wsdl/xmlSchema/choice.rb +1 -1
- data/lib/wsdl/xmlSchema/complexContent.rb +11 -2
- data/lib/wsdl/xmlSchema/complexExtension.rb +8 -1
- data/lib/wsdl/xmlSchema/complexRestriction.rb +6 -2
- data/lib/wsdl/xmlSchema/complexType.rb +9 -1
- data/lib/wsdl/xmlSchema/content.rb +26 -5
- data/lib/wsdl/xmlSchema/data.rb +4 -1
- data/lib/wsdl/xmlSchema/element.rb +12 -9
- data/lib/wsdl/xmlSchema/enumeration.rb +1 -1
- data/lib/wsdl/xmlSchema/import.rb +1 -1
- data/lib/wsdl/xmlSchema/importer.rb +9 -6
- data/lib/wsdl/xmlSchema/include.rb +1 -1
- data/lib/wsdl/xmlSchema/length.rb +1 -1
- data/lib/wsdl/xmlSchema/list.rb +1 -1
- data/lib/wsdl/xmlSchema/maxlength.rb +1 -1
- data/lib/wsdl/xmlSchema/minlength.rb +1 -1
- data/lib/wsdl/xmlSchema/parser.rb +4 -3
- data/lib/wsdl/xmlSchema/pattern.rb +1 -1
- data/lib/wsdl/xmlSchema/schema.rb +1 -1
- data/lib/wsdl/xmlSchema/sequence.rb +1 -1
- data/lib/wsdl/xmlSchema/simpleContent.rb +1 -1
- data/lib/wsdl/xmlSchema/simpleExtension.rb +1 -1
- data/lib/wsdl/xmlSchema/simpleRestriction.rb +1 -1
- data/lib/wsdl/xmlSchema/simpleType.rb +8 -1
- data/lib/wsdl/xmlSchema/union.rb +35 -0
- data/lib/wsdl/xmlSchema/unique.rb +1 -1
- data/lib/wsdl/xmlSchema/xsd2ruby.rb +6 -1
- data/lib/xsd/charset.rb +1 -1
- data/lib/xsd/classloader.rb +26 -0
- data/lib/xsd/codegen.rb +1 -1
- data/lib/xsd/codegen/classdef.rb +1 -1
- data/lib/xsd/codegen/commentdef.rb +1 -1
- data/lib/xsd/codegen/gensupport.rb +119 -14
- data/lib/xsd/codegen/methoddef.rb +1 -1
- data/lib/xsd/codegen/moduledef.rb +1 -1
- data/lib/xsd/datatypes.rb +52 -13
- data/lib/xsd/datatypes1999.rb +1 -1
- data/lib/xsd/iconvcharset.rb +1 -1
- data/lib/xsd/mapping.rb +1 -1
- data/lib/xsd/namedelements.rb +1 -1
- data/lib/xsd/ns.rb +2 -2
- data/lib/xsd/qname.rb +1 -1
- data/lib/xsd/xmlparser.rb +16 -3
- data/lib/xsd/xmlparser/parser.rb +6 -2
- data/lib/xsd/xmlparser/rexmlparser.rb +5 -1
- data/lib/xsd/xmlparser/xmlparser.rb +1 -1
- data/lib/xsd/xmlparser/xmlscanner.rb +4 -2
- data/test/interopR2/InteropTest.rb +83 -0
- data/test/interopR2/InteropTest.wsdl +315 -0
- data/test/interopR2/InteropTestC.wsdl +208 -0
- data/test/interopR2/InteropTestDriver.rb +328 -0
- data/test/interopR2/SOAP4R_SOAPBuildersInteropTest_R2.wsdl +461 -0
- data/test/interopR2/SOAP4R_SOAPBuildersInteropTest_R2GroupB.wsdl +20 -0
- data/test/interopR2/SOAP4R_SOAPBuildersInteropTest_R2GroupCClient.rb +178 -0
- data/test/interopR2/SOAPBuildersInterop_R2GrC.wsdl +17 -0
- data/test/interopR2/clientBase.rb +0 -3
- data/test/interopR2/groupc.wsdl +17 -0
- data/test/interopR2/result_client.NetRemoting.txt +0 -4593
- data/test/interopR2/test.sh +9 -9
- data/test/runner.rb +1 -3
- data/test/soap/asp.net/test_aspdotnet.rb +20 -9
- data/test/soap/case/test_mapping.rb +57 -0
- data/test/soap/filter/test_filter.rb +146 -0
- data/test/soap/literalArrayMapping/test_definedarray.rb +7 -9
- data/test/soap/marshal/marshaltestlib.rb +1 -1
- data/test/soap/ssl/test_ssl.rb +0 -10
- data/test/soap/struct/test_struct.rb +2 -9
- data/test/soap/test_basetype.rb +114 -0
- data/test/soap/test_empty.rb +26 -2
- data/test/soap/test_envelopenamespace.rb +2 -9
- data/test/soap/test_extraattr.rb +55 -0
- data/test/soap/test_httpconfigloader.rb +17 -0
- data/test/soap/test_property.rb +4 -1
- data/test/soap/test_response_as_xml.rb +31 -9
- data/test/soap/test_soapelement.rb +21 -3
- data/test/soap/test_streamhandler.rb +3 -10
- data/test/soap/test_styleuse.rb +2 -9
- data/test/soap/wsdlDriver/test_calc.rb +3 -20
- data/test/soap/wsdlDriver/test_document.rb +2 -9
- data/test/soap/wsdlDriver/test_simpletype.rb +2 -9
- data/test/testutil.rb +54 -0
- data/test/wsdl/abstract/abstract.wsdl +82 -3
- data/test/wsdl/abstract/test_abstract.rb +48 -19
- data/test/wsdl/any/any.wsdl +63 -0
- data/test/wsdl/any/expectedDriver.rb +22 -1
- data/test/wsdl/any/expectedEcho.rb +19 -0
- data/test/wsdl/any/expectedService.rb +29 -4
- data/test/wsdl/any/test_any.rb +36 -31
- data/test/wsdl/choice/choice.wsdl +37 -0
- data/test/wsdl/choice/test_choice.rb +66 -17
- data/test/wsdl/complexcontent/test_echo.rb +7 -18
- data/test/wsdl/document/array/test_array.rb +8 -18
- data/test/wsdl/document/ping_nosoapaction.wsdl +1 -1
- data/test/wsdl/document/test_nosoapaction.rb +2 -9
- data/test/wsdl/document/test_number.rb +3 -10
- data/test/wsdl/document/test_rpc.rb +96 -21
- data/test/wsdl/fault/fault.wsdl +79 -0
- data/test/wsdl/fault/multifault.wsdl +96 -0
- data/test/wsdl/fault/test_fault.rb +119 -0
- data/test/wsdl/fault/test_multifault.rb +134 -0
- data/test/wsdl/list/test_list.rb +6 -16
- data/test/wsdl/marshal/test_wsdlmarshal.rb +10 -13
- data/test/wsdl/oneway/oneway.wsdl +36 -0
- data/test/wsdl/oneway/test_oneway.rb +108 -0
- data/test/wsdl/overload/test_overload.rb +3 -10
- data/test/wsdl/qualified/test_qualified.rb +9 -17
- data/test/wsdl/qualified/test_unqualified.rb +14 -21
- data/test/wsdl/ref/expectedDriver.rb +51 -0
- data/test/wsdl/ref/expectedProduct.rb +71 -71
- data/test/wsdl/ref/test_ref.rb +13 -35
- data/test/wsdl/rpc/rpc.wsdl +27 -1
- data/test/wsdl/rpc/test-rpc-lit-qualified.wsdl +74 -0
- data/test/wsdl/rpc/test-rpc-lit.wsdl +11 -4
- data/test/wsdl/rpc/test-rpc-lit12.wsdl +455 -0
- data/test/wsdl/rpc/test_rpc.rb +20 -19
- data/test/wsdl/rpc/test_rpc_lit.rb +82 -29
- data/test/wsdl/simplecontent/simplecontent.wsdl +1 -0
- data/test/wsdl/simplecontent/test_simplecontent.rb +5 -19
- data/test/wsdl/simpletype/rpc/expectedDriver.rb +6 -4
- data/test/wsdl/simpletype/rpc/expectedEchoVersion.rb +15 -0
- data/test/wsdl/simpletype/rpc/expectedMappingRegistry.rb +64 -0
- data/test/wsdl/simpletype/rpc/expectedService.rb +6 -4
- data/test/wsdl/simpletype/rpc/rpc.wsdl +18 -0
- data/test/wsdl/simpletype/rpc/test_rpc.rb +6 -16
- data/test/wsdl/simpletype/simpletype.wsdl +19 -0
- data/test/wsdl/simpletype/test_simpletype.rb +2 -9
- data/test/wsdl/soap/wsdl2ruby/expectedDriver.rb +6 -4
- data/test/wsdl/soap/wsdl2ruby/expectedMappingRegistry.rb +40 -0
- data/test/wsdl/soap/wsdl2ruby/expectedService.cgi +6 -4
- data/test/wsdl/soap/wsdl2ruby/expectedService.rb +6 -4
- data/test/wsdl/soap/wsdl2ruby/section/test_section.rb +5 -6
- data/test/wsdl/soap/wsdl2ruby/soapenc/test_soapenc.rb +3 -16
- data/test/wsdl/soap/wsdl2ruby/test_wsdl2ruby.rb +9 -17
- data/test/wsdl/soaptype/test_soaptype.rb +29 -11
- data/test/xsd/test_xsd.rb +115 -1
- metadata +421 -454
- data/test/interopR2/client.NetRemoting.rb.result +0 -3410
- data/test/interopR2/client.NetRemoting_Base.log +0 -6279
- data/test/interopR2/client.NetRemoting_GroupB.log +0 -1188
- data/test/interopR2/client4S4C2_Base.log +0 -4955
- data/test/interopR2/client4S4C2_GroupB.log +0 -1000
- data/test/interopR2/client4S4C_Base.log +0 -4635
- data/test/interopR2/client4S4C_GroupB.log +0 -900
- data/test/interopR2/clientASP.NET_Base.log +0 -5468
- data/test/interopR2/clientASP.NET_GroupB.log +0 -977
- data/test/interopR2/clientApacheAxis_Base.log +0 -3171
- data/test/interopR2/clientApacheAxis_GroupB.log +0 -498
- data/test/interopR2/clientApacheSOAP_Base.log +0 -3171
- data/test/interopR2/clientBEAWebLogic_Base.log +0 -3171
- data/test/interopR2/clientBEAWebLogic_GroupB.log +0 -498
- data/test/interopR2/clientCapeConnect_Base.log +0 -2126
- data/test/interopR2/clientDelphi_Base.log +0 -0
- data/test/interopR2/clientEasySoap_Base.log +0 -6187
- data/test/interopR2/clientEasySoap_GroupB.log +0 -1076
- data/test/interopR2/clientFrontier_Base.log +0 -5188
- data/test/interopR2/clientHP_Base.log +0 -3171
- data/test/interopR2/clientHP_GroupB.log +0 -498
- data/test/interopR2/clientJSOAP_Base.log +0 -4465
- data/test/interopR2/clientJSOAP_GroupB.log +0 -824
- data/test/interopR2/clientKafkaXSLT_Base.log +0 -10299
- data/test/interopR2/clientKafkaXSLT_GroupB.log +0 -1739
- data/test/interopR2/clientMSSOAPToolkit2.0_Base.log +0 -4805
- data/test/interopR2/clientMSSOAPToolkit2.0_GroupB.log +0 -871
- data/test/interopR2/clientMSSOAPToolkit3.0_Base.log +0 -5076
- data/test/interopR2/clientMSSOAPToolkit3.0_GroupB.log +0 -908
- data/test/interopR2/clientNuSOAP_Base.log +0 -5076
- data/test/interopR2/clientNuSOAP_GroupB.log +0 -958
- data/test/interopR2/clientNuWave_Base.log +0 -2019
- data/test/interopR2/clientOpenLink_Base.log +0 -6171
- data/test/interopR2/clientOpenLink_GroupB.log +0 -1094
- data/test/interopR2/clientOracle_Base.log +0 -5594
- data/test/interopR2/clientPEAR_Base.log +0 -6261
- data/test/interopR2/clientPEAR_GroupB.log +0 -1106
- data/test/interopR2/clientPhalanx_Base.log +0 -41036
- data/test/interopR2/clientPhalanx_GroupB.log +0 -6519
- data/test/interopR2/clientSIMACE_Base.log +0 -6171
- data/test/interopR2/clientSIMACE_GroupB.log +0 -1093
- data/test/interopR2/clientSOAP4R.rb.result +0 -3409
- data/test/interopR2/clientSOAP4R_Base.log +0 -6366
- data/test/interopR2/clientSOAP4R_GroupB.log +0 -1112
- data/test/interopR2/clientSQLData_Base.log +0 -4857
- data/test/interopR2/clientSQLData_GroupB.log +0 -770
- data/test/interopR2/clientSilverStream_Base.log +0 -3171
- data/test/interopR2/clientSpray2001_Base.log +0 -8187
- data/test/interopR2/clientSpray2001_GroupB.log +0 -1408
- data/test/interopR2/clientSun_Base.log +0 -4641
- data/test/interopR2/clientSun_GroupB.log +0 -856
- data/test/interopR2/clientVWOpentalkSoap_Base.log +0 -5402
- data/test/interopR2/clientVWOpentalkSoap_GroupB.log +0 -972
- data/test/interopR2/clientWASPC_Base.log +0 -4187
- data/test/interopR2/clientWASPC_GroupB.log +0 -763
- data/test/interopR2/clientWASP_Base.log +0 -5414
- data/test/interopR2/clientWASP_GroupB.log +0 -970
- data/test/interopR2/clientWebMethods_Base.log +0 -3075
- data/test/interopR2/clientWebMethods_GroupB.log +0 -483
- data/test/interopR2/clientWhiteMesa_Base.log +0 -4359
- data/test/interopR2/clientWhiteMesa_GroupB.log +0 -808
- data/test/interopR2/clientWingfoot_Base.log +0 -4445
- data/test/interopR2/clientWingfoot_GroupB.log +0 -848
- data/test/interopR2/clientXMLBus_Base.log +0 -3075
- data/test/interopR2/clientXMLBus_GroupB.log +0 -483
- data/test/interopR2/clientXSOAP_Base.log +0 -4445
- data/test/interopR2/clienteSOAP_Base.log +0 -8728
- data/test/interopR2/clientgSOAP_Base.log +0 -4689
- data/test/interopR2/clientgSOAP_GroupB.log +0 -1014
- data/test/interopR2/clientkSOAP_Base.log +0 -5625
@@ -0,0 +1,119 @@
|
|
1
|
+
require 'test/unit'
|
2
|
+
require 'wsdl/soap/wsdl2ruby'
|
3
|
+
require 'soap/wsdlDriver'
|
4
|
+
require File.join(File.dirname(File.expand_path(__FILE__)), '..', '..', 'testutil.rb')
|
5
|
+
|
6
|
+
|
7
|
+
module WSDL; module Fault
|
8
|
+
|
9
|
+
|
10
|
+
class TestFault < Test::Unit::TestCase
|
11
|
+
DIR = File.dirname(File.expand_path(__FILE__))
|
12
|
+
Port = 17171
|
13
|
+
|
14
|
+
def setup
|
15
|
+
setup_classdef
|
16
|
+
setup_server
|
17
|
+
@client = nil
|
18
|
+
end
|
19
|
+
|
20
|
+
def teardown
|
21
|
+
teardown_server
|
22
|
+
unless $DEBUG
|
23
|
+
File.unlink(pathname('Add.rb'))
|
24
|
+
File.unlink(pathname('AddMappingRegistry.rb'))
|
25
|
+
File.unlink(pathname('AddServant.rb'))
|
26
|
+
File.unlink(pathname('AddService.rb'))
|
27
|
+
end
|
28
|
+
@client.reset_stream if @client
|
29
|
+
end
|
30
|
+
|
31
|
+
def setup_server
|
32
|
+
AddPortType.class_eval do
|
33
|
+
define_method(:add) do |request|
|
34
|
+
@sum ||= 0
|
35
|
+
if (request.value > 100)
|
36
|
+
fault = AddFault.new("Value #{request.value} is too large", "Critical")
|
37
|
+
raise fault
|
38
|
+
end
|
39
|
+
@sum += request.value
|
40
|
+
return AddResponse.new(@sum)
|
41
|
+
end
|
42
|
+
end
|
43
|
+
@server = AddPortTypeApp.new('app', nil, '0.0.0.0', Port)
|
44
|
+
@server.level = Logger::Severity::ERROR
|
45
|
+
@server_thread = TestUtil.start_server_thread(@server)
|
46
|
+
end
|
47
|
+
|
48
|
+
def setup_classdef
|
49
|
+
gen = WSDL::SOAP::WSDL2Ruby.new
|
50
|
+
gen.location = pathname("fault.wsdl")
|
51
|
+
gen.basedir = DIR
|
52
|
+
gen.logger.level = Logger::FATAL
|
53
|
+
gen.opt['module_path'] = self.class.to_s.sub(/::[^:]+$/, '')
|
54
|
+
gen.opt['classdef'] = nil
|
55
|
+
gen.opt['mapping_registry'] = nil
|
56
|
+
gen.opt['servant_skelton'] = nil
|
57
|
+
gen.opt['standalone_server_stub'] = nil
|
58
|
+
gen.opt['force'] = true
|
59
|
+
TestUtil.silent do
|
60
|
+
gen.run
|
61
|
+
end
|
62
|
+
TestUtil.require(DIR, 'Add.rb', 'AddMappingRegistry.rb', 'AddServant.rb', 'AddService.rb')
|
63
|
+
end
|
64
|
+
|
65
|
+
def teardown_server
|
66
|
+
@server.shutdown
|
67
|
+
@server_thread.kill
|
68
|
+
@server_thread.join
|
69
|
+
end
|
70
|
+
|
71
|
+
def pathname(filename)
|
72
|
+
File.join(DIR, filename)
|
73
|
+
end
|
74
|
+
|
75
|
+
def test_driver
|
76
|
+
@client = ::SOAP::RPC::Driver.new("http://localhost:#{Port}/")
|
77
|
+
@client.mapping_registry = AddMappingRegistry::EncodedRegistry
|
78
|
+
@client.literal_mapping_registry = AddMappingRegistry::LiteralRegistry
|
79
|
+
@client.add_document_operation(
|
80
|
+
"Add",
|
81
|
+
"add",
|
82
|
+
[ ["in", "request", ["::SOAP::SOAPElement", "http://fault.test/Faulttest", "Add"]],
|
83
|
+
["out", "response", ["::SOAP::SOAPElement", "http://fault.test/Faulttest", "AddResponse"]] ],
|
84
|
+
{ :request_style => :document, :request_use => :literal,
|
85
|
+
:response_style => :document, :response_use => :literal,
|
86
|
+
:faults => {"AddFault"=>{:namespace=>nil, :name=>"AddFault", :use=>"literal", :encodingstyle=>"document", :ns=>"http://fault.test/Faulttest"}} }
|
87
|
+
)
|
88
|
+
@client.wiredump_dev = STDOUT if $DEBUG
|
89
|
+
do_test(@client)
|
90
|
+
end
|
91
|
+
|
92
|
+
def test_wsdl
|
93
|
+
wsdl = File.join(DIR, 'fault.wsdl')
|
94
|
+
@client = ::SOAP::WSDLDriverFactory.new(wsdl).create_rpc_driver
|
95
|
+
@client.endpoint_url = "http://localhost:#{Port}/"
|
96
|
+
@client.mapping_registry = AddMappingRegistry::EncodedRegistry
|
97
|
+
@client.literal_mapping_registry = AddMappingRegistry::LiteralRegistry
|
98
|
+
@client.wiredump_dev = STDOUT if $DEBUG
|
99
|
+
do_test(@client)
|
100
|
+
end
|
101
|
+
|
102
|
+
def do_test(client)
|
103
|
+
assert_equal(100, client.add(Add.new(100)).sum)
|
104
|
+
assert_equal(100, client.add(Add.new(0)).sum)
|
105
|
+
assert_equal(150, client.add(Add.new(50)).sum)
|
106
|
+
begin
|
107
|
+
client.add(Add.new(101))
|
108
|
+
assert(false)
|
109
|
+
rescue Exception => e
|
110
|
+
assert_equal(::SOAP::FaultError, e.class)
|
111
|
+
assert_equal("WSDL::Fault::AddFault", e.faultstring.data)
|
112
|
+
assert_equal("Value 101 is too large", e.detail.addFault.reason)
|
113
|
+
assert_equal("Critical", e.detail.addFault.severity)
|
114
|
+
end
|
115
|
+
end
|
116
|
+
end
|
117
|
+
|
118
|
+
|
119
|
+
end; end
|
@@ -0,0 +1,134 @@
|
|
1
|
+
require 'test/unit'
|
2
|
+
require 'wsdl/soap/wsdl2ruby'
|
3
|
+
require 'soap/wsdlDriver'
|
4
|
+
require File.join(File.dirname(File.expand_path(__FILE__)), '..', '..', 'testutil.rb')
|
5
|
+
|
6
|
+
|
7
|
+
module WSDL; module Fault
|
8
|
+
|
9
|
+
|
10
|
+
class TestMultiFault < Test::Unit::TestCase
|
11
|
+
DIR = File.dirname(File.expand_path(__FILE__))
|
12
|
+
Port = 17171
|
13
|
+
|
14
|
+
def setup
|
15
|
+
setup_classdef
|
16
|
+
setup_server
|
17
|
+
@client = nil
|
18
|
+
end
|
19
|
+
|
20
|
+
def teardown
|
21
|
+
teardown_server
|
22
|
+
unless $DEBUG
|
23
|
+
File.unlink(pathname('Add.rb'))
|
24
|
+
File.unlink(pathname('AddMappingRegistry.rb'))
|
25
|
+
File.unlink(pathname('AddServant.rb'))
|
26
|
+
File.unlink(pathname('AddService.rb'))
|
27
|
+
end
|
28
|
+
@client.reset_stream if @client
|
29
|
+
end
|
30
|
+
|
31
|
+
def setup_server
|
32
|
+
AddPortType.class_eval do
|
33
|
+
define_method(:add) do |request|
|
34
|
+
@sum ||= 0
|
35
|
+
if (request.value > 100)
|
36
|
+
fault = AddFault.new("Value #{request.value} is too large", "Critical")
|
37
|
+
raise fault
|
38
|
+
end
|
39
|
+
|
40
|
+
if (request.value < 0)
|
41
|
+
fault = NegativeValueFault.new("Value #{request.value} is negative", "Fatal")
|
42
|
+
raise fault
|
43
|
+
end
|
44
|
+
|
45
|
+
@sum += request.value
|
46
|
+
return AddResponse.new(@sum)
|
47
|
+
end
|
48
|
+
end
|
49
|
+
@server = AddPortTypeApp.new('app', nil, '0.0.0.0', Port)
|
50
|
+
@server.level = Logger::Severity::ERROR
|
51
|
+
@server_thread = TestUtil.start_server_thread(@server)
|
52
|
+
end
|
53
|
+
|
54
|
+
def setup_classdef
|
55
|
+
gen = WSDL::SOAP::WSDL2Ruby.new
|
56
|
+
gen.location = pathname("multifault.wsdl")
|
57
|
+
gen.basedir = DIR
|
58
|
+
gen.logger.level = Logger::FATAL
|
59
|
+
gen.opt['module_path'] = self.class.to_s.sub(/::[^:]+$/, '')
|
60
|
+
gen.opt['classdef'] = nil
|
61
|
+
gen.opt['mapping_registry'] = nil
|
62
|
+
gen.opt['servant_skelton'] = nil
|
63
|
+
gen.opt['standalone_server_stub'] = nil
|
64
|
+
gen.opt['force'] = true
|
65
|
+
TestUtil.silent do
|
66
|
+
gen.run
|
67
|
+
end
|
68
|
+
TestUtil.require(DIR, 'Add.rb', 'AddMappingRegistry.rb', 'AddServant.rb', 'AddService.rb')
|
69
|
+
end
|
70
|
+
|
71
|
+
def teardown_server
|
72
|
+
@server.shutdown
|
73
|
+
@server_thread.kill
|
74
|
+
@server_thread.join
|
75
|
+
end
|
76
|
+
|
77
|
+
def pathname(filename)
|
78
|
+
File.join(DIR, filename)
|
79
|
+
end
|
80
|
+
|
81
|
+
def test_driver
|
82
|
+
@client = ::SOAP::RPC::Driver.new("http://localhost:#{Port}/")
|
83
|
+
@client.mapping_registry = AddMappingRegistry::EncodedRegistry
|
84
|
+
@client.literal_mapping_registry = AddMappingRegistry::LiteralRegistry
|
85
|
+
@client.add_document_operation(
|
86
|
+
"Add",
|
87
|
+
"add",
|
88
|
+
[ ["in", "request", ["::SOAP::SOAPElement", "http://fault.test/Faulttest", "Add"]],
|
89
|
+
["out", "response", ["::SOAP::SOAPElement", "http://fault.test/Faulttest", "AddResponse"]] ],
|
90
|
+
{ :request_style => :document, :request_use => :literal,
|
91
|
+
:response_style => :document, :response_use => :literal,
|
92
|
+
:faults => {"AddFault"=>{:namespace=>nil, :name=>"AddFault", :use=>"literal", :encodingstyle=>"document", :ns=>"http://fault.test/Faulttest"}} }
|
93
|
+
)
|
94
|
+
@client.wiredump_dev = STDOUT if $DEBUG
|
95
|
+
do_test(@client)
|
96
|
+
end
|
97
|
+
|
98
|
+
def test_wsdl
|
99
|
+
wsdl = File.join(DIR, 'multifault.wsdl')
|
100
|
+
@client = ::SOAP::WSDLDriverFactory.new(wsdl).create_rpc_driver
|
101
|
+
@client.endpoint_url = "http://localhost:#{Port}/"
|
102
|
+
@client.mapping_registry = AddMappingRegistry::EncodedRegistry
|
103
|
+
@client.literal_mapping_registry = AddMappingRegistry::LiteralRegistry
|
104
|
+
@client.wiredump_dev = STDOUT if $DEBUG
|
105
|
+
do_test(@client)
|
106
|
+
end
|
107
|
+
|
108
|
+
def do_test(client)
|
109
|
+
assert_equal(100, client.add(Add.new(100)).sum)
|
110
|
+
assert_equal(100, client.add(Add.new(0)).sum)
|
111
|
+
assert_equal(150, client.add(Add.new(50)).sum)
|
112
|
+
begin
|
113
|
+
client.add(Add.new(101))
|
114
|
+
assert(false)
|
115
|
+
rescue Exception => e
|
116
|
+
assert_equal(::SOAP::FaultError, e.class)
|
117
|
+
assert_equal("WSDL::Fault::AddFault", e.faultstring.data)
|
118
|
+
assert_equal("Value 101 is too large", e.detail.addFault.reason)
|
119
|
+
assert_equal("Critical", e.detail.addFault.severity)
|
120
|
+
end
|
121
|
+
begin
|
122
|
+
client.add(Add.new(-50))
|
123
|
+
assert(false)
|
124
|
+
rescue Exception => e
|
125
|
+
assert_equal(::SOAP::FaultError, e.class)
|
126
|
+
assert_equal("WSDL::Fault::NegativeValueFault", e.faultstring.data)
|
127
|
+
assert_equal("Value -50 is negative", e.detail.negativeValueFault.reason)
|
128
|
+
assert_equal("Fatal", e.detail.negativeValueFault.severity)
|
129
|
+
end
|
130
|
+
end
|
131
|
+
end
|
132
|
+
|
133
|
+
|
134
|
+
end; end
|
data/test/wsdl/list/test_list.rb
CHANGED
@@ -3,6 +3,7 @@ require 'wsdl/parser'
|
|
3
3
|
require 'wsdl/soap/wsdl2ruby'
|
4
4
|
require 'soap/rpc/standaloneServer'
|
5
5
|
require 'soap/wsdlDriver'
|
6
|
+
require File.join(File.dirname(File.expand_path(__FILE__)), '..', '..', 'testutil.rb')
|
6
7
|
|
7
8
|
|
8
9
|
module WSDL; module List
|
@@ -40,6 +41,7 @@ class TestList < Test::Unit::TestCase
|
|
40
41
|
def teardown
|
41
42
|
teardown_server
|
42
43
|
File.unlink(pathname('list.rb')) unless $DEBUG
|
44
|
+
File.unlink(pathname('listMappingRegistry.rb')) unless $DEBUG
|
43
45
|
File.unlink(pathname('listDriver.rb')) unless $DEBUG
|
44
46
|
@client.reset_stream if @client
|
45
47
|
end
|
@@ -47,7 +49,7 @@ class TestList < Test::Unit::TestCase
|
|
47
49
|
def setup_server
|
48
50
|
@server = Server.new('Test', Server::Namespace, '0.0.0.0', Port)
|
49
51
|
@server.level = Logger::Severity::ERROR
|
50
|
-
@server_thread = start_server_thread(@server)
|
52
|
+
@server_thread = TestUtil.start_server_thread(@server)
|
51
53
|
end
|
52
54
|
|
53
55
|
def setup_classdef
|
@@ -55,17 +57,13 @@ class TestList < Test::Unit::TestCase
|
|
55
57
|
gen.location = pathname("list.wsdl")
|
56
58
|
gen.basedir = DIR
|
57
59
|
gen.logger.level = Logger::FATAL
|
60
|
+
gen.opt['module_path'] = self.class.to_s.sub(/::[^:]+$/, '')
|
58
61
|
gen.opt['classdef'] = nil
|
62
|
+
gen.opt['mapping_registry'] = nil
|
59
63
|
gen.opt['driver'] = nil
|
60
64
|
gen.opt['force'] = true
|
61
65
|
gen.run
|
62
|
-
|
63
|
-
begin
|
64
|
-
$:.unshift(pathname('.'))
|
65
|
-
require pathname('listDriver')
|
66
|
-
ensure
|
67
|
-
$:.replace(back)
|
68
|
-
end
|
66
|
+
TestUtil.require(DIR, 'listDriver.rb', 'listMappingRegistry.rb', 'list.rb')
|
69
67
|
end
|
70
68
|
|
71
69
|
def teardown_server
|
@@ -74,14 +72,6 @@ class TestList < Test::Unit::TestCase
|
|
74
72
|
@server_thread.join
|
75
73
|
end
|
76
74
|
|
77
|
-
def start_server_thread(server)
|
78
|
-
t = Thread.new {
|
79
|
-
Thread.current.abort_on_exception = true
|
80
|
-
server.start
|
81
|
-
}
|
82
|
-
t
|
83
|
-
end
|
84
|
-
|
85
75
|
def pathname(filename)
|
86
76
|
File.join(DIR, filename)
|
87
77
|
end
|
@@ -3,10 +3,10 @@ require 'wsdl/parser'
|
|
3
3
|
require 'soap/mapping/wsdlencodedregistry'
|
4
4
|
require 'soap/marshal'
|
5
5
|
require 'wsdl/soap/wsdl2ruby'
|
6
|
+
require File.join(File.dirname(File.expand_path(__FILE__)), '..', '..', 'testutil.rb')
|
6
7
|
|
7
|
-
class WSDLMarshaller
|
8
|
-
include SOAP
|
9
8
|
|
9
|
+
class WSDLMarshaller
|
10
10
|
def initialize(wsdlfile)
|
11
11
|
wsdl = WSDL::Parser.new.parse(File.open(wsdlfile) { |f| f.read })
|
12
12
|
types = wsdl.collect_complextypes
|
@@ -15,18 +15,18 @@ class WSDLMarshaller
|
|
15
15
|
:generate_explicit_type => false,
|
16
16
|
:pretty => true
|
17
17
|
}
|
18
|
-
@mapping_registry = Mapping::WSDLEncodedRegistry.new(types)
|
18
|
+
@mapping_registry = ::SOAP::Mapping::WSDLEncodedRegistry.new(types)
|
19
19
|
end
|
20
20
|
|
21
21
|
def dump(obj, io = nil)
|
22
|
-
ele =
|
23
|
-
ele.elename = ele.type
|
24
|
-
Processor.marshal(SOAPEnvelope.new(nil, SOAPBody.new(ele)), @opt, io)
|
22
|
+
ele = ::SOAP::Mapping.obj2soap(obj, @mapping_registry)
|
23
|
+
ele.elename = XSD::QName.new(nil, ele.type.name.to_s)
|
24
|
+
::SOAP::Processor.marshal(::SOAP::SOAPEnvelope.new(nil, ::SOAP::SOAPBody.new(ele)), @opt, io)
|
25
25
|
end
|
26
26
|
|
27
27
|
def load(io)
|
28
|
-
header, body = Processor.unmarshal(io, @opt)
|
29
|
-
Mapping.soap2obj(body.root_node)
|
28
|
+
header, body = ::SOAP::Processor.unmarshal(io, @opt)
|
29
|
+
::SOAP::Mapping.soap2obj(body.root_node, @mapping_registry)
|
30
30
|
end
|
31
31
|
end
|
32
32
|
|
@@ -48,6 +48,7 @@ class TestWSDLMarshal < Test::Unit::TestCase
|
|
48
48
|
marshaller = WSDLMarshaller.new(pathname('person.wsdl'))
|
49
49
|
obj = Person.new("NAKAMURA", "Hiroshi", 1, 1.0, "1")
|
50
50
|
str = marshaller.dump(obj)
|
51
|
+
puts str if $DEBUG
|
51
52
|
obj2 = marshaller.load(str)
|
52
53
|
assert_equal(obj, obj2)
|
53
54
|
assert_equal(str, marshaller.dump(obj2))
|
@@ -66,11 +67,7 @@ class TestWSDLMarshal < Test::Unit::TestCase
|
|
66
67
|
end
|
67
68
|
|
68
69
|
def compare(expected, actual)
|
69
|
-
|
70
|
-
end
|
71
|
-
|
72
|
-
def loadfile(file)
|
73
|
-
File.open(pathname(file)) { |f| f.read }
|
70
|
+
TestUtil.filecompare(pathname(expected), pathname(actual))
|
74
71
|
end
|
75
72
|
|
76
73
|
def pathname(filename)
|
@@ -0,0 +1,36 @@
|
|
1
|
+
<?xml version="1.0" encoding="UTF-8"?>
|
2
|
+
<definitions name="oneway" targetNamespace="http://www.example.com/oneway" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://www.example.com/oneway" xmlns:plnk="http://schemas.xmlsoap.org/ws/2003/05/partner-link/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:client="http://www.example.com/oneway">
|
3
|
+
<types>
|
4
|
+
<schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://www.example.com/oneway" xmlns="http://www.w3.org/2001/XMLSchema">
|
5
|
+
<element name="onewayProcessRequest">
|
6
|
+
<complexType>
|
7
|
+
<sequence>
|
8
|
+
<element name="msg" type="string" nillable="true" />
|
9
|
+
</sequence>
|
10
|
+
</complexType>
|
11
|
+
</element>
|
12
|
+
</schema>
|
13
|
+
</types>
|
14
|
+
<message name="onewayRequestMessage">
|
15
|
+
<part name="payload" element="tns:onewayProcessRequest"/>
|
16
|
+
</message>
|
17
|
+
<portType name="onewayPort">
|
18
|
+
<operation name="initiate">
|
19
|
+
<input message="tns:onewayRequestMessage"/>
|
20
|
+
</operation>
|
21
|
+
</portType>
|
22
|
+
<binding name="onewayBinding" type="tns:onewayPort">
|
23
|
+
<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
|
24
|
+
<operation name="initiate">
|
25
|
+
<soap:operation style="document" soapAction="initiate"/>
|
26
|
+
<input>
|
27
|
+
<soap:body use="literal"/>
|
28
|
+
</input>
|
29
|
+
</operation>
|
30
|
+
</binding>
|
31
|
+
<service name="onewayService">
|
32
|
+
<port name="onewayPort" binding="tns:onewayBinding">
|
33
|
+
<soap:address location="http://localhost:1234/soap"/>
|
34
|
+
</port>
|
35
|
+
</service>
|
36
|
+
</definitions>
|
@@ -0,0 +1,108 @@
|
|
1
|
+
require 'test/unit'
|
2
|
+
require 'soap/rpc/standaloneServer'
|
3
|
+
require 'wsdl/soap/wsdl2ruby'
|
4
|
+
require 'soap/wsdlDriver'
|
5
|
+
require File.join(File.dirname(File.expand_path(__FILE__)), '..', '..', 'testutil.rb')
|
6
|
+
|
7
|
+
|
8
|
+
module WSDL
|
9
|
+
module Oneway
|
10
|
+
|
11
|
+
|
12
|
+
class TestOneway < Test::Unit::TestCase
|
13
|
+
NS = 'http://www.example.com/oneway'
|
14
|
+
class Server < ::SOAP::RPC::StandaloneServer
|
15
|
+
Methods = [
|
16
|
+
[ "initiate",
|
17
|
+
"initiate",
|
18
|
+
[ ["in", "payload", ["::SOAP::SOAPElement", "http://www.example.com/oneway", "onewayProcessRequest"]] ],
|
19
|
+
{ :request_style => :document, :request_use => :literal,
|
20
|
+
:response_style => :document, :response_use => nil,
|
21
|
+
:faults => {} }
|
22
|
+
]
|
23
|
+
]
|
24
|
+
|
25
|
+
def on_init
|
26
|
+
Methods.each do |definition|
|
27
|
+
add_document_operation(self, *definition)
|
28
|
+
end
|
29
|
+
self.mapping_registry = OnewayMappingRegistry::EncodedRegistry
|
30
|
+
self.literal_mapping_registry = OnewayMappingRegistry::LiteralRegistry
|
31
|
+
end
|
32
|
+
|
33
|
+
def initiate(payload)
|
34
|
+
raise unless payload.msg
|
35
|
+
end
|
36
|
+
end
|
37
|
+
|
38
|
+
DIR = File.dirname(File.expand_path(__FILE__))
|
39
|
+
|
40
|
+
Port = 17171
|
41
|
+
|
42
|
+
def setup
|
43
|
+
setup_classdef
|
44
|
+
setup_server
|
45
|
+
@client = nil
|
46
|
+
end
|
47
|
+
|
48
|
+
def teardown
|
49
|
+
teardown_server
|
50
|
+
unless $DEBUG
|
51
|
+
File.unlink(pathname('oneway.rb'))
|
52
|
+
File.unlink(pathname('onewayMappingRegistry.rb'))
|
53
|
+
File.unlink(pathname('onewayDriver.rb'))
|
54
|
+
end
|
55
|
+
@client.reset_stream if @client
|
56
|
+
end
|
57
|
+
|
58
|
+
def setup_server
|
59
|
+
@server = Server.new('Test', "http://www.example.com/oneway", '0.0.0.0', Port)
|
60
|
+
@server.level = Logger::Severity::ERROR
|
61
|
+
@server_thread = TestUtil.start_server_thread(@server)
|
62
|
+
end
|
63
|
+
|
64
|
+
def setup_classdef
|
65
|
+
gen = WSDL::SOAP::WSDL2Ruby.new
|
66
|
+
gen.location = pathname("oneway.wsdl")
|
67
|
+
gen.basedir = DIR
|
68
|
+
gen.logger.level = Logger::FATAL
|
69
|
+
gen.opt['classdef'] = nil
|
70
|
+
gen.opt['mapping_registry'] = nil
|
71
|
+
gen.opt['driver'] = nil
|
72
|
+
gen.opt['force'] = true
|
73
|
+
gen.opt['module_path'] = 'WSDL::Oneway'
|
74
|
+
gen.run
|
75
|
+
TestUtil.require(DIR, 'oneway.rb', 'onewayDriver.rb', 'onewayMappingRegistry.rb')
|
76
|
+
end
|
77
|
+
|
78
|
+
def teardown_server
|
79
|
+
@server.shutdown
|
80
|
+
@server_thread.kill
|
81
|
+
@server_thread.join
|
82
|
+
end
|
83
|
+
|
84
|
+
def pathname(filename)
|
85
|
+
File.join(DIR, filename)
|
86
|
+
end
|
87
|
+
|
88
|
+
def test_stub
|
89
|
+
@client = OnewayPort.new("http://localhost:#{Port}/")
|
90
|
+
@client.wiredump_dev = STDERR if $DEBUG
|
91
|
+
# not raised
|
92
|
+
@client.initiate(OnewayProcessRequest.new("msg"))
|
93
|
+
@client.initiate(OnewayProcessRequest.new(nil))
|
94
|
+
end
|
95
|
+
|
96
|
+
def test_wsdl
|
97
|
+
@client = ::SOAP::WSDLDriverFactory.new(pathname('oneway.wsdl')).create_rpc_driver
|
98
|
+
@client.endpoint_url = "http://localhost:#{Port}/"
|
99
|
+
@client.wiredump_dev = STDERR if $DEBUG
|
100
|
+
# not raised
|
101
|
+
@client.initiate(OnewayProcessRequest.new("msg"))
|
102
|
+
@client.initiate(OnewayProcessRequest.new(nil))
|
103
|
+
end
|
104
|
+
end
|
105
|
+
|
106
|
+
|
107
|
+
end
|
108
|
+
end
|