summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rwxr-xr-xtest/python/test-client.py106
1 files changed, 76 insertions, 30 deletions
diff --git a/test/python/test-client.py b/test/python/test-client.py
index 51d655db..13cee958 100755
--- a/test/python/test-client.py
+++ b/test/python/test-client.py
@@ -1,6 +1,7 @@
#!/usr/bin/env python
import sys
import os
+import unittest
builddir = os.environ["DBUS_TOP_BUILDDIR"]
pydir = builddir + "/python"
@@ -10,45 +11,90 @@ sys.path.insert(0, pydir + "/.libs")
import dbus
import dbus_bindings
+import gobject
+import dbus.glib
if not dbus.__file__.startswith(pydir):
raise Exception("DBus modules are not being picked up from the package")
-bus = dbus.SessionBus()
-remote_object = bus.get_object("org.freedesktop.DBus.TestSuitePythonService", "/org/freedesktop/DBus/TestSuitePythonObject")
-iface = dbus.Interface(remote_object, "org.freedesktop.DBus.TestSuiteInterface")
-
-try:
- #test dbus_interface parameter
- print remote_object.Echo("dbus_interface test Passed", dbus_interface = "org.freedesktop.DBus.TestSuiteInterface")
+if not dbus_bindings.__file__.startswith(pydir):
+ raise Exception("DBus modules are not being picked up from the package")
- #test introspection
- print "\n********* Introspection Test ************"
- print remote_object.Introspect(dbus_interface="org.freedesktop.DBus.Introspectable")
- print "Introspection test passed"
+class TestDBusBindings(unittest.TestCase):
+ def setUp(self):
+ self.bus = dbus.SessionBus()
+ self.remote_object = self.bus.get_object("org.freedesktop.DBus.TestSuitePythonService", "/org/freedesktop/DBus/TestSuitePythonObject")
+ self.iface = dbus.Interface(self.remote_object, "org.freedesktop.DBus.TestSuiteInterface")
- #test sending python types and getting them back
- print "\n********* Testing Python Types ***********"
- test_vals = [1, 12323231, 3.14159265, 99999999.99,
+ self.test_types_vals = [1, 12323231, 3.14159265, 99999999.99,
"dude", "123", "What is all the fuss about?", "gob@gob.com",
[1,2,3], ["how", "are", "you"], [1.23,2.3], [1], ["Hello"],
(1,2,3), (1,), (1,"2",3), ("2", "what"), ("you", 1.2),
{1:"a", 2:"b"}, {"a":1, "b":2}, {1:1.1, 2:2.2}, {1.1:"a", 1.2:"b"},
[[1,2,3],[2,3,4]], [["a","b"],["c","d"]],
- ([1,2,3],"c", 1.2, ["a","b","c"], {"a": (1,"v"), "b": (2,"d")})]
+ ([1,2,3],"c", 1.2, ["a","b","c"], {"a": (1,"v"), "b": (2,"d")})
+ ]
+
+ def testInterfaceKeyword(self):
+ #test dbus_interface parameter
+ print self.remote_object.Echo("dbus_interface on Proxy test Passed", dbus_interface = "org.freedesktop.DBus.TestSuiteInterface")
+ print self.iface.Echo("dbus_interface on Interface test Passed", dbus_interface = "org.freedesktop.DBus.TestSuiteInterface")
+ self.assert_(True)
+
+ def testIntrospection(self):
+ #test introspection
+ print "\n********* Introspection Test ************"
+ print self.remote_object.Introspect(dbus_interface="org.freedesktop.DBus.Introspectable")
+ print "Introspection test passed"
+ self.assert_(True)
+
+ def testPythonTypes(self):
+ #test sending python types and getting them back
+ print "\n********* Testing Python Types ***********"
- for send_val in test_vals:
- print "Testing %s"% str(send_val)
- recv_val = iface.Echo(send_val)
- #TODO: is this right in python - construct a better comparison
- # method
- if send_val != recv_val:
- raise Exception("Python type tests: %s does not equal %s"%(str(send_val), str(recv_val)))
-
-
-
-except Exception, e:
- print e
- sys.exit(1)
-
-sys.exit(0)
+ for send_val in self.test_types_vals:
+ print "Testing %s"% str(send_val)
+ recv_val = self.iface.Echo(send_val)
+ self.assertEquals(send_val, recv_val)
+
+ def testAsyncCalls(self):
+ #test sending python types and getting them back async
+ print "\n********* Testing Async Calls ***********"
+
+
+ main_loop = gobject.MainLoop()
+ class async_check:
+ def __init__(self, test_controler, expected_result, do_exit):
+ self.expected_result = expected_result
+ self.do_exit = do_exit
+ self.test_controler = test_controler
+
+ def callback(self, val):
+ if self.do_exit:
+ main_loop.quit()
+
+ self.test_controler.assertEquals(val, self.expected_result)
+
+ def error_handler(error):
+ print error
+ if self.do_exit:
+ main_loop.quit()
+
+ self.test_controler.assert_(val, False)
+
+ last_type = self.test_types_vals[-1]
+ for send_val in self.test_types_vals:
+ print "Testing %s"% str(send_val)
+ check = async_check(self, send_val, last_type == send_val)
+ recv_val = self.iface.Echo(send_val,
+ reply_handler = check.callback,
+ error_handler = check.error_handler)
+
+ main_loop.run()
+
+if __name__ == '__main__':
+ gobject.threads_init()
+ dbus.glib.init_threads()
+
+ unittest.main()
+