From e1c1a9ae367c53561cdb4f53ad8589e2bc859b0b Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 20 Apr 2016 19:57:03 -0500 Subject: add unit tests for greeter --- tests/unit/CMakeLists.txt | 5 ++ tests/unit/greeter-test.cpp | 151 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 156 insertions(+) create mode 100644 tests/unit/greeter-test.cpp (limited to 'tests/unit') diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt index fe70461..9d8cad2 100644 --- a/tests/unit/CMakeLists.txt +++ b/tests/unit/CMakeLists.txt @@ -14,6 +14,10 @@ set(TEST_LINK_LIBRARIES ${GMOCK_LIBRARIES} ) +add_definitions( + -DGREETER_TEMPLATE="${CMAKE_SOURCE_DIR}/tests/utils/mock-unity-greeter.py" +) + function(add_test_by_name name) set(TEST_NAME ${name}) add_executable (${TEST_NAME} ${TEST_NAME}.cpp) @@ -31,4 +35,5 @@ function(add_qt_test_by_name 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) diff --git a/tests/unit/greeter-test.cpp b/tests/unit/greeter-test.cpp new file mode 100644 index 0000000..5d29023 --- /dev/null +++ b/tests/unit/greeter-test.cpp @@ -0,0 +1,151 @@ +/* + * 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 . + * + * Authors: + * Charles Kerr + */ + +#include + +#include +#include + +#include +#include +#include + +class GreeterFixture: public QtFixture +{ +private: + + using super = QtFixture; + +public: + + GreeterFixture() =default; + ~GreeterFixture() =default; + +protected: + + std::shared_ptr m_dbus_runner; + std::shared_ptr m_dbus_mock; + GDBusConnection* m_session_bus; + + void SetUp() override + { + super::SetUp(); + + // use a fresh bus for each test + + m_dbus_runner.reset(new QtDBusTest::DBusTestRunner()); + m_dbus_mock.reset(new QtDBusMock::DBusMock(*m_dbus_runner.get())); + + GError* error {}; + m_session_bus = g_bus_get_sync(G_BUS_TYPE_SESSION, nullptr, &error); + g_assert_no_error(error); + g_dbus_connection_set_exit_on_close(m_session_bus, false); + } + + void TearDown() override + { + g_clear_object(&m_session_bus); + m_dbus_mock.reset(); + m_dbus_runner.reset(); + + super::TearDown(); + } + + void start_greeter_service(bool is_active) + { + // set a watcher to look for our mock to appear + bool owned {}; + QDBusServiceWatcher watcher( + DBusNames::UnityGreeter::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::UnityGreeter::NAME, + GREETER_TEMPLATE, + parameters, + QDBusConnection::SessionBus + ); + m_dbus_runner->startServices(); + + // wait for the watcher to be triggered + ASSERT_TRUE(wait_for([&owned]{return owned;})); + } +}; + +#define ASSERT_PROPERTY_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_F(GreeterFixture, ActiveServiceStartsBeforeWatcher) +{ + constexpr bool expected {true}; + + start_greeter_service(expected); + + UnityGreeter greeter(m_session_bus); + + ASSERT_PROPERTY_EVENTUALLY(expected, greeter.is_active()); +} + +TEST_F(GreeterFixture, WatcherStartsBeforeActiveService) +{ + constexpr bool expected {true}; + + UnityGreeter greeter(m_session_bus); + + start_greeter_service(expected); + + ASSERT_PROPERTY_EVENTUALLY(expected, greeter.is_active()); +} + +TEST_F(GreeterFixture, InactiveServiceStartsBeforeWatcher) +{ + constexpr bool expected {false}; + + start_greeter_service(expected); + + UnityGreeter greeter(m_session_bus); + + ASSERT_PROPERTY_EVENTUALLY(expected, greeter.is_active()); +} + +TEST_F(GreeterFixture, WatcherStartsBeforeInactiveService) +{ + constexpr bool expected {false}; + + UnityGreeter greeter(m_session_bus); + + start_greeter_service(expected); + + ASSERT_PROPERTY_EVENTUALLY(expected, greeter.is_active()); +} + -- cgit v1.2.3 From 3b84a37b2caae0c7c971b3c7cc5df9be1319a5ac Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Thu, 21 Apr 2016 09:19:25 -0500 Subject: don't pass a GDBusConnection to the Greeter ctor --- tests/unit/greeter-test.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tests/unit') diff --git a/tests/unit/greeter-test.cpp b/tests/unit/greeter-test.cpp index 5d29023..874efed 100644 --- a/tests/unit/greeter-test.cpp +++ b/tests/unit/greeter-test.cpp @@ -41,7 +41,7 @@ protected: std::shared_ptr m_dbus_runner; std::shared_ptr m_dbus_mock; - GDBusConnection* m_session_bus; + GDBusConnection* m_session_bus {}; void SetUp() override { @@ -111,7 +111,7 @@ TEST_F(GreeterFixture, ActiveServiceStartsBeforeWatcher) start_greeter_service(expected); - UnityGreeter greeter(m_session_bus); + UnityGreeter greeter; ASSERT_PROPERTY_EVENTUALLY(expected, greeter.is_active()); } @@ -120,7 +120,7 @@ TEST_F(GreeterFixture, WatcherStartsBeforeActiveService) { constexpr bool expected {true}; - UnityGreeter greeter(m_session_bus); + UnityGreeter greeter; start_greeter_service(expected); @@ -133,7 +133,7 @@ TEST_F(GreeterFixture, InactiveServiceStartsBeforeWatcher) start_greeter_service(expected); - UnityGreeter greeter(m_session_bus); + UnityGreeter greeter; ASSERT_PROPERTY_EVENTUALLY(expected, greeter.is_active()); } @@ -142,7 +142,7 @@ TEST_F(GreeterFixture, WatcherStartsBeforeInactiveService) { constexpr bool expected {false}; - UnityGreeter greeter(m_session_bus); + UnityGreeter greeter; start_greeter_service(expected); -- cgit v1.2.3 From d4e82e7d4fa1937d27d1397a036af2b6b03349b3 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Thu, 21 Apr 2016 09:33:08 -0500 Subject: code cleanup to prepare for MR --- tests/unit/greeter-test.cpp | 40 +++++++++++++++------------------------- 1 file changed, 15 insertions(+), 25 deletions(-) (limited to 'tests/unit') diff --git a/tests/unit/greeter-test.cpp b/tests/unit/greeter-test.cpp index 874efed..b33c300 100644 --- a/tests/unit/greeter-test.cpp +++ b/tests/unit/greeter-test.cpp @@ -41,35 +41,19 @@ protected: std::shared_ptr m_dbus_runner; std::shared_ptr m_dbus_mock; - GDBusConnection* m_session_bus {}; void SetUp() override { super::SetUp(); - // use a fresh bus for each test - + // 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_session_bus = g_bus_get_sync(G_BUS_TYPE_SESSION, nullptr, &error); - g_assert_no_error(error); - g_dbus_connection_set_exit_on_close(m_session_bus, false); - } - - void TearDown() override - { - g_clear_object(&m_session_bus); - m_dbus_mock.reset(); - m_dbus_runner.reset(); - - super::TearDown(); } void start_greeter_service(bool is_active) { - // set a watcher to look for our mock to appear + // set a watcher to look for our mock greeter to appear bool owned {}; QDBusServiceWatcher watcher( DBusNames::UnityGreeter::NAME, @@ -92,19 +76,25 @@ protected: ); m_dbus_runner->startServices(); - // wait for the watcher to be triggered + // wait for the watcher ASSERT_TRUE(wait_for([&owned]{return owned;})); } }; -#define ASSERT_PROPERTY_EVENTUALLY(expected_in, property_in) \ +#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(); })) \ + 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 expected {true}; @@ -113,7 +103,7 @@ TEST_F(GreeterFixture, ActiveServiceStartsBeforeWatcher) UnityGreeter greeter; - ASSERT_PROPERTY_EVENTUALLY(expected, greeter.is_active()); + ASSERT_PROPERTY_EQ_EVENTUALLY(expected, greeter.is_active()); } TEST_F(GreeterFixture, WatcherStartsBeforeActiveService) @@ -124,7 +114,7 @@ TEST_F(GreeterFixture, WatcherStartsBeforeActiveService) start_greeter_service(expected); - ASSERT_PROPERTY_EVENTUALLY(expected, greeter.is_active()); + ASSERT_PROPERTY_EQ_EVENTUALLY(expected, greeter.is_active()); } TEST_F(GreeterFixture, InactiveServiceStartsBeforeWatcher) @@ -135,7 +125,7 @@ TEST_F(GreeterFixture, InactiveServiceStartsBeforeWatcher) UnityGreeter greeter; - ASSERT_PROPERTY_EVENTUALLY(expected, greeter.is_active()); + ASSERT_PROPERTY_EQ_EVENTUALLY(expected, greeter.is_active()); } TEST_F(GreeterFixture, WatcherStartsBeforeInactiveService) @@ -146,6 +136,6 @@ TEST_F(GreeterFixture, WatcherStartsBeforeInactiveService) start_greeter_service(expected); - ASSERT_PROPERTY_EVENTUALLY(expected, greeter.is_active()); + ASSERT_PROPERTY_EQ_EVENTUALLY(expected, greeter.is_active()); } -- cgit v1.2.3 From b37db33c628675971f118fb3e241dc32a9f0a5d0 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Thu, 21 Apr 2016 11:22:56 -0500 Subject: tell glib not to exit when the gdbusconnection is closed --- tests/unit/greeter-test.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'tests/unit') diff --git a/tests/unit/greeter-test.cpp b/tests/unit/greeter-test.cpp index b33c300..72df3bc 100644 --- a/tests/unit/greeter-test.cpp +++ b/tests/unit/greeter-test.cpp @@ -41,6 +41,7 @@ protected: std::shared_ptr m_dbus_runner; std::shared_ptr m_dbus_mock; + GDBusConnection* m_bus {}; void SetUp() override { @@ -49,6 +50,18 @@ protected: // 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) -- cgit v1.2.3 From ce5234162fa0c534ff9abf3fce3d03f4b01e893e Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Fri, 22 Apr 2016 09:43:44 -0500 Subject: don't prompt when the greeter's not running yet: change greeter's payload from an 'is_active' bool to a three-value state of active, inactive, and unavailable --- tests/unit/greeter-test.cpp | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) (limited to 'tests/unit') diff --git a/tests/unit/greeter-test.cpp b/tests/unit/greeter-test.cpp index 72df3bc..bfa88e8 100644 --- a/tests/unit/greeter-test.cpp +++ b/tests/unit/greeter-test.cpp @@ -18,6 +18,7 @@ */ #include +#include #include #include @@ -110,45 +111,49 @@ protected: TEST_F(GreeterFixture, ActiveServiceStartsBeforeWatcher) { - constexpr bool expected {true}; + constexpr bool is_active {true}; + constexpr Greeter::State expected {Greeter::State::ACTIVE}; - start_greeter_service(expected); + start_greeter_service(is_active); UnityGreeter greeter; - ASSERT_PROPERTY_EQ_EVENTUALLY(expected, greeter.is_active()); + ASSERT_PROPERTY_EQ_EVENTUALLY(expected, greeter.state()); } TEST_F(GreeterFixture, WatcherStartsBeforeActiveService) { - constexpr bool expected {true}; + constexpr bool is_active {true}; + constexpr Greeter::State expected {Greeter::State::ACTIVE}; UnityGreeter greeter; - start_greeter_service(expected); + start_greeter_service(is_active); - ASSERT_PROPERTY_EQ_EVENTUALLY(expected, greeter.is_active()); + ASSERT_PROPERTY_EQ_EVENTUALLY(expected, greeter.state()); } TEST_F(GreeterFixture, InactiveServiceStartsBeforeWatcher) { - constexpr bool expected {false}; + constexpr bool is_active {false}; + constexpr Greeter::State expected {Greeter::State::INACTIVE}; - start_greeter_service(expected); + start_greeter_service(is_active); UnityGreeter greeter; - ASSERT_PROPERTY_EQ_EVENTUALLY(expected, greeter.is_active()); + ASSERT_PROPERTY_EQ_EVENTUALLY(expected, greeter.state()); } TEST_F(GreeterFixture, WatcherStartsBeforeInactiveService) { - constexpr bool expected {false}; + constexpr bool is_active {false}; + constexpr Greeter::State expected {Greeter::State::INACTIVE}; UnityGreeter greeter; - start_greeter_service(expected); + start_greeter_service(is_active); - ASSERT_PROPERTY_EQ_EVENTUALLY(expected, greeter.is_active()); + ASSERT_PROPERTY_EQ_EVENTUALLY(expected, greeter.state()); } -- cgit v1.2.3 From ccfe9ef48c6e072f5d0ec9918de90213a2f4a7ee Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 27 Apr 2016 10:40:05 +0200 Subject: sync tests to r33 changes --- tests/unit/usb-snap-test.cpp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'tests/unit') diff --git a/tests/unit/usb-snap-test.cpp b/tests/unit/usb-snap-test.cpp index 3b778dd..6cfbbd9 100644 --- a/tests/unit/usb-snap-test.cpp +++ b/tests/unit/usb-snap-test.cpp @@ -130,14 +130,9 @@ TEST_F(UsbSnapFixture, TestRoundTrip) EXPECT_TRUE(user_response_set); ASSERT_EQ(test.expected_response, user_response); - // confirm that the snap dtor cleans up the notification + // confirm that the snap dtor doesn't try to close + // the notification that's already been closed by user choice snap.reset(); - wait_for_signals(notificationsSpy, 1); - { - QVariantList const& call(notificationsSpy.at(0)); - EXPECT_EQ("CloseNotification", call.at(0)); - QVariantList const& args(call.at(1).toList()); - EXPECT_EQ(id, args.at(0)); - } + EXPECT_FALSE(notificationsSpy.wait(1000)); } } -- cgit v1.2.3