1.1 --- a/tests/xmlrpc_test.py Sat Oct 06 19:33:47 2007 +0000
1.2 +++ b/tests/xmlrpc_test.py Sat Oct 06 20:46:13 2007 +0000
1.3 @@ -1,6 +1,7 @@
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 @@ -16,10 +17,10 @@
1.12
1.13 req = libxml2dom.xmlrpc.parseString(request)
1.14 assert req.method.methodName == "examples.getStateName"
1.15 -assert req.method.rawParameterValues == [(("i4", ""), "41")]
1.16 +assert req.method.parameterValues == [ParameterValue(ParameterName("i4", ""), "41")]
1.17 assert req.fault is None
1.18 print "Method name:", req.method.methodName
1.19 -print "Parameter values:", req.method.rawParameterValues
1.20 +print "Parameter values:", req.method.parameterValues
1.21 print "Fault:", req.fault
1.22
1.23 response = """<?xml version="1.0"?>
1.24 @@ -33,10 +34,10 @@
1.25
1.26 resp = libxml2dom.xmlrpc.parseString(response)
1.27 assert resp.method.methodName is None
1.28 -assert resp.method.rawParameterValues == [(("string", ""), "South Dakota")]
1.29 +assert resp.method.parameterValues == [ParameterValue(ParameterName("string", ""), "South Dakota")]
1.30 assert resp.fault is None
1.31 print "Method name:", resp.method.methodName
1.32 -print "Parameter values:", resp.method.rawParameterValues
1.33 +print "Parameter values:", resp.method.parameterValues
1.34 print "Fault:", resp.fault
1.35
1.36 failed = """<?xml version="1.0"?>
1.37 @@ -59,11 +60,11 @@
1.38
1.39 f = libxml2dom.xmlrpc.parseString(failed)
1.40 assert f.method.methodName is None
1.41 -assert f.method.rawParameterValues == []
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.method.methodName
1.46 -print "Parameter values:", f.method.rawParameterValues
1.47 +print "Parameter values:", f.method.parameterValues
1.48 print "Fault code:", f.fault.code
1.49
1.50 # Python Package Index examples.
1.51 @@ -96,15 +97,16 @@
1.52
1.53 s = libxml2dom.xmlrpc.parseString(search)
1.54 assert s.method.methodName == "search"
1.55 -assert s.method.rawParameterValues == [
1.56 - (("struct", None), [
1.57 - (("string", "name"), "libxml2dom"), (("string", "description"), "XML")
1.58 +assert s.method.parameterValues == [
1.59 + ParameterValue(ParameterName("struct", None), [
1.60 + ParameterValue(ParameterName("string", "name"), "libxml2dom"),
1.61 + ParameterValue(ParameterName("string", "description"), "XML")
1.62 ]),
1.63 - (("string", None), "and")
1.64 + ParameterValue(ParameterName("string", None), "and")
1.65 ]
1.66 assert s.fault is None
1.67 print "Method name:", s.method.methodName
1.68 -print "Parameter values:", s.method.rawParameterValues
1.69 +print "Parameter values:", s.method.parameterValues
1.70 print "Fault:", s.fault
1.71
1.72 # Nested structure examples.
1.73 @@ -144,15 +146,18 @@
1.74
1.75 s2 = libxml2dom.xmlrpc.parseString(search2)
1.76 assert s2.method.methodName == "search"
1.77 -assert s2.method.rawParameterValues == [
1.78 - (("struct", None), [
1.79 - (("struct", "names"), [(("string", "name"), "libxml2dom"), (("string", "description"), "XML")])
1.80 +assert s2.method.parameterValues == [
1.81 + ParameterValue(ParameterName("struct", None), [
1.82 + ParameterValue(ParameterName("struct", "names"), [
1.83 + ParameterValue(ParameterName("string", "name"), "libxml2dom"),
1.84 + ParameterValue(ParameterName("string", "description"), "XML")
1.85 + ])
1.86 ]),
1.87 - (("string", None), "and")
1.88 + ParameterValue(ParameterName("string", None), "and")
1.89 ]
1.90 assert s2.fault is None
1.91 print "Method name:", s2.method.methodName
1.92 -print "Parameter values:", s2.method.rawParameterValues
1.93 +print "Parameter values:", s2.method.parameterValues
1.94 print "Fault:", s2.fault
1.95
1.96 arrays = """<?xml version="1.0"?>
1.97 @@ -177,12 +182,15 @@
1.98
1.99 a = libxml2dom.xmlrpc.parseString(arrays)
1.100 assert a.method.methodName is None
1.101 -assert a.method.rawParameterValues == [
1.102 - (("array", None), [(("string", None), "libxml2dom"), (("string", None), "XSLTools")])
1.103 +assert a.method.parameterValues == [
1.104 + ParameterValue(ParameterName("array", None), [
1.105 + ParameterValue(ParameterName("string", None), "libxml2dom"),
1.106 + ParameterValue(ParameterName("string", None), "XSLTools")
1.107 + ])
1.108 ]
1.109 assert a.fault is None
1.110 print "Method name:", a.method.methodName
1.111 -print "Parameter values:", a.method.rawParameterValues
1.112 +print "Parameter values:", a.method.parameterValues
1.113 print "Fault:", a.fault
1.114
1.115 # vim: tabstop=4 expandtab shiftwidth=4