Merge lp:~thomas-voss/biometryd/extend-template-store-interface into lp:biometryd

[Thomas Voß]

Extend biometry::TemplateStore:
  list lists all known templates by id.
  remove erases a specific template by id from the template store.

Extend biometry::TemplateStore:
  list lists all known templates by id.
  remove erases a specific template by id from the template store.

=== modified file 'include/biometry/devices/fingerprint_reader.h'
--- include/biometry/devices/fingerprint_reader.h	2016-05-02 06:16:01 +0000
+++ include/biometry/devices/fingerprint_reader.h	2016-06-14 21:15:36 +0000
@@ -95,7 +95,9 @@
 
         // From biometry::TemplateStore.
         Operation<SizeQuery>::Ptr size(const Application& app, const User& user) override;
+        Operation<List>::Ptr list(const Application& app, const User& user) override;
         Operation<Enrollment>::Ptr enroll(const Application& app, const User& user) override;
+        Operation<Removal>::Ptr remove(const Application& app, const User& user, TemplateStore::TemplateId id) override;
         Operation<Clearance>::Ptr clear(const Application& app, const User& user) override;
 
     private:

=== modified file 'include/biometry/template_store.h'
--- include/biometry/template_store.h	2016-05-02 06:16:01 +0000
+++ include/biometry/template_store.h	2016-06-14 21:15:36 +0000
@@ -36,6 +36,9 @@
 class TemplateStore : public DoNotCopyOrMove
 {
 public:
+    /// @brief TemplateId is a numeric uniquely identifying a biometric template.
+    typedef std::uint64_t TemplateId;
+
     /// @brief SizeQuery bundles the types passed to an observer of a size operation.
     struct SizeQuery
     {
@@ -45,13 +48,31 @@
         typedef std::uint32_t Result;        ///< Describes the result of a SizeQuery operation.
     };
 
+    /// @brief List bundles the types passed to an observer of a size operation.
+    struct List
+    {
+        typedef biometry::Progress Progress;    ///< Progress information about the completion status of an operation.
+        typedef std::string Reason;             ///< Details about cancelation of an operation.
+        typedef std::string Error;              ///< Describes error conditions.
+        typedef std::vector<TemplateId >Result; ///< Describes the result of a List operation.
+    };
+
     /// @brief Enrollment bundles the types passed to an observer of enrollment operations.
     struct Enrollment
     {
         typedef biometry::Progress Progress; ///< Progress information about the completion status of an operation.
         typedef std::string Reason;          ///< Details about cancelation of an operation.
         typedef std::string Error;           ///< Describes error conditions.
-        typedef Void Result;                 ///< Describes the result of an enrollment operation.
+        typedef TemplateId Result;           ///< Describes the result of an Enrollment operation.
+    };
+
+    /// @brief Remove bundles the types passed to an observer of a removal operation.
+    struct Removal
+    {
+        typedef biometry::Progress Progress; ///< Progress information about the completion status of an operation.
+        typedef std::string Reason;          ///< Details about cancelation of an operation.
+        typedef std::string Error;           ///< Describes error conditions.
+        typedef TemplateId Result;           ///< Describes the result of an Enrollment operation.
     };
 
     /// @brief Clearance bundles the types passed to an observer of clearance operations.
@@ -60,7 +81,7 @@
         typedef biometry::Progress Progress; ///< Progress information about the completion status of an operation.
         typedef std::string Reason;          ///< Details about cancelation of an operation.
         typedef std::string Error;           ///< Describes error conditions.
-        typedef Void Result;                 ///< Describes the result of an enrollment operation.
+        typedef Void Result;                 ///< Describes the result of a Clearance operation.
     };
 
     /// @brief size() returns the number of templates known for user.
@@ -68,11 +89,22 @@
     /// @param user The user for which we want to query the number of known templates.
     virtual Operation<SizeQuery>::Ptr size(const Application& app, const User& user) = 0;
 
+    /// @brief list returns an operation that yields the list of all templates enrolled for app and user.
+    /// @param app The application requesting the information.
+    /// @param user The user for which we want to query all enrolled templates.
+    virtual Operation<List>::Ptr list(const Application& app, const User& user) = 0;
+
     /// @brief enroll returns an operation that represents the enrollment of a new template for a user.
     /// @param app The application requesting the enrollment operation.
     /// @param user The user for which we want to enroll the new template.
     virtual Operation<Enrollment>::Ptr enroll(const Application& app, const User& user) = 0;
 
+    /// @brief remove returns an operation that represents the removal of an individual template.
+    /// @param app The application requesting the removal operation.
+    /// @param user The user for which we want to remove a specific template.
+    /// @param id The id of the template that should be removed.
+    virtual Operation<Removal>::Ptr remove(const Application& app, const User& user, TemplateId id) = 0;
+
     /// @brief clear returns an operation that represents removal of all templates associated to user.
     /// @param app The application requesting the clear operation.
     /// @param user The user for which we want to clear templates for.

=== modified file 'src/biometry/dbus/interface.h'
--- src/biometry/dbus/interface.h	2016-05-02 06:16:01 +0000
+++ src/biometry/dbus/interface.h	2016-06-14 21:15:36 +0000
@@ -193,6 +193,23 @@
             }
         };
 
+        struct List
+        {
+            static inline const std::string& name()
+            {
+                static const std::string s{"List"};
+                return s;
+            }
+
+            typedef biometry::dbus::interface::TemplateStore Interface;
+            typedef core::dbus::types::ObjectPath ResultType;
+
+            inline static const std::chrono::milliseconds default_timeout()
+            {
+                return std::chrono::seconds{1};
+            }
+        };
+
         struct Enroll
         {
             static inline const std::string& name()
@@ -211,6 +228,23 @@
             }
         };
 
+        struct Remove
+        {
+            static inline const std::string& name()
+            {
+                static const std::string s{"Remove"};
+                return s;
+            }
+
+            typedef biometry::dbus::interface::TemplateStore Interface;
+            typedef core::dbus::types::ObjectPath ResultType;
+
+            inline static const std::chrono::milliseconds default_timeout()
+            {
+                return std::chrono::seconds{1};
+            }
+        };
+
         struct Clear
         {
             static inline const std::string& name()

=== modified file 'src/biometry/dbus/skeleton/template_store.cpp'
--- src/biometry/dbus/skeleton/template_store.cpp	2016-05-04 12:17:44 +0000
+++ src/biometry/dbus/skeleton/template_store.cpp	2016-06-14 21:15:36 +0000
@@ -44,11 +44,21 @@
     return impl.get().size(app, user);
 }
 
+biometry::Operation<biometry::TemplateStore::List>::Ptr biometry::dbus::skeleton::TemplateStore::list(const biometry::Application& app, const biometry::User& user)
+{
+    return impl.get().list(app, user);
+}
+
 biometry::Operation<biometry::TemplateStore::Enrollment>::Ptr biometry::dbus::skeleton::TemplateStore::enroll(const biometry::Application& app, const biometry::User& user)
 {
     return impl.get().enroll(app, user);
 }
 
+biometry::Operation<biometry::TemplateStore::Removal>::Ptr biometry::dbus::skeleton::TemplateStore::remove(const biometry::Application& app, const biometry::User& user, biometry::TemplateStore::TemplateId id)
+{
+    return impl.get().remove(app, user, id);
+}
+
 biometry::Operation<biometry::TemplateStore::Clearance>::Ptr biometry::dbus::skeleton::TemplateStore::clear(const biometry::Application& app, const biometry::User& user)
 {
     return impl.get().clear(app, user);
@@ -85,6 +95,27 @@
         this->bus->send(reply);
     });
 
+    object->install_method_handler<biometry::dbus::interface::TemplateStore::Methods::List>([this](const core::dbus::Message::Ptr& msg)
+    {
+        biometry::User user; biometry::Application app = biometry::Application::system();
+        auto reader = msg->reader(); reader >> app >> user;
+        auto op = list(app, user);
+
+        core::dbus::types::ObjectPath op_path
+        {
+            (boost::format{"%1%/operation/list/%2%"} % this->object->path().as_string() % util::counter<TemplateStore>().increment()).str()
+        };
+
+        ops.list.synchronized([this, op_path, op](ListOps::ValueType& ops)
+        {
+            ops[op_path] = skeleton::Operation<List>::create_for_object(this->bus, this->service->add_object_for_path(op_path), op);
+        });
+
+        auto reply = core::dbus::Message::make_method_return(msg);
+        reply->writer() << op_path;
+        this->bus->send(reply);
+    });
+
     object->install_method_handler<biometry::dbus::interface::TemplateStore::Methods::Enroll>([this](const core::dbus::Message::Ptr& msg)
     {
         biometry::User user; biometry::Application app = biometry::Application::system();
@@ -106,6 +137,27 @@
         this->bus->send(reply);
     });
 
+    object->install_method_handler<biometry::dbus::interface::TemplateStore::Methods::Remove>([this](const core::dbus::Message::Ptr& msg)
+    {
+        biometry::User user; biometry::Application app = biometry::Application::system(); biometry::TemplateStore::TemplateId id{0};
+        auto reader = msg->reader(); reader >> app >> user >> id;
+        auto op = remove(app, user, id);
+
+        core::dbus::types::ObjectPath op_path
+        {
+            (boost::format{"%1%/operation/remove/%2%"} % this->object->path().as_string() % util::counter<TemplateStore>().increment()).str()
+        };
+
+        ops.remove.synchronized([this, op_path, op](RemoveOps::ValueType& ops)
+        {
+            ops[op_path] = skeleton::Operation<Removal>::create_for_object(this->bus, this->service->add_object_for_path(op_path), op);
+        });
+
+        auto reply = core::dbus::Message::make_method_return(msg);
+        reply->writer() << op_path;
+        this->bus->send(reply);
+    });
+
     object->install_method_handler<biometry::dbus::interface::TemplateStore::Methods::Clear>([this](const core::dbus::Message::Ptr& msg)
     {
         biometry::User user; biometry::Application app = biometry::Application::system();

=== modified file 'src/biometry/dbus/skeleton/template_store.h'
--- src/biometry/dbus/skeleton/template_store.h	2016-05-04 12:17:44 +0000
+++ src/biometry/dbus/skeleton/template_store.h	2016-06-14 21:15:36 +0000
@@ -55,12 +55,16 @@
     // From biometry::Identifier.
     // biometry::Operation<biometry::TemplateStore::Enrollment>
     Operation<SizeQuery>::Ptr size(const Application&, const User&) override;
+    Operation<List>::Ptr list(const Application& app, const User& user) override;
     Operation<Enrollment>::Ptr enroll(const Application&, const User&) override;
+    Operation<Removal>::Ptr remove(const Application& app, const User& user, TemplateStore::TemplateId id) override;
     Operation<Clearance>::Ptr clear(const Application&, const User&) override;
 
 private:
     typedef util::Synchronized<std::unordered_map<core::dbus::types::ObjectPath, Operation<SizeQuery>::Ptr>> SizeOps;
+    typedef util::Synchronized<std::unordered_map<core::dbus::types::ObjectPath, Operation<List>::Ptr>> ListOps;
     typedef util::Synchronized<std::unordered_map<core::dbus::types::ObjectPath, Operation<Enrollment>::Ptr>> EnrollOps;
+    typedef util::Synchronized<std::unordered_map<core::dbus::types::ObjectPath, Operation<Removal>::Ptr>> RemoveOps;
     typedef util::Synchronized<std::unordered_map<core::dbus::types::ObjectPath, Operation<Clearance>::Ptr>> ClearOps;
 
     /// @brief TemplateStore creates a new instance for the given remote service and object.
@@ -76,8 +80,10 @@
     struct
     {
         SizeOps size;
-        EnrollOps enroll;
-        ClearOps clear;
+        ListOps list;
+        EnrollOps enroll;        
+        RemoveOps remove;
+        ClearOps clear;        
     } ops;
 };
 }

=== modified file 'src/biometry/dbus/stub/template_store.cpp'
--- src/biometry/dbus/stub/template_store.cpp	2016-05-02 06:16:01 +0000
+++ src/biometry/dbus/stub/template_store.cpp	2016-06-14 21:15:36 +0000
@@ -44,6 +44,16 @@
     return Operation<SizeQuery>::create_for_object_and_service(bus, service, service->object_for_path(result.value()));
 }
 
+biometry::Operation<biometry::TemplateStore::List>::Ptr biometry::dbus::stub::TemplateStore::list(const biometry::Application& app, const biometry::User& user)
+{
+    auto result = object->transact_method<
+            biometry::dbus::interface::TemplateStore::Methods::List,
+            biometry::dbus::interface::TemplateStore::Methods::List::ResultType
+    >(app, user);
+
+    return Operation<List>::create_for_object_and_service(bus, service, service->object_for_path(result.value()));
+}
+
 biometry::Operation<biometry::TemplateStore::Enrollment>::Ptr biometry::dbus::stub::TemplateStore::enroll(const biometry::Application& app, const biometry::User& user)
 {
     auto result = object->transact_method<
@@ -54,6 +64,16 @@
     return Operation<Enrollment>::create_for_object_and_service(bus, service, service->object_for_path(result.value()));
 }
 
+biometry::Operation<biometry::TemplateStore::Removal>::Ptr biometry::dbus::stub::TemplateStore::remove(const biometry::Application& app, const biometry::User& user, biometry::TemplateStore::TemplateId id)
+{
+    auto result = object->transact_method<
+            biometry::dbus::interface::TemplateStore::Methods::Remove,
+            biometry::dbus::interface::TemplateStore::Methods::Remove::ResultType
+    >(app, user, id);
+
+    return Operation<Removal>::create_for_object_and_service(bus, service, service->object_for_path(result.value()));
+}
+
 biometry::Operation<biometry::TemplateStore::Clearance>::Ptr biometry::dbus::stub::TemplateStore::clear(const biometry::Application& app, const biometry::User& user)
 {
     auto result = object->transact_method<

=== modified file 'src/biometry/dbus/stub/template_store.h'
--- src/biometry/dbus/stub/template_store.h	2016-05-02 06:16:01 +0000
+++ src/biometry/dbus/stub/template_store.h	2016-06-14 21:15:36 +0000
@@ -44,7 +44,9 @@
     // From biometry::Identifier.
     // biometry::Operation<biometry::TemplateStore::Enrollment>
     Operation<SizeQuery>::Ptr size(const Application&, const User&) override;
+    Operation<TemplateStore::List>::Ptr list(const Application& app, const User& user) override;
     Operation<Enrollment>::Ptr enroll(const Application&, const User&) override;
+    Operation<TemplateStore::Removal>::Ptr remove(const Application& app, const User& user, TemplateStore::TemplateId id) override;
     Operation<Clearance>::Ptr clear(const Application&, const User&) override;
 
 private:

=== modified file 'src/biometry/devices/dispatching.cpp'
--- src/biometry/devices/dispatching.cpp	2016-05-04 12:17:44 +0000
+++ src/biometry/devices/dispatching.cpp	2016-06-14 21:15:36 +0000
@@ -71,11 +71,21 @@
     return std::make_shared<DispatchingOperation<biometry::TemplateStore::SizeQuery>>(dispatcher, impl->template_store().size(app, user));
 }
 
+biometry::Operation<biometry::TemplateStore::List>::Ptr biometry::devices::Dispatching::TemplateStore::list(const biometry::Application& app, const biometry::User& user)
+{
+    return std::make_shared<DispatchingOperation<biometry::TemplateStore::List>>(dispatcher, impl->template_store().list(app, user));
+}
+
 biometry::Operation<biometry::TemplateStore::Enrollment>::Ptr biometry::devices::Dispatching::TemplateStore::enroll(const biometry::Application& app, const biometry::User& user)
 {
     return std::make_shared<DispatchingOperation<biometry::TemplateStore::Enrollment>>(dispatcher, impl->template_store().enroll(app, user));
 }
 
+biometry::Operation<biometry::TemplateStore::Removal>::Ptr biometry::devices::Dispatching::TemplateStore::remove(const biometry::Application& app, const biometry::User& user, biometry::TemplateStore::TemplateId id)
+{
+    return std::make_shared<DispatchingOperation<biometry::TemplateStore::Removal>>(dispatcher, impl->template_store().remove(app, user, id));
+}
+
 biometry::Operation<biometry::TemplateStore::Clearance>::Ptr biometry::devices::Dispatching::TemplateStore::clear(const biometry::Application& app, const biometry::User& user)
 {
     return std::make_shared<DispatchingOperation<biometry::TemplateStore::Clearance>>(dispatcher, impl->template_store().clear(app, user));

=== modified file 'src/biometry/devices/dispatching.h'
--- src/biometry/devices/dispatching.h	2016-05-04 12:17:44 +0000
+++ src/biometry/devices/dispatching.h	2016-06-14 21:15:36 +0000
@@ -50,7 +50,9 @@
 
         // From biometry::TemplateStore.
         biometry::Operation<biometry::TemplateStore::SizeQuery>::Ptr size(const biometry::Application& app, const biometry::User& user) override;
+        biometry::Operation<biometry::TemplateStore::List>::Ptr list(const biometry::Application& app, const biometry::User& user) override;
         biometry::Operation<biometry::TemplateStore::Enrollment>::Ptr enroll(const biometry::Application& app, const biometry::User& user) override;
+        biometry::Operation<biometry::TemplateStore::Removal>::Ptr remove(const biometry::Application& app, const biometry::User& user, biometry::TemplateStore::TemplateId id) override;
         biometry::Operation<biometry::TemplateStore::Clearance>::Ptr clear(const biometry::Application& app, const biometry::User& user) override;
 
     private:

=== modified file 'src/biometry/devices/dummy.cpp'
--- src/biometry/devices/dummy.cpp	2016-05-11 14:39:41 +0000
+++ src/biometry/devices/dummy.cpp	2016-06-14 21:15:36 +0000
@@ -28,11 +28,21 @@
     return std::make_shared<Dummy::Operation<biometry::TemplateStore::SizeQuery>>();
 }
 
+biometry::Operation<biometry::TemplateStore::List>::Ptr biometry::devices::Dummy::TemplateStore::list(const biometry::Application&, const biometry::User&)
+{
+    return std::make_shared<Dummy::Operation<biometry::TemplateStore::List>>();
+}
+
 biometry::Operation<biometry::TemplateStore::Enrollment>::Ptr biometry::devices::Dummy::TemplateStore::enroll(const biometry::Application&, const biometry::User&)
 {
     return std::make_shared<Dummy::Operation<biometry::TemplateStore::Enrollment>>();
 }
 
+biometry::Operation<biometry::TemplateStore::Removal>::Ptr biometry::devices::Dummy::TemplateStore::remove(const biometry::Application&, const biometry::User&, biometry::TemplateStore::TemplateId)
+{
+    return std::make_shared<Dummy::Operation<biometry::TemplateStore::Removal>>();
+}
+
 biometry::Operation<biometry::TemplateStore::Clearance>::Ptr biometry::devices::Dummy::TemplateStore::clear(const biometry::Application&, const biometry::User&)
 {
     return std::make_shared<Dummy::Operation<biometry::TemplateStore::Clearance>>();

=== modified file 'src/biometry/devices/dummy.h'
--- src/biometry/devices/dummy.h	2016-05-11 14:39:41 +0000
+++ src/biometry/devices/dummy.h	2016-06-14 21:15:36 +0000
@@ -57,7 +57,9 @@
     public:
         // From biometry::TemplateStore.
         biometry::Operation<biometry::TemplateStore::SizeQuery>::Ptr size(const biometry::Application& app, const biometry::User& user) override;
+        biometry::Operation<biometry::TemplateStore::List>::Ptr list(const biometry::Application& app, const biometry::User& user) override;
         biometry::Operation<biometry::TemplateStore::Enrollment>::Ptr enroll(const biometry::Application& app, const biometry::User& user) override;
+        biometry::Operation<biometry::TemplateStore::Removal>::Ptr remove(const biometry::Application& app, const biometry::User& user, biometry::TemplateStore::TemplateId id) override;
         biometry::Operation<biometry::TemplateStore::Clearance>::Ptr clear(const biometry::Application& app, const biometry::User& user) override;
     };
 

=== modified file 'src/biometry/devices/fingerprint_reader.cpp'
--- src/biometry/devices/fingerprint_reader.cpp	2016-05-02 06:16:01 +0000
+++ src/biometry/devices/fingerprint_reader.cpp	2016-06-14 21:15:36 +0000
@@ -150,11 +150,21 @@
     return impl.get().size(app, user);
 }
 
+biometry::Operation<biometry::TemplateStore::List>::Ptr biometry::devices::FingerprintReader::TemplateStore::list(const Application& app, const User& user)
+{
+    return impl.get().list(app, user);
+}
+
 biometry::Operation<biometry::TemplateStore::Enrollment>::Ptr biometry::devices::FingerprintReader::TemplateStore::enroll(const Application& app, const User& user)
 {
     return impl.get().enroll(app, user);
 }
 
+biometry::Operation<biometry::TemplateStore::Removal>::Ptr biometry::devices::FingerprintReader::TemplateStore::remove(const Application& app, const User& user, TemplateId id)
+{
+    return impl.get().remove(app, user, id);
+}
+
 biometry::Operation<biometry::TemplateStore::Clearance>::Ptr biometry::devices::FingerprintReader::TemplateStore::clear(const Application& app, const User& user)
 {
     return impl.get().clear(app, user);

=== modified file 'src/biometry/qml/Biometryd/plugin.cpp'
--- src/biometry/qml/Biometryd/plugin.cpp	2016-05-02 06:16:01 +0000
+++ src/biometry/qml/Biometryd/plugin.cpp	2016-06-14 21:15:36 +0000
@@ -46,11 +46,21 @@
         return biometry::Operation<SizeQuery>::Ptr{};
     }
 
+    biometry::Operation<biometry::TemplateStore::List>::Ptr list(const biometry::Application&, const biometry::User&) override
+    {
+        return biometry::Operation<List>::Ptr{};
+    }
+
     biometry::Operation<Enrollment>::Ptr enroll(const biometry::Application&, const biometry::User&) override
     {
         return biometry::Operation<Enrollment>::Ptr{};
     }
 
+    biometry::Operation<Removal>::Ptr remove(const biometry::Application&, const biometry::User&, biometry::TemplateStore::TemplateId) override
+    {
+        return biometry::Operation<Removal>::Ptr{};
+    }
+
     biometry::Operation<Clearance>::Ptr clear(const biometry::Application&, const biometry::User&) override
     {
         return biometry::Operation<Clearance>::Ptr{};

=== modified file 'tests/mock_device.h'
--- tests/mock_device.h	2016-05-02 06:16:01 +0000
+++ tests/mock_device.h	2016-06-14 21:15:36 +0000
@@ -75,7 +75,9 @@
 struct MockTemplateStore : public biometry::TemplateStore
 {
     MOCK_METHOD2(size, biometry::Operation<SizeQuery>::Ptr(const biometry::Application&, const biometry::User&));
+    MOCK_METHOD2(list, biometry::Operation<List>::Ptr(const biometry::Application&, const biometry::User&));
     MOCK_METHOD2(enroll, biometry::Operation<Enrollment>::Ptr (const biometry::Application&, const biometry::User&));
+    MOCK_METHOD3(remove, biometry::Operation<Removal>::Ptr(const biometry::Application&, const biometry::User&, biometry::TemplateStore::TemplateId));
     MOCK_METHOD2(clear, biometry::Operation<Clearance>::Ptr(const biometry::Application&, const biometry::User&));
 };
 

=== modified file 'tests/test_dbus_stub_skeleton.cpp'
--- tests/test_dbus_stub_skeleton.cpp	2016-05-02 06:16:01 +0000
+++ tests/test_dbus_stub_skeleton.cpp	2016-06-14 21:15:36 +0000
@@ -134,7 +134,9 @@
 
         auto template_store = std::make_shared<NiceMock<MockTemplateStore>>();
         ON_CALL(*template_store, size(_, _)).WillByDefault(Return(std::make_shared<MockOperation<biometry::TemplateStore::SizeQuery>>()));
+        ON_CALL(*template_store, list(_, _)).WillByDefault(Return(std::make_shared<MockOperation<biometry::TemplateStore::List>>()));
         ON_CALL(*template_store, enroll(_, _)).WillByDefault(Return(std::make_shared<MockOperation<biometry::TemplateStore::Enrollment>>()));
+        ON_CALL(*template_store, remove(_, _, _)).WillByDefault(Return(std::make_shared<MockOperation<biometry::TemplateStore::Removal>>()));
         ON_CALL(*template_store, clear(_, _)).WillByDefault(Return(std::make_shared<MockOperation<biometry::TemplateStore::Clearance>>()));
 
         auto device = std::make_shared<NiceMock<MockDevice>>();
@@ -154,16 +156,19 @@
         auto app = biometry::Application::system();
         auto reason = biometry::Reason::unknown();
         auto user = biometry::User::current();
+        auto id = biometry::TemplateStore::TemplateId{42};
 
         auto scope = stub_scope();
         auto service = biometry::dbus::stub::Service::create_for_bus(scope->bus);
         auto device = service->default_device();
 
         auto f1 = start<biometry::TemplateStore::SizeQuery>(device->template_store().size(app, user));
-        auto f2 = start<biometry::TemplateStore::Enrollment>(device->template_store().enroll(app, user));
-        auto f3 = start<biometry::TemplateStore::Clearance>(device->template_store().clear(app, user));
+        auto f2 = start<biometry::TemplateStore::List>(device->template_store().list(app, user));
+        auto f3 = start<biometry::TemplateStore::Enrollment>(device->template_store().enroll(app, user));
+        auto f4 = start<biometry::TemplateStore::Removal>(device->template_store().remove(app, user, id));
+        auto f5 = start<biometry::TemplateStore::Clearance>(device->template_store().clear(app, user));
 
-        auto f4 = start<biometry::Identification>(device->identifier().identify_user(app, reason));
+        auto f6 = start<biometry::Identification>(device->identifier().identify_user(app, reason));
 
         return ::testing::Test::HasFailure() ? core::posix::exit::Status::failure : core::posix::exit::Status::success;
     };

=== modified file 'tests/test_dispatching_service_and_device.cpp'
--- tests/test_dispatching_service_and_device.cpp	2016-05-04 12:17:44 +0000
+++ tests/test_dispatching_service_and_device.cpp	2016-06-14 21:15:36 +0000
@@ -51,6 +51,26 @@
     op->start_with_observer(mock_observer);
 }
 
+TEST(DispatchingDevice, calls_into_dispatcher_for_template_store_list)
+{
+    using namespace testing;
+    auto mock_observer = std::make_shared<NiceMock<MockObserver<biometry::TemplateStore::List>>>();
+
+    auto template_store = std::make_shared<NiceMock<MockTemplateStore>>();
+    ON_CALL(*template_store, list(_, _)).WillByDefault(Return(std::make_shared<NiceMock<MockOperation<biometry::TemplateStore::List>>>()));
+
+    auto device = std::make_shared<NiceMock<MockDevice>>();
+    ON_CALL(*device, template_store()).WillByDefault(ReturnRef(*template_store));
+
+    auto dispatcher = std::make_shared<NiceMock<MockDispatcher>>();
+    EXPECT_CALL(*dispatcher, dispatch(_)).Times(1).WillOnce(Invoke([](const biometry::util::Dispatcher::Task& task) { task(); }));
+
+    auto dispatching = std::make_shared<biometry::devices::Dispatching>(dispatcher, device);
+    auto op = dispatching->template_store().list(biometry::Application::system(), biometry::User::current());
+
+    op->start_with_observer(mock_observer);
+}
+
 TEST(DispatchingDevice, calls_into_dispatcher_for_template_store_size_enrollment)
 {
     using namespace testing;
@@ -71,6 +91,26 @@
     op->start_with_observer(mock_observer);
 }
 
+TEST(DispatchingDevice, calls_into_dispatcher_for_template_store_removal)
+{
+    using namespace testing;
+    auto mock_observer = std::make_shared<NiceMock<MockObserver<biometry::TemplateStore::Removal>>>();
+
+    auto template_store = std::make_shared<NiceMock<MockTemplateStore>>();
+    ON_CALL(*template_store, remove(_, _, _)).WillByDefault(Return(std::make_shared<NiceMock<MockOperation<biometry::TemplateStore::Removal>>>()));
+
+    auto device = std::make_shared<NiceMock<MockDevice>>();
+    ON_CALL(*device, template_store()).WillByDefault(ReturnRef(*template_store));
+
+    auto dispatcher = std::make_shared<NiceMock<MockDispatcher>>();
+    EXPECT_CALL(*dispatcher, dispatch(_)).Times(1).WillOnce(Invoke([](const biometry::util::Dispatcher::Task& task) { task(); }));
+
+    auto dispatching = std::make_shared<biometry::devices::Dispatching>(dispatcher, device);
+    auto op = dispatching->template_store().remove(biometry::Application::system(), biometry::User::current(), 42);
+
+    op->start_with_observer(mock_observer);
+}
+
 TEST(DispatchingDevice, calls_into_dispatcher_for_template_store_clearance)
 {
     using namespace testing;