1.1 --- a/tests/xmlrpc_test.py Mon Oct 01 23:27:00 2007 +0000
1.2 +++ b/tests/xmlrpc_test.py Mon Oct 01 23:27:18 2007 +0000
1.3 @@ -15,11 +15,11 @@
1.4 </methodCall>"""
1.5
1.6 req = libxml2dom.xmlrpc.parseString(request)
1.7 -assert req.methodName == "examples.getStateName"
1.8 -assert req.parameterValues == [41]
1.9 +assert req.method.methodName == "examples.getStateName"
1.10 +assert req.method.parameterValues == [("i4", "41")]
1.11 assert req.fault is None
1.12 -print "Method name:", req.methodName
1.13 -print "Parameter values:", req.parameterValues
1.14 +print "Method name:", req.method.methodName
1.15 +print "Parameter values:", req.method.parameterValues
1.16 print "Fault:", req.fault
1.17
1.18 response = """<?xml version="1.0"?>
1.19 @@ -32,11 +32,11 @@
1.20 </methodResponse>"""
1.21
1.22 resp = libxml2dom.xmlrpc.parseString(response)
1.23 -assert resp.methodName is None
1.24 -assert resp.parameterValues == ["South Dakota"]
1.25 +assert resp.method.methodName is None
1.26 +assert resp.method.parameterValues == [("string", "South Dakota")]
1.27 assert resp.fault is None
1.28 -print "Method name:", resp.methodName
1.29 -print "Parameter values:", resp.parameterValues
1.30 +print "Method name:", resp.method.methodName
1.31 +print "Parameter values:", resp.method.parameterValues
1.32 print "Fault:", resp.fault
1.33
1.34 failed = """<?xml version="1.0"?>
1.35 @@ -58,12 +58,12 @@
1.36 </methodResponse>"""
1.37
1.38 f = libxml2dom.xmlrpc.parseString(failed)
1.39 -assert f.methodName is None
1.40 -assert f.parameterValues == []
1.41 +assert f.method.methodName is None
1.42 +assert f.method.parameterValues == []
1.43 assert f.fault.code == "4"
1.44 assert f.fault.reason == "Too many parameters."
1.45 -print "Method name:", f.methodName
1.46 -print "Parameter values:", f.parameterValues
1.47 +print "Method name:", f.method.methodName
1.48 +print "Parameter values:", f.method.parameterValues
1.49 print "Fault code:", f.fault.code
1.50
1.51 # Python Package Index examples.
1.52 @@ -95,17 +95,11 @@
1.53 </methodCall>"""
1.54
1.55 s = libxml2dom.xmlrpc.parseString(search)
1.56 -assert s.methodName == "search"
1.57 -assert s.parameterValues == [[("name", "libxml2dom"), ("description", "XML")], "and"]
1.58 -assert s.parameterItems == [
1.59 - (None, [("name", "libxml2dom"), ("description", "XML")]),
1.60 - (None, "and")
1.61 - ]
1.62 +assert s.method.methodName == "search"
1.63 +assert s.method.parameterValues == [("struct", [("name", ("string", "libxml2dom")), ("description", ("string", "XML"))]), ("string", "and")]
1.64 assert s.fault is None
1.65 -print "Method name:", s.methodName
1.66 -print "Parameter values:", s.parameterValues
1.67 -print "Parameter items:", s.parameterItems
1.68 -print "Parameter map:", s.parameterMap
1.69 +print "Method name:", s.method.methodName
1.70 +print "Parameter values:", s.method.parameterValues
1.71 print "Fault:", s.fault
1.72
1.73 # vim: tabstop=4 expandtab shiftwidth=4