← Back to branch summary

~ci-train-bot/qtmir/qtmir-ubuntu-yakkety-landing-047

« back to all changes in this revision

Viewing changes to tests/modules/ApplicationManager/application_manager_test.cpp

  • Committer: CI Train Bot
  • Author(s): Daniel d'Andrada
  • Date: 2016-05-20 08:41:17 UTC
  • mfrom: (482.2.2 bogusRespawn-lp1575577)
  • Revision ID: ci-train-bot@canonical.com-20160520084117-uj7qmbt7dd1mwdnk
Application: Don't respawn if closed while still starting up

+ refactoring of Application::onSessionStateChanged to explicitly cover every single internal state on session stopping. Fixes: #1575577
Approved by: Gerry Boland, Unity8 CI Bot, Michael Terry

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/modules/ApplicationManager/application_manager_test.cpp
437
437
    EXPECT_EQ(Application::Starting, theApp->state());
438
438
    EXPECT_EQ(appId, theApp->appId());
439
439
    EXPECT_EQ(name, theApp->name());
440
 
    EXPECT_FALSE(theApp->canBeResumed());
 
440
    EXPECT_EQ(Application::ProcessUnknown, theApp->processState());
441
441
 
442
442
    // check signals were emitted
443
443
    EXPECT_EQ(2, countSpy.count()); //FIXME(greyback)
478
478
    EXPECT_EQ(Application::Starting, theApp->state());
479
479
    EXPECT_EQ(appId, theApp->appId());
480
480
    EXPECT_EQ(name, theApp->name());
481
 
    EXPECT_EQ(true, theApp->canBeResumed());
 
481
    EXPECT_NE(Application::ProcessUnknown, theApp->processState());
482
482
 
483
483
    // check signals were emitted
484
484
    EXPECT_EQ(2, countSpy.count()); //FIXME(greyback)
525
525
    EXPECT_EQ(theApp->state(), Application::Starting);
526
526
    EXPECT_EQ(theApp->appId(), appId);
527
527
    EXPECT_EQ(theApp->name(), name);
528
 
    EXPECT_EQ(theApp->canBeResumed(), false);
 
528
    EXPECT_EQ(theApp->processState(), Application::ProcessUnknown);
529
529
 
530
530
    // check signals were emitted
531
531
    EXPECT_EQ(countSpy.count(), 2); //FIXME(greyback)
597
597
    EXPECT_EQ(theApp->state(), Application::Starting);
598
598
    EXPECT_EQ(theApp->appId(), appId);
599
599
    EXPECT_EQ(theApp->name(), name);
600
 
    EXPECT_EQ(theApp->canBeResumed(), true);
 
600
    EXPECT_NE(Application::ProcessUnknown, theApp->processState());
601
601
 
602
602
    // check only once instance in the model
603
603
    EXPECT_EQ(applicationManager.count(), 1);