Merge lp:~mandel/location-service/espoo-provider into lp:location-service/trunk

[Manuel de la Peña]

Add a new provider that uses the espoo project.

Add a new provided that will use the espoo service. The espoo service provides position updates via dbus signals.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:98
http://jenkins.qa.ubuntu.com/job/location-service-ci/265/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-utopic-amd64-ci/172
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-utopic-armhf-ci/172
        deb: http://jenkins.qa.ubuntu.com/job/location-service-utopic-armhf-ci/172/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-utopic-i386-ci/172

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/location-service-ci/265/rebuild

review: Approve (continuous-integration)

[Thomas Voß (thomas-voss)]

Thanks for the changes. I added some niggles inline. However, the most important bit is the lack of tests being associated to this MP. I would expect at least a setup with a mocked remote provider that the location service with an instance of the espoo provider connects to.

One other thing: I don't think espoo is the correct name for the provider going forward and I would propose renaming it to something like Remote- or OutOfProcessProvider.

review: Needs Fixing

[lp:~mandel/location-service/espoo-provider]

99. By Manuel de la Peña on 2014-08-22

Clean up code to make it more generic.

100. By Manuel de la Peña on 2014-08-26

Added extra tests and remove as much metions as possible of the espoo project. More will come once the espoo project is updated.

[Ricardo Mendoza (ricmm)]

Typo in method definition

[lp:~mandel/location-service/espoo-provider]

101. By Manuel de la Peña on 2014-08-26

Remove small typo.

[lp:~mandel/location-service/espoo-provider]

102. By Manuel de la Peña on 2014-08-26

Use the correct author.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:100
http://jenkins.qa.ubuntu.com/job/location-service-ci/267/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-utopic-amd64-ci/174/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-utopic-armhf-ci/174/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-utopic-i386-ci/174/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/location-service-ci/267/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:102
http://jenkins.qa.ubuntu.com/job/location-service-ci/268/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-utopic-amd64-ci/175/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-utopic-armhf-ci/175/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-utopic-i386-ci/175/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/location-service-ci/268/rebuild

review: Needs Fixing (continuous-integration)

[Thomas Voß (thomas-voss)]

Minor niggles, and a big reminder in the very end.

review: Needs Fixing

[lp:~mandel/location-service/espoo-provider]

103. By Manuel de la Peña on 2014-08-26

Make method public and then remove the need of the helper DummyProvider class.

104. By Manuel de la Peña on 2014-08-26

Changes according to the peer review.

105. By Manuel de la Peña on 2014-08-26

Changes aggording to peer review.

106. By Manuel de la Peña on 2014-08-26

Merged with trunk.

107. By Manuel de la Peña on 2014-08-26

Do not use dbus-test-runner.

[Thomas Voß (thomas-voss)]

LGTM, but let's wait for Jenkins until we top-approve.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:103
http://jenkins.qa.ubuntu.com/job/location-service-ci/269/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-utopic-amd64-ci/176
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-utopic-armhf-ci/176/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-utopic-i386-ci/176

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/location-service-ci/269/rebuild

review: Needs Fixing (continuous-integration)

[Thomas Voß (thomas-voss)]

The Jenkins test failure on armhf is a flaky one. Both amd64 and i386 pass cleanly.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:107
http://jenkins.qa.ubuntu.com/job/location-service-ci/270/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-utopic-amd64-ci/177
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-utopic-armhf-ci/177
        deb: http://jenkins.qa.ubuntu.com/job/location-service-utopic-armhf-ci/177/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-utopic-i386-ci/177

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/location-service-ci/270/rebuild

review: Approve (continuous-integration)

=== modified file 'data/ubuntu-location-service.conf.in'
--- data/ubuntu-location-service.conf.in	2013-10-15 16:02:00 +0000
+++ data/ubuntu-location-service.conf.in	2014-08-26 16:04:21 +0000
@@ -4,4 +4,4 @@
 
 respawn
 
-exec /usr/bin/ubuntu-location-serviced --bus system --provider gps::Provider
+exec /usr/bin/ubuntu-location-serviced --bus system --provider gps::Provider --provider remote::Provider  --remote::Provider::name="com.ubuntu.espoo.Service.Provider" --remote::Provider::path="/com/ubuntu/espoo/Service/Provider"

=== modified file 'debian/changelog'
--- debian/changelog	2014-08-25 09:14:46 +0000
+++ debian/changelog	2014-08-26 16:04:21 +0000
@@ -1,3 +1,9 @@
+location-service (2.1) UNRELEASED; urgency=medium
+
+  * Add a new provider for the remote project.
+
+ -- Manuel de la Pena <[e-mail]>  Tue, 19 Aug 2014 11:54:49 +0000
+
 location-service (2.0.1+14.10.20140825-0ubuntu1) utopic; urgency=low
 
   [ thomas-voss ]

=== modified file 'src/location_service/com/ubuntu/location/providers/CMakeLists.txt'
--- src/location_service/com/ubuntu/location/providers/CMakeLists.txt	2014-02-07 17:16:49 +0000
+++ src/location_service/com/ubuntu/location/providers/CMakeLists.txt	2014-08-26 16:04:21 +0000
@@ -1,4 +1,5 @@
 add_subdirectory(dummy)
+add_subdirectory(remote)
 add_subdirectory(geoclue)
 add_subdirectory(gps)
 add_subdirectory(skyhook)

=== modified file 'src/location_service/com/ubuntu/location/providers/config.cpp'
--- src/location_service/com/ubuntu/location/providers/config.cpp	2014-05-19 09:55:25 +0000
+++ src/location_service/com/ubuntu/location/providers/config.cpp	2014-08-26 16:04:21 +0000
@@ -68,3 +68,11 @@
 };
 #endif // COM_UBUNTU_LOCATION_SERVICE_PROVIDERS_SKYHOOK
 
+#if defined(COM_UBUNTU_LOCATION_SERVICE_PROVIDERS_REMOTE)
+#include <com/ubuntu/location/providers/remote/provider.h>
+static FactoryInjector remote_injector
+{
+    "remote::Provider", 
+    com::ubuntu::location::providers::remote::Provider::create_instance
+};
+#endif // COM_UBUNTU_LOCATION_SERVICE_PROVIDERS_REMOTE

=== modified file 'src/location_service/com/ubuntu/location/providers/geoclue/CMakeLists.txt'
--- src/location_service/com/ubuntu/location/providers/geoclue/CMakeLists.txt	2014-01-20 13:03:19 +0000
+++ src/location_service/com/ubuntu/location/providers/geoclue/CMakeLists.txt	2014-08-26 16:04:21 +0000
@@ -9,10 +9,10 @@
   message(STATUS "Enabling support for Geoclue location providers")
 
   add_library(geoclue provider.cpp)
-  
+
   set(
     ENABLED_PROVIDER_TARGETS
-    ${ENABLED_PROVIDER_TARGETS} geoclue    
+    ${ENABLED_PROVIDER_TARGETS} geoclue
     PARENT_SCOPE
   )
 

=== added directory 'src/location_service/com/ubuntu/location/providers/remote'
=== added file 'src/location_service/com/ubuntu/location/providers/remote/CMakeLists.txt'
--- src/location_service/com/ubuntu/location/providers/remote/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/location_service/com/ubuntu/location/providers/remote/CMakeLists.txt	2014-08-26 16:04:21 +0000
@@ -0,0 +1,37 @@
+option(
+    LOCATION_SERVICE_ENABLE_REMOTE_PROVIDER
+    "Enable location provider relying on the remote provider SDK"
+    ON
+)
+
+if (LOCATION_SERVICE_ENABLE_REMOTE_PROVIDER)
+
+    message(STATUS "Enabling support for the remote location providers")
+
+    set(REMOTE_SOURCES
+    	provider.cpp
+    )
+
+    set(REMOTE_HEADERS
+    	remote_interface.h
+    	provider.h
+    )
+
+    add_library(remote
+    	${REMOTE_HEADERS}
+    	${REMOTE_SOURCES}
+    )
+
+    set(
+            ENABLED_PROVIDER_TARGETS
+            ${ENABLED_PROVIDER_TARGETS} remote
+            PARENT_SCOPE
+    )
+
+   set(
+            ENABLED_PROVIDER_TARGETS_DEFINITIONS
+            -DCOM_UBUNTU_LOCATION_SERVICE_PROVIDERS_REMOTE ${ENABLED_PROVIDER_TARGETS_DEFINITIONS}
+            PARENT_SCOPE
+   )
+
+endif (LOCATION_SERVICE_ENABLE_REMOTE_PROVIDER)

=== added file 'src/location_service/com/ubuntu/location/providers/remote/provider.cpp'
--- src/location_service/com/ubuntu/location/providers/remote/provider.cpp	1970-01-01 00:00:00 +0000
+++ src/location_service/com/ubuntu/location/providers/remote/provider.cpp	2014-08-26 16:04:21 +0000
@@ -0,0 +1,159 @@
+/*
+ * Copyright © 2012-2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Manuel de la Peña <[e-mail]>
+ */
+#include <com/ubuntu/location/providers/remote/provider.h>
+
+#include <com/ubuntu/location/logging.h>
+
+#include <core/dbus/object.h>
+#include <core/dbus/signal.h>
+#include <core/dbus/asio/executor.h>
+
+#include <thread>
+
+namespace cul = com::ubuntu::location;
+namespace culpr = com::ubuntu::location::providers::remote;
+
+namespace dbus = core::dbus;
+
+namespace
+{
+dbus::Bus::Ptr the_system_bus()
+{
+    dbus::Bus::Ptr system_bus = std::make_shared<dbus::Bus>(dbus::WellKnownBus::system);
+    system_bus->install_executor(core::dbus::asio::make_executor(system_bus));
+    return system_bus;
+}
+}
+
+struct culpr::Provider::Private
+{
+    typedef core::dbus::Signal<
+        com::ubuntu::remote::RemoteInterface::Signals::PositionChanged,
+	com::ubuntu::remote::RemoteInterface::Signals::PositionChanged::ArgumentType
+    > PositionChanged;
+
+    Private(const culpr::Provider::Configuration& config)
+            : bus(config.connection),
+              service(dbus::Service::use_service(bus, config.name)),
+              object(service->object_for_path(config.path)),
+              signal_position_changed(object->get_signal<com::ubuntu::remote::RemoteInterface::Signals::PositionChanged>())
+    {
+    }
+
+    void start()
+    {
+        VLOG(10) << __PRETTY_FUNCTION__;
+        if (!worker.joinable())
+            worker = std::move(std::thread{std::bind(&dbus::Bus::run, bus)});
+    }
+
+    void stop()
+    {
+        VLOG(10) << __PRETTY_FUNCTION__;
+        try
+        {
+            bus->stop();
+        }
+        catch(...)
+        {
+            // can happen if the start method was not called
+            VLOG(10) << "Stopping not started remote provider.";
+        }
+
+        if (worker.joinable())
+            worker.join();
+    }
+
+    dbus::Bus::Ptr bus;
+    dbus::Service::Ptr service;
+    dbus::Object::Ptr object;
+    PositionChanged::Ptr signal_position_changed;
+    PositionChanged::SubscriptionToken position_updates_connection;
+
+    std::thread worker;
+};
+
+std::string culpr::Provider::class_name()
+{
+    return "remote::Provider";
+}
+
+cul::Provider::Ptr culpr::Provider::create_instance(const cul::ProviderFactory::Configuration& config)
+{
+    culpr::Provider::Configuration pConfig;
+    pConfig.name = config.count(Configuration::key_name()) > 0 ? config.get<std::string>(Configuration::key_name()) : throw std::runtime_error("Missing bus-name");
+    pConfig.path = config.count(Configuration::key_path()) > 0 ? config.get<std::string>(Configuration::key_path()) : throw std::runtime_error("Missing bus-path");
+
+    pConfig.connection = the_system_bus();
+
+    return cul::Provider::Ptr{new culpr::Provider{pConfig}};
+}
+
+culpr::Provider::Provider(const culpr::Provider::Configuration& config)
+        : com::ubuntu::location::Provider(config.features, config.requirements),
+          d(new Private(config))
+{
+    d->position_updates_connection =
+        d->signal_position_changed->connect(
+            [this](const com::ubuntu::remote::RemoteInterface::Signals::PositionChanged::ArgumentType& arg)
+            {
+                this->on_position_changed(arg);
+            });
+}
+
+culpr::Provider::~Provider() noexcept
+{
+    d->stop();
+}
+
+void culpr::Provider::on_position_changed(const com::ubuntu::remote::RemoteInterface::Signals::PositionChanged::ArgumentType& arg)
+{
+    auto longitude = std::get<0>(arg);
+    auto latitude = std::get<1>(arg);
+    auto altitude = std::get<2>(arg);
+    VLOG(10) << "New update received with longitude: " << longitude
+        << "latitude: " << latitude << "altitude: " << altitude;
+
+    cul::Position pos
+    {
+        cul::wgs84::Latitude{latitude* cul::units::Degrees},
+        cul::wgs84::Longitude{longitude* cul::units::Degrees}
+    };
+
+    pos.altitude = cul::wgs84::Altitude{altitude* cul::units::Meters};
+    cul::Update<cul::Position> update(pos);
+    VLOG(10) << "Position updated added";
+    mutable_updates().position(update);
+}
+
+bool culpr::Provider::matches_criteria(const cul::Criteria&)
+{
+    return true;
+}
+
+void culpr::Provider::start_position_updates()
+{
+    VLOG(10) << "Starting remote provider\n";
+    d->start();
+}
+
+void culpr::Provider::stop_position_updates()
+{
+    VLOG(10) << "Stopping remote provider\n";
+    d->stop();
+}

=== added file 'src/location_service/com/ubuntu/location/providers/remote/provider.h'
--- src/location_service/com/ubuntu/location/providers/remote/provider.h	1970-01-01 00:00:00 +0000
+++ src/location_service/com/ubuntu/location/providers/remote/provider.h	2014-08-26 16:04:21 +0000
@@ -0,0 +1,84 @@
+/*
+ * Copyright © 2012-2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Manuel de la Peña <[e-mail]>
+ */
+#ifndef LOCATION_SERVICE_COM_UBUNTU_LOCATION_PROVIDERS_ESPOO_PROVIDER_H_
+#define LOCATION_SERVICE_COM_UBUNTU_LOCATION_PROVIDERS_ESPOO_PROVIDER_H_
+
+#include <com/ubuntu/location/provider.h>
+#include <com/ubuntu/location/provider_factory.h>
+#include <com/ubuntu/location/providers/remote/remote_interface.h>
+
+#include <core/dbus/bus.h>
+
+namespace com
+{
+namespace ubuntu
+{
+namespace location
+{
+namespace providers
+{
+namespace remote
+{
+
+class Provider : public com::ubuntu::location::Provider
+{
+  public:
+    // For integration with the Provider factory.
+    static std::string class_name();
+
+    // Instantiates a new provider instance, populating the configuration object
+    // from the provided property bundle.
+    static Provider::Ptr create_instance(const ProviderFactory::Configuration&);
+
+    // structure that represents the configuration used in the remote provider
+    struct Configuration
+    {
+        static std::string key_name() { return "name"; }
+        static std::string key_path() { return "path"; }
+
+        std::string name;
+        std::string path;
+
+        core::dbus::Bus::Ptr connection;
+
+        Provider::Features features = Provider::Features::position;
+        Provider::Requirements requirements = Provider::Requirements::cell_network |
+            Provider::Requirements::data_network | Provider::Requirements::monetary_spending;
+    };
+
+    Provider(const Configuration& config);
+    ~Provider() noexcept;
+
+    virtual bool matches_criteria(const Criteria&);
+
+    virtual void start_position_updates();
+    virtual void stop_position_updates();
+
+    void on_position_changed(const com::ubuntu::remote::RemoteInterface::Signals::PositionChanged::ArgumentType& arg);
+
+  private:
+    struct Private;
+    std::unique_ptr<Private> d;
+};
+
+}  // remote
+}  // providers
+}  // location
+}  // ubuntu
+}  // com
+#endif // LOCATION_SERVICE_COM_UBUNTU_LOCATION_PROVIDERS_GEOCLUE_PROVIDER_H_

=== added file 'src/location_service/com/ubuntu/location/providers/remote/remote_interface.h'
--- src/location_service/com/ubuntu/location/providers/remote/remote_interface.h	1970-01-01 00:00:00 +0000
+++ src/location_service/com/ubuntu/location/providers/remote/remote_interface.h	2014-08-26 16:04:21 +0000
@@ -0,0 +1,108 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Manuel de la Pena <[e-mail]>
+ */
+
+#ifndef CORE_UBUNTU_ESPOO_PROVIDER_P_H_
+#define CORE_UBUNTU_ESPOO_PROVIDER_P_H_
+
+#include <core/dbus/macros.h>
+#include <core/dbus/traits/service.h>
+
+namespace com
+{
+namespace ubuntu
+{
+namespace remote
+{
+struct RemoteInterface
+{
+
+    static const std::string& name()
+    {
+        static const std::string s{"com.ubuntu.remote.Service.Provider"};
+        return s;
+    }
+
+    DBUS_CPP_METHOD_DEF(StartPositionUpdates, RemoteInterface)
+    DBUS_CPP_METHOD_DEF(StopPositionUpdates, RemoteInterface)
+    DBUS_CPP_METHOD_DEF(StartHeadingUpdates, RemoteInterface)
+    DBUS_CPP_METHOD_DEF(StopHeadingUpdates, RemoteInterface)
+    DBUS_CPP_METHOD_DEF(StartVelocityUpdates, RemoteInterface)
+    DBUS_CPP_METHOD_DEF(StopVelocityUpdates, RemoteInterface)
+
+    struct Signals
+    {
+        struct PositionChanged
+        {
+            inline static std::string name()
+            {
+                return "PositionChanged";
+            };
+            typedef RemoteInterface Interface;
+            typedef std::tuple<double, double, double, double, uint32_t> ArgumentType;
+        };
+
+        DBUS_CPP_SIGNAL_DEF(HeadingChanged, RemoteInterface, double)
+        DBUS_CPP_SIGNAL_DEF(VelocityChanged, RemoteInterface, double)
+    };
+
+    struct Properties
+    {
+        DBUS_CPP_READABLE_PROPERTY_DEF(HasPosition, RemoteInterface, bool)
+        DBUS_CPP_READABLE_PROPERTY_DEF(HasVelocity, RemoteInterface, bool)
+        DBUS_CPP_READABLE_PROPERTY_DEF(HasHeading, RemoteInterface, bool)
+        DBUS_CPP_READABLE_PROPERTY_DEF(RequiresSatellites, RemoteInterface, bool)
+        DBUS_CPP_READABLE_PROPERTY_DEF(RequiresCellNetwork, RemoteInterface, bool)
+        DBUS_CPP_READABLE_PROPERTY_DEF(RequiresDataNetwork, RemoteInterface, bool)
+        DBUS_CPP_READABLE_PROPERTY_DEF(RequiresMonetarySpending, RemoteInterface, bool)
+        DBUS_CPP_READABLE_PROPERTY_DEF(ArePositionUpdatesRunning, RemoteInterface, bool)
+        DBUS_CPP_READABLE_PROPERTY_DEF(AreHeadingUpdatesRunning, RemoteInterface, bool)
+        DBUS_CPP_READABLE_PROPERTY_DEF(AreVelocityUpdatesRunning, RemoteInterface, bool)
+    };
+
+};
+} // remote
+} // ubuntu
+}  // core
+
+namespace core
+{
+namespace dbus
+{
+namespace traits
+{
+template<>
+struct Service<com::ubuntu::remote::RemoteInterface>
+{
+    static const std::string& interface_name()
+    {
+        static const std::string s{"com.ubuntu.espoo.Service.Provider"};
+        return s;
+    }
+
+    inline static const std::string& object_path()
+    {
+        static const std::string s{"/com/ubuntu/espoo/Service/Provider"};
+        return s;
+    }
+
+};
+}
+}
+}
+
+#endif

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2014-08-13 13:08:22 +0000
+++ tests/CMakeLists.txt	2014-08-26 16:04:21 +0000
@@ -116,3 +116,24 @@
     add_test(geoclue_provider_test ${CMAKE_CURRENT_BINARY_DIR}/geoclue_provider_test)
   endif (LOCATION_SERVICE_ENABLE_DBUS_TEST_RUNNER)
 endif (LOCATION_SERVICE_ENABLE_GEOCLUE_PROVIDERS)
+
+if (LOCATION_SERVICE_ENABLE_REMOTE_PROVIDER)
+  add_executable(remote_provider_test remote_provider_test.cpp)
+  target_link_libraries(
+    remote_provider_test
+    
+    ubuntu-location-service
+
+    ${CMAKE_THREAD_LIBS_INIT}
+    ${Boost_LIBRARIES}
+    ${PROCESS_CPP_LIBRARIES}
+    ${ARGN}
+
+    gmock
+
+    gtest
+    gtest_main
+  )
+
+    add_test(remote_provider_test ${CMAKE_CURRENT_BINARY_DIR}/remote_provider_test)
+endif (LOCATION_SERVICE_ENABLE_REMOTE_PROVIDER)

=== added file 'tests/remote_provider_test.cpp'
--- tests/remote_provider_test.cpp	1970-01-01 00:00:00 +0000
+++ tests/remote_provider_test.cpp	2014-08-26 16:04:21 +0000
@@ -0,0 +1,99 @@
+/*
+ * Copyright © 2012-2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Manuel de la Peña <[e-mail]>
+ */
+
+#include <com/ubuntu/location/provider.h>
+#include <com/ubuntu/location/proxy_provider.h>
+#include <com/ubuntu/location/providers/remote/provider.h>
+
+#include <core/dbus/fixture.h>
+
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+namespace cul = com::ubuntu::location;
+namespace remote = com::ubuntu::location::providers::remote;
+
+using namespace ::testing;
+
+
+MATCHER_P(postion_equals_tuple, value, "Returns if the string maps are equal.") {
+    auto pos = arg.value;
+
+    // convert the tuple to the correct units
+    cul::wgs84::Longitude longitude {std::get<0>(value)* cul::units::Degrees};
+    cul::wgs84::Latitude latitude {std::get<1>(value)* cul::units::Degrees};
+    cul::wgs84::Altitude altitude {std::get<2>(value)* cul::units::Meters};
+
+    return longitude == pos.longitude && latitude == pos.latitude && altitude == pos.altitude;
+}
+
+namespace
+{
+struct RemoteProvider : public core::dbus::testing::Fixture
+{
+
+};
+
+class MockEventConsumer
+{
+ public:
+    MockEventConsumer() {}
+
+    MOCK_METHOD1(on_new_position, void(const cul::Update<cul::Position>&));
+};
+}
+TEST_F(RemoteProvider, matches_criteria)
+{
+    auto conf = remote::Provider::Configuration{};
+    conf.name = "com.ubuntu.espoo.Service.Provider";
+    conf.path = "/com/ubuntu/espoo/Service/Provider";
+    conf.connection = session_bus();
+    remote::Provider provider(conf);
+
+    EXPECT_FALSE(provider.requires(com::ubuntu::location::Provider::Requirements::satellites));
+    EXPECT_TRUE(provider.requires(com::ubuntu::location::Provider::Requirements::cell_network));
+    EXPECT_TRUE(provider.requires(com::ubuntu::location::Provider::Requirements::data_network));
+    EXPECT_TRUE(provider.requires(com::ubuntu::location::Provider::Requirements::monetary_spending));
+}
+
+TEST_F(RemoteProvider, updates_are_fwd)
+{
+    // update received from the remote provider in a tuple
+    std::tuple<double, double, double, double, uint32_t> update{3, 4, 4, 4, 0}; 
+
+    auto conf = remote::Provider::Configuration{};
+    conf.name = "com.ubuntu.espoo.Service.Provider";
+    conf.path = "/com/ubuntu/espoo/Service/Provider";
+    conf.connection = session_bus();
+
+    remote::Provider provider{conf};
+
+    cul::Provider::Ptr p1{std::addressof(provider), [](cul::Provider*){}};
+
+    cul::ProviderSelection selection{p1, p1, p1};
+
+    cul::ProxyProvider pp{selection};
+
+    MockEventConsumer mec;
+    EXPECT_CALL(mec, on_new_position(postion_equals_tuple(update))).Times(1);
+
+    pp.updates().position.connect([&mec](const cul::Update<cul::Position>& p){mec.on_new_position(p);});
+
+    // create an update to be processed
+    provider.on_position_changed(update);
+}