tizen 2.3.1 release

[framework/connectivity/bluez.git] / test / test-thermometer

diff --git a/test/test-thermometer b/test/test-thermometer
old mode 100644 (file)
new mode 100755 (executable)
index 9216264..7e67c23
--- a/test/test-thermometer
+++ b/test/test-thermometer
@@ -6,19 +6,27 @@ from __future__ import absolute_import, print_function, unicode_literals
 Thermometer test script
 '''
 
-import gobject
-
+from optparse import OptionParser, make_option
 import sys
 import dbus
 import dbus.service
 import dbus.mainloop.glib
-from optparse import OptionParser, make_option
+try:
+  from gi.repository import GObject
+except ImportError:
+  import gobject as GObject
+import bluezutils
+
+BUS_NAME = 'org.bluez'
+THERMOMETER_MANAGER_INTERFACE = 'org.bluez.ThermometerManager1'
+THERMOMETER_WATCHER_INTERFACE = 'org.bluez.ThermometerWatcher1'
+THERMOMETER_INTERFACE = 'org.bluez.Thermometer1'
 
 class Watcher(dbus.service.Object):
-       @dbus.service.method("org.bluez.ThermometerWatcher",
-                                       in_signature="a{sv}", out_signature="")
-       def MeasurementReceived(self, measure):
-               print(measure["Measurement"], " measurement received")
+       @dbus.service.method(THERMOMETER_WATCHER_INTERFACE,
+                                       in_signature="oa{sv}", out_signature="")
+       def MeasurementReceived(self, device, measure):
+               print("%s measurement received from %s" % (measure["Measurement"], device))
                print("Exponent: ", measure["Exponent"])
                print("Mantissa: ", measure["Mantissa"])
                print("Unit: ", measure["Unit"])
@@ -29,18 +37,17 @@ class Watcher(dbus.service.Object):
                if "Type" in measure:
                        print("Type: ", measure["Type"])
 
-def property_changed(name, value):
-
-       print("PropertyChanged('%s', '%s')" % (name, value))
+def properties_changed(interface, changed, invalidated):
+       if interface != THERMOMETER_INTERFACE:
+               return
+       for name, value in changed.iteritems():
+               print("Property %s changed:  %s" % (name, str(value)))
 
 if __name__ == "__main__":
        dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
 
        bus = dbus.SystemBus()
 
-       manager = dbus.Interface(bus.get_object("org.bluez", "/"),
-                                       "org.bluez.Manager")
-
        option_list = [
                make_option("-i", "--adapter", action="store",
                        type="string", dest="adapter"),
@@ -58,34 +65,35 @@ if __name__ == "__main__":
                print("\tEnableIntermediateMeasurement")
                sys.exit(1)
 
-       if options.adapter:
-               adapter_path = manager.FindAdapter(options.adapter)
-       else:
-               adapter_path = manager.DefaultAdapter()
-
-       adapter = dbus.Interface(bus.get_object("org.bluez", adapter_path),
-                                                       "org.bluez.Adapter")
+       managed_objects = bluezutils.get_managed_objects()
+       adapter = bluezutils.find_adapter_in_objects(managed_objects,
+                                                               options.adapter)
+       adapter_path = adapter.object_path
 
-       device_path = adapter.FindDevice(options.address)
+       thermometer_manager = dbus.Interface(bus.get_object(BUS_NAME,
+                               adapter_path), THERMOMETER_MANAGER_INTERFACE)
 
-       bus.add_signal_receiver(property_changed, bus_name="org.bluez",
-                               dbus_interface="org.bluez.Thermometer",
-                               signal_name="PropertyChanged")
+       device = bluezutils.find_device_in_objects(managed_objects,
+                                                               options.address,
+                                                               options.adapter)
+       device_path = device.object_path
 
-       thermometer = dbus.Interface(bus.get_object("org.bluez",
-                                       device_path), "org.bluez.Thermometer")
+       bus.add_signal_receiver(properties_changed, bus_name=BUS_NAME,
+                       path=device_path,
+                       dbus_interface="org.freedesktop.DBus.Properties",
+                       signal_name="PropertiesChanged")
 
        path = "/test/watcher"
        watcher = Watcher(bus, path)
 
-       thermometer.RegisterWatcher(path)
+       thermometer_manager.RegisterWatcher(path)
 
        if len(args) > 0:
                if args[0] == "EnableIntermediateMeasurement":
-                       thermometer.EnableIntermediateMeasurement(path)
+                       thermometer_manager.EnableIntermediateMeasurement(path)
                else:
                        print("unknown command")
                        sys.exit(1)
 
-       mainloop = gobject.MainLoop()
+       mainloop = GObject.MainLoop()
        mainloop.run()