1.1 --- a/tests/xmlrpc_test.py Sat Oct 06 20:46:13 2007 +0000
1.2 +++ b/tests/xmlrpc_test.py Sat Oct 06 23:48:45 2007 +0000
1.3 @@ -1,7 +1,6 @@
1.4 #!/usr/bin/env python
1.5
1.6 import libxml2dom.xmlrpc
1.7 -from libxml2dom.rpc import ParameterName, ParameterValue
1.8
1.9 # Some examples from the specification.
1.10
1.11 @@ -17,7 +16,7 @@
1.12
1.13 req = libxml2dom.xmlrpc.parseString(request)
1.14 assert req.method.methodName == "examples.getStateName"
1.15 -assert req.method.parameterValues == [ParameterValue(ParameterName("i4", ""), "41")]
1.16 +assert req.method.parameterValues == [41]
1.17 assert req.fault is None
1.18 print "Method name:", req.method.methodName
1.19 print "Parameter values:", req.method.parameterValues
1.20 @@ -34,7 +33,7 @@
1.21
1.22 resp = libxml2dom.xmlrpc.parseString(response)
1.23 assert resp.method.methodName is None
1.24 -assert resp.method.parameterValues == [ParameterValue(ParameterName("string", ""), "South Dakota")]
1.25 +assert resp.method.parameterValues == ["South Dakota"]
1.26 assert resp.fault is None
1.27 print "Method name:", resp.method.methodName
1.28 print "Parameter values:", resp.method.parameterValues
1.29 @@ -98,11 +97,11 @@
1.30 s = libxml2dom.xmlrpc.parseString(search)
1.31 assert s.method.methodName == "search"
1.32 assert s.method.parameterValues == [
1.33 - ParameterValue(ParameterName("struct", None), [
1.34 - ParameterValue(ParameterName("string", "name"), "libxml2dom"),
1.35 - ParameterValue(ParameterName("string", "description"), "XML")
1.36 - ]),
1.37 - ParameterValue(ParameterName("string", None), "and")
1.38 + [
1.39 + ("name", "libxml2dom"),
1.40 + ("description", "XML")
1.41 + ],
1.42 + "and"
1.43 ]
1.44 assert s.fault is None
1.45 print "Method name:", s.method.methodName
1.46 @@ -147,13 +146,13 @@
1.47 s2 = libxml2dom.xmlrpc.parseString(search2)
1.48 assert s2.method.methodName == "search"
1.49 assert s2.method.parameterValues == [
1.50 - ParameterValue(ParameterName("struct", None), [
1.51 - ParameterValue(ParameterName("struct", "names"), [
1.52 - ParameterValue(ParameterName("string", "name"), "libxml2dom"),
1.53 - ParameterValue(ParameterName("string", "description"), "XML")
1.54 + [
1.55 + ("names", [
1.56 + ("name", "libxml2dom"),
1.57 + ("description", "XML")
1.58 ])
1.59 - ]),
1.60 - ParameterValue(ParameterName("string", None), "and")
1.61 + ],
1.62 + "and"
1.63 ]
1.64 assert s2.fault is None
1.65 print "Method name:", s2.method.methodName
1.66 @@ -182,12 +181,7 @@
1.67
1.68 a = libxml2dom.xmlrpc.parseString(arrays)
1.69 assert a.method.methodName is None
1.70 -assert a.method.parameterValues == [
1.71 - ParameterValue(ParameterName("array", None), [
1.72 - ParameterValue(ParameterName("string", None), "libxml2dom"),
1.73 - ParameterValue(ParameterName("string", None), "XSLTools")
1.74 - ])
1.75 - ]
1.76 +assert a.method.parameterValues == [["libxml2dom", "XSLTools"]]
1.77 assert a.fault is None
1.78 print "Method name:", a.method.methodName
1.79 print "Parameter values:", a.method.parameterValues