Remove USB manager and corresponding tests

Since this is renamed, it has never worked correctly anyway. I've forked
this part of code as "adbd-approver" [1], so this part can now be
removed.

[1] https://gitlab.com/ubports/development/core/adbd-approver

7 files changed, 0 insertions, 679 deletions

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 5bd645f..0619a51 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -31,7 +31,6 @@ add_compile_options(${CXX_WARNING_ARGS})
 add_test(cppcheck cppcheck --enable=all -USCHEMA_DIR --error-exitcode=2 --inline-suppr --library=qt -I${CMAKE_SOURCE_DIR} -i${CMAKE_SOURCE_DIR}/tests/utils/qmain.cpp -i${CMAKE_SOURCE_DIR}/tests/gmock ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/tests --suppress=missingIncludeSystem --suppress=uninitDerivedMemberVar --suppress=unmatchedSuppression --suppress=constParameter --suppress=unusedFunction --suppress=uselessOverride)
 
 if (ENABLE_LOMIRI_FEATURES)
-    add_subdirectory (integration)
     add_subdirectory (unit)
     add_subdirectory (utils)
 endif ()
diff --git a/tests/integration/CMakeLists.txt b/tests/integration/CMakeLists.txt
deleted file mode 100644
index 9fea07d..0000000
--- a/tests/integration/CMakeLists.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-set(SERVICE_LINK_LIBRARIES
-    ${SERVICE_LIB}
-    ${SERVICE_DEPS_LIBRARIES}
-)
-set(QT_LINK_LIBRARIES
-    test-utils
-    Qt5::Core
-    Qt5::Test
-    Qt5::DBus
-)
-set(TEST_LINK_LIBRARIES
-    ${TEST_DEPS_LIBRARIES}
-    ${GTEST_LIBRARIES}
-    ${GMOCK_LIBRARIES}
-)
-
-function(add_qt_test_by_name name)
-  set(TEST_NAME ${name})
-  set(COVERAGE_TEST_TARGETS ${COVERAGE_TEST_TARGETS} ${TEST_NAME} PARENT_SCOPE)
-  add_executable (${TEST_NAME} ${TEST_NAME}.cpp)
-  target_link_options(${TEST_NAME} PRIVATE -no-pie)
-  add_test(${TEST_NAME} ${TEST_NAME})
-  set_property(TEST ${TEST_NAME} APPEND PROPERTY ENVIRONMENT ${CTEST_ENVIRONMENT})
-  target_link_libraries(${TEST_NAME} ${SERVICE_LINK_LIBRARIES} ${QT_LINK_LIBRARIES} ${TEST_LINK_LIBRARIES} ${THREAD_LINK_LIBRARIES})
-endfunction()
-add_qt_test_by_name(usb-manager-test)
-
-set(COVERAGE_TEST_TARGETS
-  ${COVERAGE_TEST_TARGETS}
-  PARENT_SCOPE
-)
diff --git a/tests/integration/usb-manager-test.cpp b/tests/integration/usb-manager-test.cpp
deleted file mode 100644
index b693586..0000000
--- a/tests/integration/usb-manager-test.cpp
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
- * Copyright 2016 Canonical Ltd.
- * Copyright 2022-2023 Robert Tari
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU 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 warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *   Charles Kerr <charles.kerr@canonical.com>
- *   Robert Tari <robert@tari.in>
- */
-
-#include <tests/utils/adbd-server.h>
-#include <tests/utils/qt-fixture.h>
-#include <tests/utils/mock-greeter.h>
-#include <tests/utils/mock-usb-monitor.h>
-
-#include <src/dbus-names.h>
-#include <src/usb-manager.h>
-
-#include <libqtdbustest/DBusTestRunner.h>
-#include <libqtdbustest/QProcessDBusService.h>
-#include <libqtdbusmock/DBusMock.h>
-
-#include <fstream>
-#include <sstream>
-#include <vector>
-
-/***
-****
-***/
-
-class UsbManagerFixture: public QtFixture
-{
-    using super = QtFixture;
-
-public:
-
-    UsbManagerFixture():
-        dbusMock{dbusTestRunner}
-    {
-        dbusTestRunner.startServices();
-    }
-
-    ~UsbManagerFixture() =default;
-
-protected:
-
-    static void file_deleter (std::string* s)
-    {
-        fprintf(stderr, "remove \"%s\"\n", s->c_str());
-        g_remove(s->c_str());
-        delete s;
-    }
-
-    void SetUp() override
-    {
-        super::SetUp();
-
-        m_usb_monitor.reset(new MockUsbMonitor{});
-        m_greeter.reset(new MockGreeter{});
-
-        char tmpl[] = {"usb-manager-test-XXXXXX"};
-        m_tmpdir.reset(new std::string{g_mkdtemp(tmpl)}, file_deleter);
-        g_message("using tmpdir '%s'", m_tmpdir->c_str());
-
-        dbusMock.registerNotificationDaemon();
-        dbusTestRunner.startServices();
-    }
-
-    OrgFreedesktopDBusMockInterface& notificationsMockInterface()
-    {
-        return dbusMock.mockInterface(DBusNames::Notify::NAME,
-                                      DBusNames::Notify::PATH,
-                                      DBusNames::Notify::INTERFACE,
-                                      QDBusConnection::SessionBus);
-    }
-
-    QtDBusTest::DBusTestRunner dbusTestRunner;
-    QtDBusMock::DBusMock dbusMock;
-    std::shared_ptr<std::string> m_tmpdir;
-    std::shared_ptr<MockUsbMonitor> m_usb_monitor;
-    std::shared_ptr<MockGreeter> m_greeter;
-};
-
-TEST_F(UsbManagerFixture, Allow)
-{
-    const std::shared_ptr<std::string> socket_path {new std::string{*m_tmpdir+"/socket"}, file_deleter};
-    const std::shared_ptr<std::string> public_keys_path {new std::string{*m_tmpdir+"/adb_keys"}, file_deleter};
-
-    // add a signal spy to listen to the notification daemon
-    QSignalSpy notificationsSpy(
-        &notificationsMockInterface(),
-        SIGNAL(MethodCalled(const QString &, const QVariantList &))
-    );
-
-    // start a mock AdbdServer ready to submit a request
-    const std::string public_key {"qAAAALUHllFjEZjl5jbS9ivjpQpaTNpibl28Re71D/S8sV3usNJTkbpvZYoVPfxtmHSNdCgLkWN6qcDZsHZqE/4myzmx/8Y/RqBy1oirudugi3YUUcJh7aWkY8lKQe9shCLTcrT7cFLZIJIidTvfmWTm0UcU+xmdPALze11I3lGo1Ty5KpCe9oP+qYM8suHbxhm78LKLlo0QJ2QqM8T5isr1pvoPHDgRb+mSESElG+xDIfPWA2BTu77/xk4EnXmOYfcuCr5akF3N4fRo/ACnYgXWDZFX2XdklBXyDj78lVlinF37xdMk7BMQh166X7UNkpH1uG2y5F6lUzyLg8SsFtRnJkw7eVe/gnJj3feQaFQbF5oVDhWhLMtWLtejhX6umvroVBVA4rynG4xEgs00K4u4ly8DUIIJYDO22Ml4myFR5CUm3lOlyitNdzYGh0utLXPq9oc8EbMVxM3i+O7PRxQw5Ul04X6K8GLiGUDV98DB+xYUqfEveq1BRnXi/ZrdPDhQ8Lfkg5xnLccPTFamAqutPtZXV6s7dXJInBTZf0NtBaWL0RdR2cOJBrpeBYkrc9yIyeqFLFdxr66rjaehjaa4pS4S+CD6PkGiIpPWSQtwNC4RlT10qTQ0/K9lRux2p0D8Z8ubUTFuh4kBScGUkN1OV3Z+7d7B+ghmBtZrrgleXsbehjRuKgEAAQA= foo@bar"};
-    const std::string fingerprint {"12:23:5f:2d:8c:40:ae:1d:05:7b:ae:bd:88:8a:f0:80"};
-
-    auto adbd_server = std::make_shared<GAdbdServer>(*socket_path, std::vector<std::string>{"PK"+public_key});
-
-    // set up a UsbManager to process the request
-    auto usb_manager = std::make_shared<UsbManager>(*socket_path, *public_keys_path, m_usb_monitor, m_greeter);
-    // cppcheck in Ubuntu 20.04 requires the unused attribute to be set here...
-    Q_UNUSED(usb_manager);
-
-    // wait for the notification to show up, confirm it looks right
-    wait_for_signals(notificationsSpy, 1);
-    {
-        QVariantList const& call(notificationsSpy.at(0));
-        EXPECT_EQ("Notify", call.at(0));
-
-        QVariantList const& args(call.at(1).toList());
-        ASSERT_EQ(8, args.size());
-        EXPECT_EQ("", args.at(0)); // app name
-        EXPECT_EQ(0, args.at(1)); // replaces-id
-        EXPECT_EQ("computer-symbolic", args.at(2)); // icon name
-        EXPECT_EQ("Allow USB Debugging?", args.at(3)); // summary
-        EXPECT_EQ(QString::fromUtf8("The computer's RSA key fingerprint is: ") + QString::fromUtf8(fingerprint.c_str()), args.at(4)); // body
-        EXPECT_EQ(QStringList({"allow", "Allow", "deny", "Don't Allow"}), args.at(5)); // actions
-        EXPECT_EQ(-1, args.at(7));
-
-        QVariantMap hints;
-        ASSERT_TRUE(qDBusArgumentToMap(args.at(6), hints));
-        ASSERT_EQ(0, hints.size());
-    }
-    notificationsSpy.clear();
-
-    // click on allow in the notification
-    notificationsMockInterface().EmitSignal(
-        DBusNames::Notify::INTERFACE,
-        DBusNames::Notify::ActionInvoked::NAME,
-        "us",
-        QVariantList() << uint32_t(1) << "allow"
-    );
-
-    // confirm that the AdbdServer got the right response
-    wait_for([adbd_server](){return !adbd_server->m_responses.empty();}, 5000);
-    ASSERT_EQ(1, adbd_server->m_responses.size());
-    EXPECT_EQ("OK", adbd_server->m_responses.front());
-
-    // confirm that the public_keys file got the public key appended to it
-    std::ifstream ifkeys {*public_keys_path};
-    std::vector<std::string> lines;
-    std::string line;
-    while(getline(ifkeys, line))
-        lines.emplace_back(std::move(line));
-    ASSERT_EQ(1, lines.size());
-    EXPECT_EQ(public_key, lines[0]);
-}
-
-TEST_F(UsbManagerFixture, USBDisconnectedDuringPrompt)
-{
-    const std::shared_ptr<std::string> socket_path {new std::string{*m_tmpdir+"/socket"}, file_deleter};
-    const std::shared_ptr<std::string> public_keys_path {new std::string{*m_tmpdir+"/adb_keys"}, file_deleter};
-
-    // start a mock AdbdServer ready to submit a request
-    const size_t N_TESTS {3};
-    const std::string public_key {"public_key"};
-    const std::vector<std::string> requests(N_TESTS, "PK"+public_key);
-    const std::vector<std::string> expected_responses(N_TESTS, "NO");
-    auto adbd_server = std::make_shared<GAdbdServer>(*socket_path, requests);
-
-    // set up a UsbManager to process the request
-    auto usb_manager = std::make_shared<UsbManager>(*socket_path, *public_keys_path, m_usb_monitor, m_greeter);
-    // cppcheck in Ubuntu 20.04 requires the unused attribute to be set here...
-    Q_UNUSED(usb_manager);
-
-    for (std::remove_const<decltype(N_TESTS)>::type i=0; i<N_TESTS; ++i)
-    {
-        // add a signal spy to listen to the notification daemon
-        QSignalSpy notificationsSpy(
-            &notificationsMockInterface(),
-            SIGNAL(MethodCalled(const QString &, const QVariantList &))
-        );
-
-        // wait for a notification to show up
-        wait_for_signals(notificationsSpy, 1);
-        EXPECT_EQ("Notify", notificationsSpy.at(0).at(0));
-        notificationsSpy.clear();
-
-        // wait for UsbSnap to receive dbusmock's response to the Notify request.
-        // there's no event to key off of for this, so just wait for a moment
-        wait_msec();
-
-        // disconnect the USB before the user has a chance to allow/deny
-        m_usb_monitor->m_on_usb_disconnected("android0");
-
-        // confirm that we requested the notification to be pulled down
-        wait_for_signals(notificationsSpy, 1);
-        EXPECT_EQ("CloseNotification", notificationsSpy.at(0).at(0));
-        notificationsSpy.clear();
-    }
-
-    EXPECT_TRUE(wait_for([adbd_server](){return adbd_server->m_responses.size() == N_TESTS;}, 5000));
-    EXPECT_EQ(expected_responses, adbd_server->m_responses);
-}
-
-TEST_F(UsbManagerFixture, Greeter)
-{
-    const std::shared_ptr<std::string> socket_path {new std::string{*m_tmpdir+"/socket"}, file_deleter};
-    const std::shared_ptr<std::string> public_keys_path {new std::string{*m_tmpdir+"/adb_keys"}, file_deleter};
-
-    // start a mock AdbdServer ready to submit a request
-    const std::string public_key {"public_key"};
-    auto adbd_server = std::make_shared<GAdbdServer>(*socket_path, std::vector<std::string>{"PK"+public_key});
-    // cppcheck in Ubuntu 20.04 requires the unused attribute to be set here...
-    Q_UNUSED(adbd_server);
-
-    // set up a UsbManager to process the request
-    m_greeter->m_state.set(Greeter::State::ACTIVE);
-    auto usb_manager = std::make_shared<UsbManager>(*socket_path, *public_keys_path, m_usb_monitor, m_greeter);
-    // cppcheck in Ubuntu 20.04 requires the unused attribute to be set here...
-    Q_UNUSED(usb_manager);
-
-    // add a signal spy to listen to the notification daemon
-    QSignalSpy notificationsSpy(
-        &notificationsMockInterface(),
-        SIGNAL(MethodCalled(const QString &, const QVariantList &))
-    );
-
-    // the greeter is active, so the notification should not appear
-    EXPECT_FALSE(notificationsSpy.wait(2000));
-
-    // disable the greeter, the notification should appear
-    m_greeter->m_state.set(Greeter::State::INACTIVE);
-    wait_for_signals(notificationsSpy, 1);
-    EXPECT_EQ("Notify", notificationsSpy.at(0).at(0));
-    notificationsSpy.clear();
-}
diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt
index 63061c8..14f4d9e 100644
--- a/tests/unit/CMakeLists.txt
+++ b/tests/unit/CMakeLists.txt
@@ -60,21 +60,8 @@ function(add_test_by_name name)
   set_property(TEST ${TEST_NAME} APPEND PROPERTY ENVIRONMENT "TEST_NAME=${TEST_NAME}")
   target_link_libraries(${TEST_NAME} ${SERVICE_LINK_LIBRARIES} ${TEST_LINK_LIBRARIES} ${THREAD_LINK_LIBRARIES})
 endfunction()
-add_test_by_name(adbd-client-test)
 add_test_by_name(rotation-lock-test)
 
-function(add_qt_test_by_name name)
-  set(TEST_NAME ${name})
-  set(COVERAGE_TEST_TARGETS ${COVERAGE_TEST_TARGETS} ${TEST_NAME} PARENT_SCOPE)
-  add_executable (${TEST_NAME} ${TEST_NAME}.cpp)
-  target_link_options(${TEST_NAME} PRIVATE -no-pie)
-  add_test(${TEST_NAME} ${TEST_NAME})
-  set_property(TEST ${TEST_NAME} APPEND PROPERTY ENVIRONMENT ${CTEST_ENVIRONMENT})
-  target_link_libraries(${TEST_NAME} ${SERVICE_LINK_LIBRARIES} ${QT_LINK_LIBRARIES} ${TEST_LINK_LIBRARIES} ${THREAD_LINK_LIBRARIES})
-endfunction()
-add_qt_test_by_name(greeter-test)
-add_qt_test_by_name(usb-snap-test)
-
 set(COVERAGE_TEST_TARGETS
   ${COVERAGE_TEST_TARGETS}
   PARENT_SCOPE
diff --git a/tests/unit/adbd-client-test.cpp b/tests/unit/adbd-client-test.cpp
deleted file mode 100644
index 8e318d4..0000000
--- a/tests/unit/adbd-client-test.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright 2016 Canonical Ltd.
- * Copyright 2022 Robert Tari
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU 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 warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *   Charles Kerr <charles.kerr@canonical.com>
- *   Robert Tari <robert@tari.in>
- */
-
-#include <tests/utils/test-dbus-fixture.h>
-#include <tests/utils/adbd-server.h>
-
-#include <src/adbd-client.h>
-
-class AdbdClientFixture: public TestDBusFixture
-{
-private:
-    typedef TestDBusFixture super;
-
-protected:
-
-    static void file_deleter (std::string* s)
-    {
-        fprintf(stderr, "remove \"%s\"\n", s->c_str());
-        g_remove(s->c_str());
-        delete s;
-    }
-
-    std::shared_ptr<std::string> m_tmpdir;
-
-    void SetUp() override
-    {
-        super::SetUp();
-
-        char tmpl[] = {"adb-client-test-XXXXXX"};
-        m_tmpdir.reset(new std::string{g_mkdtemp(tmpl)}, file_deleter);
-        g_message("using tmpdir '%s'", m_tmpdir->c_str());
-    }
-};
-
-
-TEST_F(AdbdClientFixture, SocketPlumbing)
-{
-    struct {
-        const std::string request;
-        const std::string expected_pk;
-        AdbdClient::PKResponse response;
-        const std::string expected_response;
-    } const tests[] = {
-        { "PKHelloWorld", "HelloWorld", AdbdClient::PKResponse::ALLOW, "OK" },
-        { "PKHelloWorld", "HelloWorld", AdbdClient::PKResponse::DENY,  "NO" },
-        { "PKFooBar",     "FooBar",     AdbdClient::PKResponse::ALLOW, "OK" },
-        { "PK",           "",           AdbdClient::PKResponse::DENY,  "NO" }
-    };
-
-    const auto main_thread = g_thread_self();
-
-    const auto socket_path = *m_tmpdir + "/test-socket-plumbing";
-    g_message("socket_path is %s", socket_path.c_str());
-
-    for (const auto& test : tests)
-    {
-        // start an AdbdClient that listens for PKRequests
-        std::string pk;
-        auto adbd_client = std::make_shared<GAdbdClient>(socket_path);
-        auto connection = adbd_client->on_pk_request().connect([&pk, main_thread, test](const AdbdClient::PKRequest& req){
-            EXPECT_EQ(main_thread, g_thread_self());
-            g_message("in on_pk_request with %s", req.public_key.c_str());
-            pk = req.public_key;
-            req.respond(test.response);
-        });
-
-        // start a mock AdbdServer with to fire test key requests and wait for a response
-        auto adbd_server = std::make_shared<GAdbdServer>(socket_path, std::vector<std::string>{test.request});
-        wait_for([adbd_server](){return !adbd_server->m_responses.empty();}, 5000);
-        EXPECT_EQ(test.expected_pk, pk);
-        ASSERT_EQ(1, adbd_server->m_responses.size());
-        EXPECT_EQ(test.expected_response, adbd_server->m_responses.front());
-
-        // cleanup
-        connection.disconnect();
-        adbd_client.reset();
-        adbd_server.reset();
-        g_unlink(socket_path.c_str());
-    }
-}
diff --git a/tests/unit/greeter-test.cpp b/tests/unit/greeter-test.cpp
deleted file mode 100644
index 61880f6..0000000
--- a/tests/unit/greeter-test.cpp
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Copyright 2016 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU 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 warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *   Charles Kerr <charles.kerr@canonical.com>
- */
-
-#include <tests/utils/qt-fixture.h>
-#include <tests/utils/gtest-print-helpers.h>
-
-#include <src/dbus-names.h>
-#include <src/greeter.h>
-
-#include <libqtdbustest/DBusTestRunner.h>
-#include <libqtdbustest/QProcessDBusService.h>
-#include <libqtdbusmock/DBusMock.h>
-
-class GreeterFixture: public QtFixture
-{
-private:
-
-    using super = QtFixture;
-
-public:
-
-    GreeterFixture() =default;
-    ~GreeterFixture() =default;
-
-protected:
-
-    std::shared_ptr<QtDBusTest::DBusTestRunner> m_dbus_runner;
-    std::shared_ptr<QtDBusMock::DBusMock> m_dbus_mock;
-    GDBusConnection* m_bus {};
-
-    void SetUp() override
-    {
-        super::SetUp();
-  
-        // use a fresh bus for each test run
-        m_dbus_runner.reset(new QtDBusTest::DBusTestRunner());
-        m_dbus_mock.reset(new QtDBusMock::DBusMock(*m_dbus_runner.get()));
-
-        GError* error {};
-        m_bus = g_bus_get_sync (G_BUS_TYPE_SESSION, nullptr, &error);
-        g_assert_no_error(error);
-        g_dbus_connection_set_exit_on_close(m_bus, FALSE);
-    }
-
-    void TearDown() override
-    {
-        g_clear_object(&m_bus);
-
-        super::TearDown();
-    }
-
-    void start_greeter_service(bool is_active)
-    {
-        // set a watcher to look for our mock greeter to appear
-        bool owned {};
-        QDBusServiceWatcher watcher(
-            DBusNames::Greeter::NAME,
-            m_dbus_runner->sessionConnection()
-        );
-        QObject::connect(
-            &watcher,
-            &QDBusServiceWatcher::serviceRegistered,
-            [&owned](const QString&){owned = true;}
-        );
-
-        // start the mock greeter
-        QVariantMap parameters;
-        parameters["IsActive"] = QVariant(is_active);
-        m_dbus_mock->registerTemplate(
-            DBusNames::Greeter::NAME,
-            GREETER_TEMPLATE,
-            parameters,
-            QDBusConnection::SessionBus
-        );
-        m_dbus_runner->startServices();
-
-        // wait for the watcher
-        ASSERT_TRUE(wait_for([&owned]{return owned;}));
-    }
-};
-
-#define ASSERT_PROPERTY_EQ_EVENTUALLY(expected_in, property_in) \
-    do { \
-        const auto& e = expected_in; \
-        const auto& p = property_in; \
-        ASSERT_TRUE(wait_for([e, &p](){return e == p.get();})) \
-            << "expected " << e << " but got " << p.get(); \
-   } while(0)
-
-/**
- * Test startup timing by looking at four different cases:
- * [unity greeter shows up on bus (before, after) we start listening]
- *   x [unity greeter is (active, inactive)]
- */
-
-TEST_F(GreeterFixture, ActiveServiceStartsBeforeWatcher)
-{
-    constexpr bool is_active {true};
-    constexpr Greeter::State expected {Greeter::State::ACTIVE};
-
-    start_greeter_service(is_active);
-
-    Greeter greeter;
-
-    ASSERT_PROPERTY_EQ_EVENTUALLY(expected, greeter.state());
-}
-
-TEST_F(GreeterFixture, WatcherStartsBeforeActiveService)
-{
-    constexpr bool is_active {true};
-    constexpr Greeter::State expected {Greeter::State::ACTIVE};
-
-    Greeter greeter;
-
-    start_greeter_service(is_active);
-
-    ASSERT_PROPERTY_EQ_EVENTUALLY(expected, greeter.state());
-}
-
-TEST_F(GreeterFixture, InactiveServiceStartsBeforeWatcher)
-{
-    constexpr bool is_active {false};
-    constexpr Greeter::State expected {Greeter::State::INACTIVE};
-
-    start_greeter_service(is_active);
-
-    Greeter greeter;
-
-    ASSERT_PROPERTY_EQ_EVENTUALLY(expected, greeter.state());
-}
-
-TEST_F(GreeterFixture, WatcherStartsBeforeInactiveService)
-{
-    constexpr bool is_active {false};
-    constexpr Greeter::State expected {Greeter::State::INACTIVE};
-
-    Greeter greeter;
-
-    start_greeter_service(is_active);
-
-    ASSERT_PROPERTY_EQ_EVENTUALLY(expected, greeter.state());
-}
-
diff --git a/tests/unit/usb-snap-test.cpp b/tests/unit/usb-snap-test.cpp
deleted file mode 100644
index 8e42a76..0000000
--- a/tests/unit/usb-snap-test.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright 2016 Canonical Ltd.
- * Copyright 2022-2023 Robert Tari
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU 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 warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *   Charles Kerr <charles.kerr@canonical.com>
- *   Robert Tari <robert@tari.in>
- */
-
-#include <tests/utils/qt-fixture.h>
-
-#include <src/dbus-names.h>
-#include <src/usb-snap.h>
-
-#include <libqtdbustest/DBusTestRunner.h>
-#include <libqtdbustest/QProcessDBusService.h>
-#include <libqtdbusmock/DBusMock.h>
-
-class UsbSnapFixture: public QtFixture
-{
-    using super = QtFixture;
-
-public:
-
-    UsbSnapFixture():
-        dbusMock{dbusTestRunner}
-    {
-        dbusTestRunner.startServices();
-    }
-
-    ~UsbSnapFixture() =default;
-
-protected:
-
-    void SetUp() override
-    {
-        super::SetUp();
-
-        dbusMock.registerNotificationDaemon();
-        dbusTestRunner.startServices();
-    }
-
-    OrgFreedesktopDBusMockInterface& notificationsMockInterface()
-    {
-        return dbusMock.mockInterface(DBusNames::Notify::NAME,
-                                      DBusNames::Notify::PATH,
-                                      DBusNames::Notify::INTERFACE,
-                                      QDBusConnection::SessionBus);
-    }
-
-    QtDBusTest::DBusTestRunner dbusTestRunner;
-    QtDBusMock::DBusMock dbusMock;
-};
-
-TEST_F(UsbSnapFixture, TestRoundTrip)
-{
-    struct {
-        const char* fingerprint;
-        const char* action_to_invoke;
-        const AdbdClient::PKResponse expected_response;
-    } const tests[] = {
-        { "Fingerprint",  "allow", AdbdClient::PKResponse::ALLOW },
-        { "Fingerprint",  "deny",  AdbdClient::PKResponse::DENY }
-    };
-
-    uint32_t next_id = 1;
-    for(const auto& test : tests)
-    {
-        // Minor wart: we don't have a way of getting the fdo notification id
-        // from dbusmock so instead we copy its (simple) id generation here
-        const auto id = next_id++;
-
-        QSignalSpy notificationsSpy(
-            &notificationsMockInterface(),
-            SIGNAL(MethodCalled(const QString &, const QVariantList &)));
-
-        // start up a UsbSnap to ask about a fingerprint
-        auto snap = std::make_shared<UsbSnap>(test.fingerprint);
-        AdbdClient::PKResponse user_response {};
-        bool user_response_set = false;
-        auto connection = snap->on_user_response().connect([&user_response,&user_response_set](AdbdClient::PKResponse response, bool /*remember*/){
-            user_response = response;
-            user_response_set = true;
-        });
-
-        // test that UsbSnap creates a fdo notification
-        wait_for_signals(notificationsSpy, 1);
-        {
-            QVariantList const& call(notificationsSpy.at(0));
-            EXPECT_EQ("Notify", call.at(0));
-
-            QVariantList const& args(call.at(1).toList());
-            ASSERT_EQ(8, args.size());
-            EXPECT_EQ("", args.at(0)); // app name
-            EXPECT_EQ(0, args.at(1)); // replaces-id
-            EXPECT_EQ("computer-symbolic", args.at(2)); // icon name
-            EXPECT_EQ("Allow USB Debugging?", args.at(3)); // summary
-            EXPECT_EQ(QString::fromUtf8("The computer's RSA key fingerprint is: ") + test.fingerprint, args.at(4)); // body
-            EXPECT_EQ(QStringList({"allow", "Allow", "deny", "Don't Allow"}), args.at(5)); // actions
-            EXPECT_EQ(-1, args.at(7));
-
-            QVariantMap hints;
-            ASSERT_TRUE(qDBusArgumentToMap(args.at(6), hints));
-            ASSERT_EQ(0, hints.size());
-        }
-        notificationsSpy.clear();
-
-        // fake a user interaction with the fdo notification
-        notificationsMockInterface().EmitSignal(
-            DBusNames::Notify::INTERFACE,
-            DBusNames::Notify::ActionInvoked::NAME,
-            "us",
-            QVariantList() << id << test.action_to_invoke);
-
-        // test that UsbSnap emits on_user_response() as a result
-        wait_for([&user_response_set](){return user_response_set;});
-        EXPECT_TRUE(user_response_set);
-        ASSERT_EQ(test.expected_response, user_response);
-
-        // confirm that the snap dtor doesn't try to close
-        // the notification that's already been closed by user choice
-        snap.reset();
-        EXPECT_FALSE(notificationsSpy.wait(1000));
-    }
-}