1.1 --- a/tests/soap_test.py Mon Oct 01 23:27:00 2007 +0000
1.2 +++ b/tests/soap_test.py Mon Oct 01 23:27:18 2007 +0000
1.3 @@ -30,14 +30,20 @@
1.4 </env:Envelope>"""
1.5
1.6 req = libxml2dom.soap.parseString(request)
1.7 -assert req.methodName == "chargeReservation"
1.8 -assert req.parameterValues == [
1.9 - [("code", "FT35ZBQ")],
1.10 - [("name", u"Åke Jógvan Øyvind"), ("number", "123456789099999"), ("expiration", "2005-02")]
1.11 +assert req.method.methodName == "chargeReservation"
1.12 +assert req.method.parameterValues == [
1.13 + (("http://travelcompany.example.org/reservation", "m:reservation"), [
1.14 + (("http://travelcompany.example.org/reservation", "m:code"), "FT35ZBQ")
1.15 + ]),
1.16 + (("http://mycompany.example.com/financial", "o:creditCard"), [
1.17 + (("http://mycompany.example.com/employees", "n:name"), u"Åke Jógvan Øyvind"),
1.18 + (("http://mycompany.example.com/financial", "o:number"), "123456789099999"),
1.19 + (("http://mycompany.example.com/financial", "o:expiration"), "2005-02")
1.20 + ])
1.21 ]
1.22 assert req.fault is None
1.23 -print "Method name:", req.methodName
1.24 -print "Parameter values:", req.parameterValues
1.25 +print "Method name:", req.method.methodName
1.26 +print "Parameter values:", req.method.parameterValues
1.27 print "Fault:", req.fault
1.28
1.29 response = """<?xml version='1.0' encoding='iso-8859-1'?>
1.30 @@ -61,11 +67,14 @@
1.31 </env:Envelope>"""
1.32
1.33 resp = libxml2dom.soap.parseString(response)
1.34 -assert resp.methodName == "chargeReservationResponse"
1.35 -assert resp.parameterValues == [("code", "FT35ZBQ"), ("viewAt", "http://travelcompany.example.org/reservations?code=FT35ZBQ")]
1.36 +assert resp.method.methodName == "chargeReservationResponse"
1.37 +assert resp.method.parameterValues == [
1.38 + (("http://travelcompany.example.org/", "m:code"), "FT35ZBQ"),
1.39 + (("http://travelcompany.example.org/", "m:viewAt"), "http://travelcompany.example.org/reservations?code=FT35ZBQ")
1.40 + ]
1.41 assert resp.fault is None
1.42 -print "Method name:", resp.methodName
1.43 -print "Parameter values:", resp.parameterValues
1.44 +print "Method name:", resp.method.methodName
1.45 +print "Parameter values:", resp.method.parameterValues
1.46 print "Fault:", resp.fault
1.47
1.48 response2 = """<?xml version='1.0' encoding='iso-8859-1'?>
1.49 @@ -92,14 +101,16 @@
1.50 </env:Envelope>"""
1.51
1.52 resp2 = libxml2dom.soap.parseString(response2)
1.53 -assert resp2.methodName == "chargeReservationResponse"
1.54 -assert resp2.parameterValues == [
1.55 - ("result", "m:status"), ("status", "confirmed"), ("code", "FT35ZBQ"),
1.56 - ("viewAt", "http://travelcompany.example.org/reservations?code=FT35ZBQ")
1.57 +assert resp2.method.methodName == "chargeReservationResponse"
1.58 +assert resp2.method.parameterValues == [
1.59 + (("http://www.w3.org/2003/05/soap-rpc", "rpc:result"), "m:status"),
1.60 + (("http://travelcompany.example.org/", "m:status"), "confirmed"),
1.61 + (("http://travelcompany.example.org/", "m:code"), "FT35ZBQ"),
1.62 + (("http://travelcompany.example.org/", "m:viewAt"), "http://travelcompany.example.org/reservations?code=FT35ZBQ")
1.63 ]
1.64 assert resp2.fault is None
1.65 -print "Method name:", resp2.methodName
1.66 -print "Parameter values:", resp2.parameterValues
1.67 +print "Method name:", resp2.method.methodName
1.68 +print "Parameter values:", resp2.method.parameterValues
1.69 print "Fault:", resp2.fault
1.70
1.71 failed = """<?xml version='1.0' encoding='iso-8859-1'?>
1.72 @@ -129,12 +140,9 @@
1.73 </env:Envelope>"""
1.74
1.75 f = libxml2dom.soap.parseString(failed)
1.76 -assert f.methodName is None
1.77 -assert f.parameterValues == []
1.78 +assert f.method is None
1.79 assert f.fault.code == "env:Sender"
1.80 assert f.fault.subcode == "rpc:BadArguments"
1.81 -print "Method name:", f.methodName
1.82 -print "Parameter values:", f.parameterValues
1.83 print "Fault code:", f.fault.code
1.84
1.85 # vim: tabstop=4 expandtab shiftwidth=4
2.1 --- a/tests/xmlrpc_test.py Mon Oct 01 23:27:00 2007 +0000
2.2 +++ b/tests/xmlrpc_test.py Mon Oct 01 23:27:18 2007 +0000
2.3 @@ -15,11 +15,11 @@
2.4 </methodCall>"""
2.5
2.6 req = libxml2dom.xmlrpc.parseString(request)
2.7 -assert req.methodName == "examples.getStateName"
2.8 -assert req.parameterValues == [41]
2.9 +assert req.method.methodName == "examples.getStateName"
2.10 +assert req.method.parameterValues == [("i4", "41")]
2.11 assert req.fault is None
2.12 -print "Method name:", req.methodName
2.13 -print "Parameter values:", req.parameterValues
2.14 +print "Method name:", req.method.methodName
2.15 +print "Parameter values:", req.method.parameterValues
2.16 print "Fault:", req.fault
2.17
2.18 response = """<?xml version="1.0"?>
2.19 @@ -32,11 +32,11 @@
2.20 </methodResponse>"""
2.21
2.22 resp = libxml2dom.xmlrpc.parseString(response)
2.23 -assert resp.methodName is None
2.24 -assert resp.parameterValues == ["South Dakota"]
2.25 +assert resp.method.methodName is None
2.26 +assert resp.method.parameterValues == [("string", "South Dakota")]
2.27 assert resp.fault is None
2.28 -print "Method name:", resp.methodName
2.29 -print "Parameter values:", resp.parameterValues
2.30 +print "Method name:", resp.method.methodName
2.31 +print "Parameter values:", resp.method.parameterValues
2.32 print "Fault:", resp.fault
2.33
2.34 failed = """<?xml version="1.0"?>
2.35 @@ -58,12 +58,12 @@
2.36 </methodResponse>"""
2.37
2.38 f = libxml2dom.xmlrpc.parseString(failed)
2.39 -assert f.methodName is None
2.40 -assert f.parameterValues == []
2.41 +assert f.method.methodName is None
2.42 +assert f.method.parameterValues == []
2.43 assert f.fault.code == "4"
2.44 assert f.fault.reason == "Too many parameters."
2.45 -print "Method name:", f.methodName
2.46 -print "Parameter values:", f.parameterValues
2.47 +print "Method name:", f.method.methodName
2.48 +print "Parameter values:", f.method.parameterValues
2.49 print "Fault code:", f.fault.code
2.50
2.51 # Python Package Index examples.
2.52 @@ -95,17 +95,11 @@
2.53 </methodCall>"""
2.54
2.55 s = libxml2dom.xmlrpc.parseString(search)
2.56 -assert s.methodName == "search"
2.57 -assert s.parameterValues == [[("name", "libxml2dom"), ("description", "XML")], "and"]
2.58 -assert s.parameterItems == [
2.59 - (None, [("name", "libxml2dom"), ("description", "XML")]),
2.60 - (None, "and")
2.61 - ]
2.62 +assert s.method.methodName == "search"
2.63 +assert s.method.parameterValues == [("struct", [("name", ("string", "libxml2dom")), ("description", ("string", "XML"))]), ("string", "and")]
2.64 assert s.fault is None
2.65 -print "Method name:", s.methodName
2.66 -print "Parameter values:", s.parameterValues
2.67 -print "Parameter items:", s.parameterItems
2.68 -print "Parameter map:", s.parameterMap
2.69 +print "Method name:", s.method.methodName
2.70 +print "Parameter values:", s.method.parameterValues
2.71 print "Fault:", s.fault
2.72
2.73 # vim: tabstop=4 expandtab shiftwidth=4