Fix tests

Author: ljbade

python/swiftnav/almanac.pxd

@@ -25,7 +25,7 @@ cdef extern from "libswiftnav/almanac.h":
     gnss_signal_t sid
     gps_time_t toa
     float ura
-    u8 fit_interval
+    u32 fit_interval
     u8 valid
     u8 healthy
     # HACK: Actually an anonymous union in libswiftnat!

python/swiftnav/ephemeris.pxd

@@ -33,7 +33,7 @@ cdef extern from "libswiftnav/ephemeris.h":
     gnss_signal_t sid
     gps_time_t toe
     float ura
-    u8 fit_interval
+    u32 fit_interval
     u8 valid
     u8 healthy
     # HACK: Actually an anonymous union in libswiftnat!
@@ -51,7 +51,7 @@ cdef extern from "libswiftnav/ephemeris.h":
   u8 satellite_healthy(const ephemeris_t *e)
   void decode_ephemeris(u32 frame_words[3][8], ephemeris_t *e)
   u8 ephemeris_equal(const ephemeris_t *a, const ephemeris_t *b)
-  u8 ephemeris_params_valid(const u8 v, const u8 fit_interval,
+  u8 ephemeris_params_valid(const u8 valid, const u32 fit_interval,
                       const gps_time_t* toe, const gps_time_t *t)
 
 

python/swiftnav/ephemeris.pyx

@@ -119,8 +119,8 @@ cdef class Ephemeris:
     return ephemeris_valid(&self._thisptr, &t._thisptr)
 
   @staticmethod
-  def is_params_valid(u8 v, u8 fit_interval, GpsTime toe, GpsTime t):
-    return ephemeris_params_valid(v, fit_interval, &toe._thisptr, &t._thisptr)
+  def is_params_valid(u8 valid, u32 fit_interval, GpsTime toe, GpsTime t):
+    return ephemeris_params_valid(valid, fit_interval, &toe._thisptr, &t._thisptr)
 
   def is_healthy(self):
     return satellite_healthy(&self._thisptr)

python/tests/test_ephemeris.py

@@ -167,29 +167,29 @@ def test_parameters():
   toe = t.GpsTime(**{ 'wn': 1867, 'tow': 518400.0,})
   time = t.GpsTime(**{ 'wn': 1867, 'tow': 518400.0,})
   valid = 1
-  fit_interval = 4
+  fit_interval = 4 * 60 * 60
   assert e.Ephemeris.is_params_valid(valid, fit_interval, toe, time)
 
   toe = t.GpsTime(**{ 'wn': 1867, 'tow': 518400.0,})
   time = t.GpsTime(**{ 'wn': 1867, 'tow': 518400.0,})
   valid = 0
-  fit_interval = 4
+  fit_interval = 4 * 60 * 60
   assert not e.Ephemeris.is_params_valid(valid, fit_interval, toe, time)
 
   toe = t.GpsTime(**{ 'wn': 1867, 'tow': 518400.0,})
   time = t.GpsTime(**{ 'wn': 1867, 'tow': 518400.0,})
   valid = 1
-  fit_interval = 0
+  fit_interval = 0 * 60 * 60
   assert not e.Ephemeris.is_params_valid(valid, fit_interval, toe, time)
 
   toe = t.GpsTime(**{ 'wn': 1867, 'tow': 518400.0,})
   time = t.GpsTime(**{ 'wn': 1867, 'tow': 518400.0 + 3600.0 * 2,})
   valid = 1
-  fit_interval = 4
+  fit_interval = 4 * 60 * 60
   assert e.Ephemeris.is_params_valid(valid, fit_interval, toe, time)
 
   toe = t.GpsTime(**{ 'wn': 1867, 'tow': 518400.0,})
   time = t.GpsTime(**{ 'wn': 1867, 'tow': 518400.0 + 3600.0 * 3 ,})
   valid = 1
-  fit_interval = 4
+  fit_interval = 4 * 60 * 60
   assert not e.Ephemeris.is_params_valid(valid, fit_interval, toe, time)