Skip to content

Commit

Permalink
Merge branch 'couple_cleanups' into 'master'
Browse files Browse the repository at this point in the history 
Couple cleanups

See merge request !78
  • Loading branch information
@pvuorela
pvuorela committed Jan 17, 2018
2 parents c49ca59 + 839dd4a commit 6a37b5b
Show file tree
Hide file tree
Showing 5 changed files with 42 additions and 71 deletions.
9 changes: 0 additions & 9 deletions src/compositor/lipstickcompositor.cpp
View file
Expand Up @@ -21,7 +21,6 @@
#include <QDesktopServices>
#include <QtSensors/QOrientationSensor>
#include <QClipboard>
#include <QSettings>
#include <QMimeData>
#include <QtGui/qpa/qplatformnativeinterface.h>
#include "homeapplication.h"
Expand Down Expand Up @@ -71,14 +70,6 @@ LipstickCompositor::LipstickCompositor()
m_orientationLock = new MGConfItem("/lipstick/orientationLock", this);
connect(m_orientationLock, SIGNAL(valueChanged()), SIGNAL(orientationLockChanged()));

// Load legacy settings from the config file and delete it from there
QSettings legacySettings("nemomobile", "lipstick");
QString legacyOrientationKey("Compositor/orientationLock");
if (legacySettings.contains(legacyOrientationKey)) {
m_orientationLock->set(legacySettings.value(legacyOrientationKey));
legacySettings.remove(legacyOrientationKey);
}

connect(this, SIGNAL(visibleChanged(bool)), this, SLOT(onVisibleChanged(bool)));
QObject::connect(this, SIGNAL(afterRendering()), this, SLOT(windowSwapped()));
QObject::connect(HomeApplication::instance(), SIGNAL(aboutToDestroy()), this, SLOT(homeApplicationAboutToDestroy()));
Expand Down
11 changes: 4 additions & 7 deletions src/notifications/notificationpreviewpresenter.cpp
View file
Expand Up @@ -69,8 +69,6 @@ NotificationPreviewPresenter::NotificationPreviewPresenter(
this, [=](uint id) {
removeNotification(id);
});
connect(this, &NotificationPreviewPresenter::notificationPresented,
m_notificationFeedbackPlayer, &NotificationFeedbackPlayer::addNotification);
QTimer::singleShot(0, this, SLOT(createWindowIfNecessary()));
}

Expand Down Expand Up @@ -115,8 +113,7 @@ void NotificationPreviewPresenter::showNextNotification()

if (!show) {
if (m_deviceLock->state() != NemoDeviceLock::DeviceLock::ManagerLockout) { // Suppress feedback if locked out.
// Don't show the notification but just remove it from the queue
emit notificationPresented(notification->id());
m_notificationFeedbackPlayer->addNotification(notification->id());
}

setCurrentNotification(0);
Expand All @@ -128,7 +125,7 @@ void NotificationPreviewPresenter::showNextNotification()
m_window->show();
}

emit notificationPresented(notification->id());
m_notificationFeedbackPlayer->addNotification(notification->id());

setCurrentNotification(notification);
}
Expand Down Expand Up @@ -156,9 +153,9 @@ void NotificationPreviewPresenter::updateNotification(uint id)
}
}
} else {
// Remove updated notification only from the queue so that a currently visible notification won't suddenly disappear
emit notificationPresented(id);
m_notificationFeedbackPlayer->addNotification(id);

// Remove updated notification only from the queue so that a currently visible notification won't suddenly disappear
removeNotification(id, true);

if (m_currentNotification != notification) {
Expand Down
16 changes: 2 additions & 14 deletions src/notifications/notificationpreviewpresenter.h
View file
Expand Up @@ -42,17 +42,8 @@ class LIPSTICK_EXPORT NotificationPreviewPresenter : public QObject
Q_PROPERTY(LipstickNotification *notification READ notification NOTIFY notificationChanged)

public:
/*!
* Creates a notification preview presenter.
*
* \param parent the parent object
*/
explicit NotificationPreviewPresenter(
ScreenLock *screenLock, NemoDeviceLock::DeviceLock *deviceLock, QObject *parent = 0);

/*!
* Destroys the notification preview presenter.
*/
explicit NotificationPreviewPresenter(ScreenLock *screenLock, NemoDeviceLock::DeviceLock *deviceLock,
QObject *parent = 0);
virtual ~NotificationPreviewPresenter();

/*!
Expand All @@ -67,9 +58,6 @@ class LIPSTICK_EXPORT NotificationPreviewPresenter : public QObject
//! Sent when the notification to be shown has changed.
void notificationChanged();

//! Sent when a notification is considered presented by the presenter
void notificationPresented(uint id);

public slots:
/*!
* Shows the next notification to be shown, if any. If the notification
Expand Down
76 changes: 36 additions & 40 deletions tests/ut_notificationpreviewpresenter/ut_notificationpreviewpresenter.cpp
View file
Expand Up @@ -166,6 +166,16 @@ void NotificationManager::reportModifications()
{
}

static int playedFeedbacks()
{
return gNotificationFeedbackPlayerStub->stubCallsTo("addNotification").count();
}

static uint lastFeedbackId()
{
return gNotificationFeedbackPlayerStub->stubLastCallTo("addNotification").parameter<uint>(0);
}

enum Urgency { Low = 0, Normal = 1, Critical = 2 };

LipstickNotification *createNotification(uint id, Urgency urgency = Normal)
Expand Down Expand Up @@ -197,6 +207,7 @@ void Ut_NotificationPreviewPresenter::init()
touchScreen = new TouchScreen;
screenLock = new ScreenLock(touchScreen);
deviceLock = new NemoDeviceLock::DeviceLock;
gNotificationFeedbackPlayerStub->stubReset();
}

void Ut_NotificationPreviewPresenter::cleanup()
Expand All @@ -214,19 +225,10 @@ void Ut_NotificationPreviewPresenter::cleanup()
gQmDisplayStateStub->stubReset();
}

void Ut_NotificationPreviewPresenter::testSignalConnections()
{
NotificationPreviewPresenter presenter(screenLock, deviceLock);
QCOMPARE(disconnect(NotificationManager::instance(), SIGNAL(notificationAdded(uint)), &presenter, SLOT(updateNotification(uint))), true);
QCOMPARE(disconnect(NotificationManager::instance(), SIGNAL(notificationRemoved(uint)), &presenter, SLOT(removeNotification(uint))), true);
QCOMPARE(disconnect(&presenter, SIGNAL(notificationPresented(uint)), presenter.m_notificationFeedbackPlayer, SLOT(addNotification(uint))), true);
}

void Ut_NotificationPreviewPresenter::testAddNotificationWhenWindowNotOpen()
{
NotificationPreviewPresenter presenter(screenLock, deviceLock);
QSignalSpy changedSpy(&presenter, SIGNAL(notificationChanged()));
QSignalSpy presentedSpy(&presenter, SIGNAL(notificationPresented(uint)));

// Check that the window is not automatically created
QCOMPARE(homeWindows.isEmpty(), true);
Expand All @@ -252,15 +254,14 @@ void Ut_NotificationPreviewPresenter::testAddNotificationWhenWindowNotOpen()
// Check that the expected notification is signaled onwards
QCOMPARE(changedSpy.count(), 1);
QCOMPARE(presenter.notification(), notification);
QCOMPARE(presentedSpy.count(), 1);
QCOMPARE(presentedSpy.last().at(0).toUInt(), (uint)1);
QCOMPARE(playedFeedbacks(), 1);
QCOMPARE(lastFeedbackId(), (uint)1);
}

void Ut_NotificationPreviewPresenter::testAddNotificationWhenWindowAlreadyOpen()
{
NotificationPreviewPresenter presenter(screenLock, deviceLock);
QSignalSpy changedSpy(&presenter, SIGNAL(notificationChanged()));
QSignalSpy presentedSpy(&presenter, SIGNAL(notificationPresented(uint)));

// Create a notification: this will create a window
createNotification(1);
Expand All @@ -275,8 +276,8 @@ void Ut_NotificationPreviewPresenter::testAddNotificationWhenWindowAlreadyOpen()

// The second notification should not be signaled onwards yet since the first one is being presented
QCOMPARE(changedSpy.count(), 1);
QCOMPARE(presentedSpy.count(), 1);
QCOMPARE(presentedSpy.last().at(0).toUInt(), (uint)1);
QCOMPARE(playedFeedbacks(), 1);
QCOMPARE(lastFeedbackId(), (uint)1);

// Show the next notification
presenter.showNextNotification();
Expand All @@ -287,8 +288,8 @@ void Ut_NotificationPreviewPresenter::testAddNotificationWhenWindowAlreadyOpen()
// Check that the expected notification is signaled onwards
QCOMPARE(changedSpy.count(), 2);
QCOMPARE(presenter.notification(), notification);
QCOMPARE(presentedSpy.count(), 2);
QCOMPARE(presentedSpy.last().at(0).toUInt(), (uint)2);
QCOMPARE(playedFeedbacks(), 2);
QCOMPARE(lastFeedbackId(), (uint)2);
}

void Ut_NotificationPreviewPresenter::testUpdateNotification()
Expand All @@ -303,13 +304,13 @@ void Ut_NotificationPreviewPresenter::testUpdateNotification()

// Update both notifications
QSignalSpy changedSpy(&presenter, SIGNAL(notificationChanged()));
QSignalSpy presentedSpy(&presenter, SIGNAL(notificationPresented(uint)));
gNotificationFeedbackPlayerStub->stubReset();
presenter.updateNotification(1);
presenter.updateNotification(2);

// Check that no signals were sent
QCOMPARE(changedSpy.count(), 0);
QCOMPARE(presentedSpy.count(), 0);
QCOMPARE(playedFeedbacks(), 0);
}

void Ut_NotificationPreviewPresenter::testRemoveNotification()
Expand Down Expand Up @@ -352,7 +353,7 @@ void Ut_NotificationPreviewPresenter::testNotificationNotShownIfNoSummaryOrBody_
QTest::addColumn<QString>("previewSummary");
QTest::addColumn<QString>("previewBody");
QTest::addColumn<int>("changedSignalCount");
QTest::addColumn<int>("presentedSignalCount");
QTest::addColumn<int>("playedFeedbackCount");
QTest::addColumn<bool>("windowVisible");
QTest::newRow("No summary, no body") << "" << "" << 0 << 1 << false;
QTest::newRow("Summary, no body") << "summary" << "" << 1 << 1 << true;
Expand All @@ -365,12 +366,11 @@ void Ut_NotificationPreviewPresenter::testNotificationNotShownIfNoSummaryOrBody(
QFETCH(QString, previewSummary);
QFETCH(QString, previewBody);
QFETCH(int, changedSignalCount);
QFETCH(int, presentedSignalCount);
QFETCH(int, playedFeedbackCount);
QFETCH(bool, windowVisible);

NotificationPreviewPresenter presenter(screenLock, deviceLock);
QSignalSpy changedSpy(&presenter, SIGNAL(notificationChanged()));
QSignalSpy presentedSpy(&presenter, SIGNAL(notificationPresented(uint)));

// Create notification
QVariantHash hints;
Expand All @@ -383,7 +383,7 @@ void Ut_NotificationPreviewPresenter::testNotificationNotShownIfNoSummaryOrBody(

// Check whether the expected notification is signaled onwards
QCOMPARE(changedSpy.count(), changedSignalCount);
QCOMPARE(presentedSpy.count(), presentedSignalCount);
QCOMPARE(playedFeedbacks(), playedFeedbackCount);

QCOMPARE(homeWindowVisible.isEmpty(), !windowVisible);
if (windowVisible) {
Expand All @@ -396,7 +396,6 @@ void Ut_NotificationPreviewPresenter::testNotificationNotShownIfHidden()
{
NotificationPreviewPresenter presenter(screenLock, deviceLock);
QSignalSpy changedSpy(&presenter, SIGNAL(notificationChanged()));
QSignalSpy presentedSpy(&presenter, SIGNAL(notificationPresented(uint)));

// Create notification
QVariantHash hints;
Expand All @@ -411,15 +410,14 @@ void Ut_NotificationPreviewPresenter::testNotificationNotShownIfHidden()
QCOMPARE(homeWindowVisible.isEmpty(), true);

// The notification should be considered presented
QCOMPARE(presentedSpy.count(), 1);
QCOMPARE(presentedSpy.last().at(0).toUInt(), (uint)1);
QCOMPARE(playedFeedbacks(), 1);
QCOMPARE(lastFeedbackId(), (uint)1);
}

void Ut_NotificationPreviewPresenter::testNotificationNotShownIfRestored()
{
NotificationPreviewPresenter presenter(screenLock, deviceLock);
QSignalSpy changedSpy(&presenter, SIGNAL(notificationChanged()));
QSignalSpy presentedSpy(&presenter, SIGNAL(notificationPresented(uint)));

// Create notification
QVariantHash hints;
Expand All @@ -434,15 +432,14 @@ void Ut_NotificationPreviewPresenter::testNotificationNotShownIfRestored()
QCOMPARE(homeWindowVisible.isEmpty(), true);

// The notification should be considered presented
QCOMPARE(presentedSpy.count(), 1);
QCOMPARE(presentedSpy.last().at(0).toUInt(), (uint)1);
QCOMPARE(playedFeedbacks(), 1);
QCOMPARE(lastFeedbackId(), (uint)1);
}

void Ut_NotificationPreviewPresenter::testShowingOnlyCriticalNotifications()
{
NotificationPreviewPresenter presenter(screenLock, deviceLock);
QSignalSpy changedSpy(&presenter, SIGNAL(notificationChanged()));
QSignalSpy presentedSpy(&presenter, SIGNAL(notificationPresented(uint)));

// Create normal urgency notification
QVariantHash hints;
Expand All @@ -461,8 +458,8 @@ void Ut_NotificationPreviewPresenter::testShowingOnlyCriticalNotifications()
QCOMPARE(homeWindowVisible.isEmpty(), true);

// The notification should be considered presented
QCOMPARE(presentedSpy.count(), 1);
QCOMPARE(presentedSpy.last().at(0).toUInt(), (uint)1);
QCOMPARE(playedFeedbacks(), 1);
QCOMPARE(lastFeedbackId(), (uint)1);

// Urgency set to critical, so the notification should be shown
hints.insert(LipstickNotification::HINT_URGENCY, 2);
Expand All @@ -471,8 +468,8 @@ void Ut_NotificationPreviewPresenter::testShowingOnlyCriticalNotifications()
QCOMPARE(changedSpy.count(), 1);
QCOMPARE(homeWindowVisible.isEmpty(), false);
QCOMPARE(homeWindowVisible[homeWindows.first()], true);
QCOMPARE(presentedSpy.count(), 2);
QCOMPARE(presentedSpy.last().at(0).toUInt(), (uint)1);
QCOMPARE(playedFeedbacks(), 2);
QCOMPARE(lastFeedbackId(), (uint)1);
}

void Ut_NotificationPreviewPresenter::testUpdateNotificationRemovesNotificationFromQueueIfNotShowable()
Expand All @@ -488,7 +485,7 @@ void Ut_NotificationPreviewPresenter::testUpdateNotificationRemovesNotificationF

// Update the notifications to have no summary or body
QSignalSpy changedSpy(&presenter, SIGNAL(notificationChanged()));
QSignalSpy presentedSpy(&presenter, SIGNAL(notificationPresented(uint)));
gNotificationFeedbackPlayerStub->stubReset();
notification1->setHints(QVariantHash());
notification2->setHints(QVariantHash());
presenter.updateNotification(1);
Expand All @@ -498,13 +495,13 @@ void Ut_NotificationPreviewPresenter::testUpdateNotificationRemovesNotificationF
QCOMPARE(changedSpy.count(), 0);

// The notifications should be considered presented
QCOMPARE(presentedSpy.count(), 2);
QCOMPARE(playedFeedbacks(), 2);

// Check that the other notification is removed from the queue
presenter.showNextNotification();
QCOMPARE(changedSpy.count(), 1);
QCOMPARE(presenter.notification(), (LipstickNotification *)0);
QCOMPARE(presentedSpy.count(), 2);
QCOMPARE(playedFeedbacks(), 2);
}

Q_DECLARE_METATYPE(MeeGo::QmDisplayState::DisplayState)
Expand All @@ -515,7 +512,7 @@ void Ut_NotificationPreviewPresenter::testNotificationNotShownIfTouchScreenIsLoc
QTest::addColumn<NemoDeviceLock::DeviceLock::LockState>("lockState");
QTest::addColumn<int>("urgency");
QTest::addColumn<int>("notifications");
QTest::addColumn<int>("presentedCount");
QTest::addColumn<int>("playedFeedbackCount");
QTest::newRow("Display on, touch screen not locked") << MeeGo::QmDisplayState::On << NemoDeviceLock::DeviceLock::Unlocked << static_cast<int>(Normal) << 1 << 1;
QTest::newRow("Display on, touch screen locked") << MeeGo::QmDisplayState::On << NemoDeviceLock::DeviceLock::Locked << static_cast<int>(Normal) << 0 << 1;
QTest::newRow("Display off, touch screen not locked") << MeeGo::QmDisplayState::Off << NemoDeviceLock::DeviceLock::Unlocked << static_cast<int>(Normal) << 1 << 1;
Expand All @@ -532,21 +529,20 @@ void Ut_NotificationPreviewPresenter::testNotificationNotShownIfTouchScreenIsLoc
QFETCH(NemoDeviceLock::DeviceLock::LockState, lockState);
QFETCH(int, urgency);
QFETCH(int, notifications);
QFETCH(int, presentedCount);
QFETCH(int, playedFeedbackCount);

gQmDisplayStateStub->stubSetReturnValue("get", displayState);
deviceLock->setState(lockState);

NotificationPreviewPresenter presenter(screenLock, deviceLock);
QSignalSpy changedSpy(&presenter, SIGNAL(notificationChanged()));
QSignalSpy presentedSpy(&presenter, SIGNAL(notificationPresented(uint)));

createNotification(1, static_cast<Urgency>(urgency));
QTest::qWait(0);
presenter.updateNotification(1);
QCOMPARE(homeWindowVisible.count(), notifications);
QCOMPARE(changedSpy.count(), notifications);
QCOMPARE(presentedSpy.count(), presentedCount);
QCOMPARE(playedFeedbacks(), playedFeedbackCount);
}

void Ut_NotificationPreviewPresenter::testCriticalNotificationIsMarkedAfterShowing()
Expand Down
1 change: 0 additions & 1 deletion tests/ut_notificationpreviewpresenter/ut_notificationpreviewpresenter.h
View file
Expand Up @@ -33,7 +33,6 @@ private slots:
void initTestCase();
void init();
void cleanup();
void testSignalConnections();
void testAddNotificationWhenWindowNotOpen();
void testAddNotificationWhenWindowAlreadyOpen();
void testUpdateNotification();
Expand Down

0 comments on commit 6a37b5b

Please sign in to comment.