Merge lp:~mardy/location-service/old-location-1604446 into lp:location-service/trunk

[Alberto Mardegan]

Don't sent last known position to new sessions

Don't sent last known position to new sessions

[Thomas Voß (thomas-voss)]

LGTM

review: Approve

=== modified file 'src/location_service/com/ubuntu/location/service/implementation.cpp'
--- src/location_service/com/ubuntu/location/service/implementation.cpp	2016-05-20 15:24:39 +0000
+++ src/location_service/com/ubuntu/location/service/implementation.cpp	2016-07-26 08:50:39 +0000
@@ -177,23 +177,5 @@
         new ProxyProvider{provider_selection}
     };
 
-    session::Interface::Ptr session_iface{new session::Implementation(proxy_provider)};
-    std::weak_ptr<session::Interface> session_weak{session_iface};
-    session_iface->updates().position_status.changed().connect([this, session_weak](const session::Interface::Updates::Status& status)
-    {
-        cul::Optional<cul::Update<cul::Position>> last_known_position = configuration.engine->updates.last_known_location.get();
-        bool has_last_known_position = last_known_position ? true : false;
-        bool is_session_enabled = status == culs::session::Interface::Updates::Status::enabled;
-        bool is_session_on_or_active = configuration.engine->configuration.engine_state != Engine::Status::off;
-
-        if (has_last_known_position && is_session_enabled && is_session_on_or_active)
-        {
-            // Immediately send the last known position to the client
-            if (auto session_iface = session_weak.lock())
-            {
-                session_iface->updates().position = last_known_position.get();
-            }
-        }
-    });
-    return session_iface;
+    return session::Interface::Ptr{new culs::session::Implementation(proxy_provider)};
 }

=== modified file 'tests/acceptance_tests.cpp'
--- tests/acceptance_tests.cpp	2016-05-24 07:34:26 +0000
+++ tests/acceptance_tests.cpp	2016-07-26 08:50:39 +0000
@@ -666,110 +666,6 @@
     EXPECT_EQ(core::testing::ForkAndRunResult::empty, core::testing::fork_and_run(server, client));
 }
 
-TEST_F(LocationServiceStandalone, NewSessionsGetLastKnownPosition)
-{
-    core::testing::CrossProcessSync sync_start;
-
-    auto server = [this, &sync_start]()
-    {
-        SCOPED_TRACE("Server");
-
-        auto trap = core::posix::trap_signals_for_all_subsequent_threads({core::posix::Signal::sig_term});
-        trap->signal_raised().connect([trap](core::posix::Signal)
-        {
-            trap->stop();
-        });
-
-        auto incoming = session_bus();
-        auto outgoing = session_bus();
-
-        incoming->install_executor(core::dbus::asio::make_executor(incoming));
-        outgoing->install_executor(core::dbus::asio::make_executor(outgoing));
-
-        auto dummy = new DummyProvider();
-        cul::Provider::Ptr helper(dummy);
-
-        cul::service::DefaultConfiguration config;
-        cul::service::Implementation::Configuration configuration
-        {
-            incoming,
-            outgoing,
-            config.the_engine(config.the_provider_set(helper), config.the_provider_selection_policy(), null_settings()),
-            config.the_permission_manager(incoming),
-            cul::service::Harvester::Configuration
-            {
-                cul::connectivity::platform_default_manager(),
-                std::make_shared<NullReporter>()
-            }
-        };
-        auto location_service = std::make_shared<cul::service::Implementation>(configuration);
-
-        configuration.engine->updates.last_known_location.set(reference_position_update);
-        std::thread t1{[incoming](){incoming->run();}};
-        std::thread t2{[outgoing](){outgoing->run();}};
-
-        sync_start.try_signal_ready_for(std::chrono::milliseconds{500});
-
-        trap->run();
-
-        incoming->stop();
-        outgoing->stop();
-
-        if (t1.joinable())
-            t1.join();
-
-        if (t2.joinable())
-            t2.join();
-
-        return ::testing::Test::HasFailure() ? core::posix::exit::Status::failure : core::posix::exit::Status::success;
-    };
-
-    auto client = [this, &sync_start]()
-    {
-        SCOPED_TRACE("Client");
-
-        EXPECT_EQ(1, sync_start.wait_for_signal_ready_for(std::chrono::milliseconds{500}));
-
-        auto bus = session_bus();
-        bus->install_executor(dbus::asio::make_executor(bus));
-        std::thread t{[bus](){bus->run();}};
-
-        auto location_service = dbus::resolve_service_on_bus<
-            cul::service::Interface,
-            cul::service::Stub>(bus);
-
-        auto s1 = location_service->create_session_for_criteria(cul::Criteria{});
-
-        std::cout << "Successfully created session" << std::endl;
-
-        cul::Update<cul::Position> position;
-        auto c1 = s1->updates().position.changed().connect(
-            [&](const cul::Update<cul::Position>& new_position) {
-                std::cout << "On position updated: " << new_position << std::endl;
-                position = new_position;
-            });
-
-        std::cout << "Created event connections, starting updates..." << std::endl;
-
-        s1->updates().position_status = culss::Interface::Updates::Status::enabled;
-
-        std::cout << "done" << std::endl;
-
-        std::this_thread::sleep_for(std::chrono::milliseconds{1000});
-
-        bus->stop();
-
-        if (t.joinable())
-            t.join();
-
-        EXPECT_EQ(reference_position_update, position);
-
-        return ::testing::Test::HasFailure() ? core::posix::exit::Status::failure : core::posix::exit::Status::success;
-    };
-
-    EXPECT_EQ(core::testing::ForkAndRunResult::empty, core::testing::fork_and_run(server, client));
-}
-
 namespace
 {
 struct LocationServiceStandaloneLoad : public LocationServiceStandalone