GT-3032: adapt python test scripts to changed DBus API

3 files changed, 53 insertions, 48 deletions

diff --git a/enhanced-position-service/src/enhanced-position.cpp b/enhanced-position-service/src/enhanced-position.cpp
index fcf453c..3c6cce7 100644
--- a/enhanced-position-service/src/enhanced-position.cpp
+++ b/enhanced-position-service/src/enhanced-position.cpp
@@ -106,10 +106,12 @@ void EnhancedPosition::GetPositionInfo(const uint64_t& valuesToReturn, uint64_t&
     isCourseRequested = true;
   }
 
-
-  if(isPosRequested)
+  if(gnssGetPosition(&position))
   {
-    if(gnssGetPosition(&position))
+
+    timestamp = position.timestamp;
+
+    if(isPosRequested)
     {
       if (position.validityBits & GNSS_POSITION_LATITUDE_VALID)
       {
@@ -126,11 +128,8 @@ void EnhancedPosition::GetPositionInfo(const uint64_t& valuesToReturn, uint64_t&
         data[POS_ALTITUDE] = variant_double(position.altitudeMSL);
       }
     }
-  }
 
-  if(isCourseRequested)
-  {
-    if(gnssGetPosition(&position))
+    if(isCourseRequested)
     {
       if (position.validityBits & GNSS_POSITION_HEADING_VALID)
       {
diff --git a/enhanced-position-service/test/test-scripts/test-enhanced-position-service-tk-gui.py b/enhanced-position-service/test/test-scripts/test-enhanced-position-service-tk-gui.py
index 2265e18..6ef7fc0 100644
--- a/enhanced-position-service/test/test-scripts/test-enhanced-position-service-tk-gui.py
+++ b/enhanced-position-service/test/test-scripts/test-enhanced-position-service-tk-gui.py
@@ -57,12 +57,12 @@ import Queue
 from Tkinter import *
 
 #constants as defined in the Positioning API
-LATITUDE = 0x0020
-LONGITUDE = 0x0021
-ALTITUDE = 0x0022
-CLIMB = 0x0032
-SPEED = 0x0031
-HEADING = 0x0030
+LATITUDE  = 0x00000001
+LONGITUDE = 0x00000002
+ALTITUDE  = 0x00000004
+CLIMB     = 0x00000020
+SPEED     = 0x00000010
+HEADING   = 0x00000008
 
 if __name__ == '__main__':
 #According http://dbus.freedesktop.org/doc/dbus-python/doc/tutorial.html#setting-up-an-event-loop
@@ -96,20 +96,23 @@ def signalPositionUpdate(event):
     #print("signalPositionUpdate Event received by GUI thread")
     changedValues = commQueue.get()
     #print changedValues
-    position = enhanced_position_interface.GetPosition(changedValues)
-    for val in changedValues:
-        if val == LATITUDE:
-            labelLat.config(text='LATITUDE:' + str(position[dbus.UInt16(val)]))
-        if val == LONGITUDE:
-            labelLon.config(text='LONGITUDE:' + str(position[dbus.UInt16(val)]))   
-        if val == ALTITUDE:
-            labelAlt.config(text='ALTITUDE:' + str(position[dbus.UInt16(val)]))
-        if val == CLIMB:
-            labelClimb.config(text='CLIMB:' + str(position[dbus.UInt16(val)]))
-        if val == SPEED:
-            labelSpeed.config(text='SPEED:' + str(position[dbus.UInt16(val)]))
-        if val == HEADING:
-            labelHeading.config(text='HEADING:' + str(position[dbus.UInt16(val)]))
+    position = enhanced_position_interface.GetPositionInfo(changedValues)
+    timestamp = position[0]
+    #print 'TIMESTAMP:' +str(timestamp)
+    data = position[1]
+    for key in data:
+        if key == LATITUDE:
+            labelLat.config(text='LATITUDE:' + str(data[dbus.UInt16(key)]))
+        if key == LONGITUDE:
+            labelLon.config(text='LONGITUDE:' + str(data[dbus.UInt16(key)]))
+        if key == ALTITUDE:
+            labelAlt.config(text='ALTITUDE:' + str(data[dbus.UInt16(key)]))
+        if key == CLIMB:
+            labelClimb.config(text='CLIMB:' + str(data[dbus.UInt16(key)]))
+        if key == SPEED:
+            labelSpeed.config(text='SPEED:' + str(data[dbus.UInt16(key)]))
+        if key == HEADING:
+            labelHeading.config(text='HEADING:' + str(data[dbus.UInt16(key)]))
     #It's important to call update_idletasks() to update the GUI
     tk_root.update_idletasks()
 
diff --git a/enhanced-position-service/test/test-scripts/test-enhanced-position-service.py b/enhanced-position-service/test/test-scripts/test-enhanced-position-service.py
index 9ae6f72..ee784aa 100755
--- a/enhanced-position-service/test/test-scripts/test-enhanced-position-service.py
+++ b/enhanced-position-service/test/test-scripts/test-enhanced-position-service.py
@@ -31,12 +31,12 @@ import gobject
 import dbus.mainloop.glib
 
 #constants as defined in the Positioning API
-LATITUDE = 0x0020
-LONGITUDE = 0x0021
-ALTITUDE = 0x0022
-CLIMB = 0x0032
-SPEED = 0x0031
-HEADING = 0x0030
+LATITUDE  = 0x00000001
+LONGITUDE = 0x00000002
+ALTITUDE  = 0x00000004
+CLIMB     = 0x00000020
+SPEED     = 0x00000010
+HEADING   = 0x00000008
 
 print '\n--------------------------'
 print 'Positioning Test'
@@ -51,21 +51,24 @@ bus = dbus.SessionBus()
 #signal receiver
 def catchall_positioning_signals_handler(changedValues):
     print 'PositonUpdate'
-    changedfields = dbus.Array(signature='q')
-    position = enhanced_position_interface.GetPosition(changedValues)
-    for val in changedValues:
-        if val == LATITUDE:
-            print 'LATITUDE:' + str(position[dbus.UInt16(val)])
-        if val == LONGITUDE:
-            print 'LONGITUDE:' + str(position[dbus.UInt16(val)])    
-        if val == ALTITUDE:
-            print 'ALTITUDE:' + str(position[dbus.UInt16(val)])
-        if val == CLIMB:
-            print 'CLIMB:' + str(position[dbus.UInt16(val)])
-        if val == SPEED:
-            print 'SPEED:' + str(position[dbus.UInt16(val)])    
-        if val == HEADING:
-            print 'HEADING:' + str(position[dbus.UInt16(val)])
+    position = enhanced_position_interface.GetPositionInfo(changedValues)
+    timestamp = position[0]
+    print 'TIMESTAMP:' +str(timestamp)
+    data = position[1]
+    #print(data)
+    for key in data:
+        if key == LATITUDE:
+            print 'LATITUDE:' + str(data[dbus.UInt64(key)])
+        if key == LONGITUDE:
+            print 'LONGITUDE:' + str(data[dbus.UInt64(key)])
+        if key == ALTITUDE:
+            print 'ALTITUDE:' + str(data[dbus.UInt64(key)])
+        if key == CLIMB:
+            print 'CLIMB:' + str(data[dbus.UInt64(key)])
+        if key == SPEED:
+            print 'SPEED:' + str(data[dbus.UInt64(key)])
+        if key == HEADING:
+            print 'HEADING:' + str(data[dbus.UInt64(key)])
 
 #add signal receiver
 bus.add_signal_receiver(catchall_positioning_signals_handler, \