← Back to branch summary

~mterry/qtmir/report-osk-max-height

« back to all changes in this revision

Viewing changes to tests/modules/Application/application_test.cpp

  • Committer: CI Train Bot
  • Author(s): Michael Terry
  • Date: 2016-04-28 12:48:42 UTC
  • mfrom: (434.4.18 use-ual-info)
  • Revision ID: ci-train-bot@canonical.com-20160428124842-x84nsytuv4n0dsib
Use latest UbuntuAppLaunch API which supports libertine apps.
Approved by: Nick Dedekind

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/modules/Application/application_test.cpp
20
20
#include "qtmir_test.h"
21
21
 
22
22
#include <fake_mirsurface.h>
23
 
#include <fake_desktopfilereader.h>
 
23
#include <fake_application_info.h>
24
24
#include <fake_session.h>
 
25
#include <mock_application_info.h>
25
26
#include <mock_session.h>
26
27
 
27
28
#include <QScopedPointer>
67
68
    {
68
69
        Application *application = new Application(
69
70
                QSharedPointer<MockSharedWakelock>(&sharedWakelock, [](MockSharedWakelock *){}),
70
 
                new FakeDesktopFileReader);
 
71
                QSharedPointer<FakeApplicationInfo>::create());
71
72
 
72
73
        application->setStopTimer(new FakeTimer(fakeTimeSource));
73
74
 
200
201
    EXPECT_CALL(sharedWakelock, acquire(_)).Times(0);
201
202
    EXPECT_CALL(sharedWakelock, release(_)).Times(0);
202
203
 
203
 
    FakeDesktopFileReader *desktopFileReader = new FakeDesktopFileReader;
204
 
    desktopFileReader->m_appId = QString("unity8-dash");
 
204
    auto applicationInfo = QSharedPointer<FakeApplicationInfo>::create();
 
205
    applicationInfo->m_appId = QString("unity8-dash");
205
206
 
206
207
    QScopedPointer<Application> application(new Application(
207
208
                QSharedPointer<MockSharedWakelock>(&sharedWakelock, [](MockSharedWakelock *){}),
208
 
                desktopFileReader));
 
209
                applicationInfo));
209
210
 
210
211
    application->setProcessState(Application::ProcessRunning);
211
212
 
351
352
{
352
353
    using namespace ::testing;
353
354
 
354
 
    auto mockDesktopFileReader = new NiceMock<MockDesktopFileReader>(QString(), QFileInfo());
 
355
    auto mockApplicationInfo = QSharedPointer<MockApplicationInfo>(new NiceMock<MockApplicationInfo>("foo-app"));
355
356
    QScopedPointer<Application> application(new Application(
356
357
            QSharedPointer<MockSharedWakelock>(&sharedWakelock, [](MockSharedWakelock *){}),
357
 
            mockDesktopFileReader, QStringList(), nullptr));
 
358
            mockApplicationInfo, QStringList(), nullptr));
358
359
 
359
 
    ON_CALL(*mockDesktopFileReader, isTouchApp()).WillByDefault(Return(true));
 
360
    ON_CALL(*mockApplicationInfo, isTouchApp()).WillByDefault(Return(true));
360
361
    ASSERT_TRUE(application->isTouchApp());
361
362
 
362
 
    ON_CALL(*mockDesktopFileReader, isTouchApp()).WillByDefault(Return(false));
 
363
    ON_CALL(*mockApplicationInfo, isTouchApp()).WillByDefault(Return(false));
363
364
    ASSERT_FALSE(application->isTouchApp());
364
365
}
365
366