Merge lp:~thomas-voss/location-service/fix-1584860 into lp:location-service/trunk

[Thomas Voß]

Fix #1584860. The NM update altered the type of LastSeen to int32.

Fix #1584860. The NM update altered the type of LastSeen to int32.

[Scott Sweeny (ssweeny)]

LGTM

review: Approve

[lp:~thomas-voss/location-service/fix-1584860]

249. By Thomas Voß on 2016-05-24

Add missing include <random>.

250. By Thomas Voß on 2016-05-24

Add another missing include for <random>.

251. By Thomas Voß on 2016-05-24

And another missing include <random>.

252. By Thomas Voß on 2016-05-24

Make json value extraction more robust.
Adjust timing logic in test case.

=== modified file 'src/location_service/com/ubuntu/location/connectivity/nm.h'
--- src/location_service/com/ubuntu/location/connectivity/nm.h	2015-02-26 10:59:22 +0000
+++ src/location_service/com/ubuntu/location/connectivity/nm.h	2016-05-24 09:44:32 +0000
@@ -68,7 +68,7 @@
             }
 
             typedef AccessPoint Interface;
-            typedef std::uint32_t ValueType;
+            typedef std::int32_t ValueType;
             static const bool readable = true;
             static const bool writable = false;
         };
 
=== modified file 'src/location_service/com/ubuntu/location/providers/gps/net_cpp_gps_xtra_downloader.h'
--- src/location_service/com/ubuntu/location/providers/gps/net_cpp_gps_xtra_downloader.h	2014-06-23 07:47:27 +0000
+++ src/location_service/com/ubuntu/location/providers/gps/net_cpp_gps_xtra_downloader.h	2016-05-24 09:44:32 +0000
@@ -24,6 +24,8 @@
 #include <core/net/http/request.h>
 #include <core/net/http/response.h>
 
+#include <random>
+
 namespace com { namespace ubuntu { namespace location { namespace providers { namespace gps { namespace android {
 struct NetCppGpsXtraDownloader : public GpsXtraDownloader
 {
 
=== modified file 'src/location_service/com/ubuntu/location/service/ichnaea_reporter.cpp'
--- src/location_service/com/ubuntu/location/service/ichnaea_reporter.cpp	2014-08-14 20:31:09 +0000
+++ src/location_service/com/ubuntu/location/service/ichnaea_reporter.cpp	2016-05-24 09:44:32 +0000
@@ -122,8 +122,12 @@
 
 double Object::to_double() const
 {
-    throw_if_type_mismatch<json_type_double>(object);
-    return json_object_get_double(object);
+    if (json_object_is_type(object, json_type_double))
+        return json_object_get_double(object);
+    if (json_object_is_type(object, json_type_int))
+        return json_object_get_int(object);
+
+    throw std::logic_error{"Type mismatch"};
 }
 
 std::string Object::to_string() const
 
=== modified file 'tests/acceptance_tests.cpp'
--- tests/acceptance_tests.cpp	2016-03-11 13:51:03 +0000
+++ tests/acceptance_tests.cpp	2016-05-24 09:44:32 +0000
@@ -56,6 +56,7 @@
 #include <chrono>
 #include <iostream>
 #include <memory>
+#include <random>
 #include <set>
 #include <stdexcept>
 
 
=== modified file 'tests/ichnaea_reporter_test.cpp'
--- tests/ichnaea_reporter_test.cpp	2014-07-15 22:34:40 +0000
+++ tests/ichnaea_reporter_test.cpp	2016-05-24 09:44:32 +0000
@@ -190,7 +190,7 @@
                         item.get(Reporter::Json::lon).to_double());
 
             auto wifis = item.get(Reporter::Json::wifi);
-            EXPECT_EQ(1u, wifis.array_size());
+            EXPECT_EQ(1u, wifis.array_size());            
 
             auto wifi = wifis.get_object_for_index(0);
             EXPECT_EQ(ref_bssid.get(), wifi.get(Reporter::Json::Wifi::key).to_string());
@@ -213,7 +213,7 @@
 
     core::posix::ChildProcess server = core::posix::fork(
                 std::bind(testing::a_web_server(web_server_configuration), cps),
-                core::posix::StandardStream::empty);
+                core::posix::StandardStream::empty);    
 
     using namespace ::testing;
 
@@ -225,6 +225,8 @@
     ON_CALL(*wireless_network, frequency()).WillByDefault(ReturnRef(ref_frequency));
     ON_CALL(*wireless_network, signal_strength()).WillByDefault(ReturnRef(ref_strength));
 
+    cps.wait_for_signal_ready_for(std::chrono::seconds{2});
+
     location::service::ichnaea::Reporter::Configuration config
     {
         "http://127.0.0.1:5000",
@@ -237,7 +239,7 @@
     reporter.start();
     reporter.report(reference_position_update, {wireless_network}, {ref_cell});
 
-    cps.wait_for_signal_ready_for(std::chrono::seconds{2});
+    std::this_thread::sleep_for(std::chrono::milliseconds{500});
 
     server.send_signal_or_throw(core::posix::Signal::sig_term);
     auto result = server.wait_for(core::posix::wait::Flags::untraced);
 
=== modified file 'tests/wgs84_test.cpp'
--- tests/wgs84_test.cpp	2013-12-10 09:42:54 +0000
+++ tests/wgs84_test.cpp	2016-05-24 09:44:32 +0000
@@ -23,6 +23,8 @@
 
 #include <gtest/gtest.h>
 
+#include <random>
+
 TEST(Latitude, constructing_a_latitude_with_invalid_value_throws)
 {
     static const double min_value = com::ubuntu::location::wgs84::CoordinateTraits<com::ubuntu::location::wgs84::Latitude>::min();