← Back to branch summary

~mir-team/qtmir/devel-mir-next

« back to all changes in this revision

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

  • Committer: Bileto Bot
  • Author(s): Daniel d'Andrada
  • Date: 2017-04-04 00:47:00 UTC
  • mfrom: (635.1.4 multiSessionApp)
  • Revision ID: ci-train-bot@canonical.com-20170404004700-q2uj3aczaea0d57x
Support multiple sessions per Application (LP: #1675448)

Approved by: Gerry Boland, Unity8 CI Bot

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/modules/Application/application_test.cpp
49
49
    inline void suspend(Application *application)
50
50
    {
51
51
        application->setRequestedState(Application::RequestedSuspended);
52
 
        auto session = dynamic_cast<Session*>(application->session());
 
52
        auto session = dynamic_cast<Session*>(application->sessions()[0]);
53
53
 
54
54
        ASSERT_EQ(Application::InternalState::SuspendingWaitSession, application->internalState());
55
55
        ASSERT_EQ(Session::Suspending, session->state());
115
115
 
116
116
    FakeSession *session = new FakeSession;
117
117
 
118
 
    application->setSession(session);
 
118
    application->addSession(session);
119
119
 
120
120
    ASSERT_EQ(Application::InternalState::Starting, application->internalState());
121
121
 
150
150
 
151
151
    // Get it running and then suspend it
152
152
    application->setProcessState(Application::ProcessRunning);
153
 
    application->setSession(session);
 
153
    application->addSession(session);
154
154
    session->setState(SessionInterface::Running);
155
155
    application->setRequestedState(Application::RequestedSuspended);
156
156
    session->setState(SessionInterface::Suspended);
175
175
 
176
176
    // Get it running, suspend it, and finally stop it
177
177
    application->setProcessState(Application::ProcessRunning);
178
 
    application->setSession(session);
 
178
    application->addSession(session);
179
179
    session->setState(SessionInterface::Running);
180
180
    application->setRequestedState(Application::RequestedSuspended);
181
181
    session->setState(SessionInterface::Suspended);
215
215
 
216
216
    FakeSession *session = new FakeSession;
217
217
 
218
 
    application->setSession(session);
 
218
    application->addSession(session);
219
219
 
220
220
    ASSERT_EQ(Application::InternalState::Starting, application->internalState());
221
221
 
250
250
    application->setProcessState(Application::ProcessRunning);
251
251
 
252
252
    FakeSession *session = new FakeSession;
253
 
    application->setSession(session);
 
253
    application->addSession(session);
254
254
 
255
255
    QSignalSpy spyAppStopped(application.data(), SIGNAL(stopped()));
256
256
 
283
283
    application->setProcessState(Application::ProcessRunning);
284
284
 
285
285
    Session *session = createSessionWithFakes();
286
 
    application->setSession(session);
 
286
    application->addSession(session);
287
287
 
288
288
    QSignalSpy spyAppStopped(application.data(), SIGNAL(stopped()));
289
289
 
318
318
    application->setProcessState(Application::ProcessRunning);
319
319
 
320
320
    FakeSession *session = new FakeSession;
321
 
    application->setSession(session);
 
321
    application->addSession(session);
322
322
 
323
323
    QSignalSpy spyAppStopped(application.data(), SIGNAL(stopped()));
324
324
 
380
380
 
381
381
    Session *session = createSessionWithFakes();
382
382
 
383
 
    application->setSession(session);
 
383
    application->addSession(session);
384
384
 
385
385
    FakeMirSurface *surface = new FakeMirSurface;
386
386
    session->registerSurface(surface);
437
437
 
438
438
    Session *session = createSessionWithFakes();
439
439
 
440
 
    application->setSession(session);
 
440
    application->addSession(session);
441
441
 
442
442
    FakeMirSurface *surface = new FakeMirSurface;
443
443
    session->registerSurface(surface);
488
488
 
489
489
    QPointer<Session> session(createSessionWithFakes());
490
490
 
491
 
    application->setSession(session);
 
491
    application->addSession(session);
492
492
 
493
493
    FakeMirSurface *surface = new FakeMirSurface;
494
494
    session->registerSurface(surface);
532
532
    application->setProcessState(Application::ProcessRunning);
533
533
 
534
534
    QPointer<Session> session(createSessionWithFakes());
535
 
    application->setSession(session);
 
535
    application->addSession(session);
536
536
 
537
537
    FakeMirSurface *surface = new FakeMirSurface;
538
538
    session->registerSurface(surface);
570
570
 
571
571
    Session *session = createSessionWithFakes();
572
572
 
573
 
    application->setSession(session);
 
573
    application->addSession(session);
574
574
 
575
575
    FakeMirSurface *surface = new FakeMirSurface;
576
576
    session->registerSurface(surface);
602
602
    application->setProcessState(Application::ProcessRunning);
603
603
    Session *session = createSessionWithFakes();
604
604
 
605
 
    application->setSession(session);
 
605
    application->addSession(session);
606
606
 
607
607
    QSignalSpy surfaceCountChangedSpy(application.data(), &Application::surfaceCountChanged);
608
608
 
641
641
 
642
642
    FakeSession *session = new FakeSession;
643
643
 
644
 
    application->setSession(session);
 
644
    application->addSession(session);
645
645
 
646
646
    QSignalSpy spyStartProcess(application.data(), SIGNAL(startProcessRequested()));
647
647