# HG changeset patch
# User paulb
# Date 1191281238 0
# Node ID 62677a2566f0b49abe309638bdf11259b636f53f
# Parent  20d44607697b38b65ef0da543427c42d7dcb3c5b
[project @ 2007-10-01 23:27:18 by paulb]
Changed the tests to work with the updated API.

diff -r 20d44607697b -r 62677a2566f0 tests/soap_test.py
--- a/tests/soap_test.py	Mon Oct 01 23:27:00 2007 +0000
+++ b/tests/soap_test.py	Mon Oct 01 23:27:18 2007 +0000
@@ -30,14 +30,20 @@
 </env:Envelope>"""
 
 req = libxml2dom.soap.parseString(request)
-assert req.methodName == "chargeReservation"
-assert req.parameterValues == [
-    [("code", "FT35ZBQ")],
-    [("name", u"Åke Jógvan Øyvind"), ("number", "123456789099999"), ("expiration", "2005-02")]
+assert req.method.methodName == "chargeReservation"
+assert req.method.parameterValues == [
+    (("http://travelcompany.example.org/reservation", "m:reservation"), [
+        (("http://travelcompany.example.org/reservation", "m:code"), "FT35ZBQ")
+        ]),
+    (("http://mycompany.example.com/financial", "o:creditCard"), [
+        (("http://mycompany.example.com/employees", "n:name"), u"Åke Jógvan Øyvind"),
+        (("http://mycompany.example.com/financial", "o:number"), "123456789099999"),
+        (("http://mycompany.example.com/financial", "o:expiration"), "2005-02")
+        ])
     ]
 assert req.fault is None
-print "Method name:", req.methodName
-print "Parameter values:", req.parameterValues
+print "Method name:", req.method.methodName
+print "Parameter values:", req.method.parameterValues
 print "Fault:", req.fault
 
 response = """<?xml version='1.0' encoding='iso-8859-1'?>
@@ -61,11 +67,14 @@
 </env:Envelope>"""
 
 resp = libxml2dom.soap.parseString(response)
-assert resp.methodName == "chargeReservationResponse"
-assert resp.parameterValues == [("code", "FT35ZBQ"), ("viewAt", "http://travelcompany.example.org/reservations?code=FT35ZBQ")]
+assert resp.method.methodName == "chargeReservationResponse"
+assert resp.method.parameterValues == [
+    (("http://travelcompany.example.org/", "m:code"), "FT35ZBQ"),
+    (("http://travelcompany.example.org/", "m:viewAt"), "http://travelcompany.example.org/reservations?code=FT35ZBQ")
+    ]
 assert resp.fault is None
-print "Method name:", resp.methodName
-print "Parameter values:", resp.parameterValues
+print "Method name:", resp.method.methodName
+print "Parameter values:", resp.method.parameterValues
 print "Fault:", resp.fault
 
 response2 = """<?xml version='1.0' encoding='iso-8859-1'?>
@@ -92,14 +101,16 @@
 </env:Envelope>"""
 
 resp2 = libxml2dom.soap.parseString(response2)
-assert resp2.methodName == "chargeReservationResponse"
-assert resp2.parameterValues == [
-    ("result", "m:status"), ("status", "confirmed"), ("code", "FT35ZBQ"),
-    ("viewAt", "http://travelcompany.example.org/reservations?code=FT35ZBQ")
+assert resp2.method.methodName == "chargeReservationResponse"
+assert resp2.method.parameterValues == [
+    (("http://www.w3.org/2003/05/soap-rpc", "rpc:result"), "m:status"),
+    (("http://travelcompany.example.org/", "m:status"), "confirmed"),
+    (("http://travelcompany.example.org/", "m:code"), "FT35ZBQ"),
+    (("http://travelcompany.example.org/", "m:viewAt"), "http://travelcompany.example.org/reservations?code=FT35ZBQ")
     ]
 assert resp2.fault is None
-print "Method name:", resp2.methodName
-print "Parameter values:", resp2.parameterValues
+print "Method name:", resp2.method.methodName
+print "Parameter values:", resp2.method.parameterValues
 print "Fault:", resp2.fault
 
 failed = """<?xml version='1.0' encoding='iso-8859-1'?>
@@ -129,12 +140,9 @@
 </env:Envelope>"""
 
 f = libxml2dom.soap.parseString(failed)
-assert f.methodName is None
-assert f.parameterValues == []
+assert f.method is None
 assert f.fault.code == "env:Sender"
 assert f.fault.subcode == "rpc:BadArguments"
-print "Method name:", f.methodName
-print "Parameter values:", f.parameterValues
 print "Fault code:", f.fault.code
 
 # vim: tabstop=4 expandtab shiftwidth=4
diff -r 20d44607697b -r 62677a2566f0 tests/xmlrpc_test.py
--- a/tests/xmlrpc_test.py	Mon Oct 01 23:27:00 2007 +0000
+++ b/tests/xmlrpc_test.py	Mon Oct 01 23:27:18 2007 +0000
@@ -15,11 +15,11 @@
    </methodCall>"""
 
 req = libxml2dom.xmlrpc.parseString(request)
-assert req.methodName == "examples.getStateName"
-assert req.parameterValues == [41]
+assert req.method.methodName == "examples.getStateName"
+assert req.method.parameterValues == [("i4", "41")]
 assert req.fault is None
-print "Method name:", req.methodName
-print "Parameter values:", req.parameterValues
+print "Method name:", req.method.methodName
+print "Parameter values:", req.method.parameterValues
 print "Fault:", req.fault
 
 response = """<?xml version="1.0"?>
@@ -32,11 +32,11 @@
    </methodResponse>"""
 
 resp = libxml2dom.xmlrpc.parseString(response)
-assert resp.methodName is None
-assert resp.parameterValues == ["South Dakota"]
+assert resp.method.methodName is None
+assert resp.method.parameterValues == [("string", "South Dakota")]
 assert resp.fault is None
-print "Method name:", resp.methodName
-print "Parameter values:", resp.parameterValues
+print "Method name:", resp.method.methodName
+print "Parameter values:", resp.method.parameterValues
 print "Fault:", resp.fault
 
 failed = """<?xml version="1.0"?>
@@ -58,12 +58,12 @@
    </methodResponse>"""
 
 f = libxml2dom.xmlrpc.parseString(failed)
-assert f.methodName is None
-assert f.parameterValues == []
+assert f.method.methodName is None
+assert f.method.parameterValues == []
 assert f.fault.code == "4"
 assert f.fault.reason == "Too many parameters."
-print "Method name:", f.methodName
-print "Parameter values:", f.parameterValues
+print "Method name:", f.method.methodName
+print "Parameter values:", f.method.parameterValues
 print "Fault code:", f.fault.code
 
 # Python Package Index examples.
@@ -95,17 +95,11 @@
 </methodCall>"""
 
 s = libxml2dom.xmlrpc.parseString(search)
-assert s.methodName == "search"
-assert s.parameterValues == [[("name", "libxml2dom"), ("description", "XML")], "and"]
-assert s.parameterItems == [
-    (None, [("name", "libxml2dom"), ("description", "XML")]),
-    (None, "and")
-    ]
+assert s.method.methodName == "search"
+assert s.method.parameterValues == [("struct", [("name", ("string", "libxml2dom")), ("description", ("string", "XML"))]), ("string", "and")]
 assert s.fault is None
-print "Method name:", s.methodName
-print "Parameter values:", s.parameterValues
-print "Parameter items:", s.parameterItems
-print "Parameter map:", s.parameterMap
+print "Method name:", s.method.methodName
+print "Parameter values:", s.method.parameterValues
 print "Fault:", s.fault
 
 # vim: tabstop=4 expandtab shiftwidth=4