Compiz

Merge lp:~bregma/compiz/lp-1101413 into lp:compiz/0.9.12

  1. lp-1101413
  2. Merge into 0.9.12
Proposed by Stephen M. Webb
Status: Merged
Approved by: Christopher Townsend
Approved revision: 3907
Merged at revision: 3914
Proposed branch: lp:~bregma/compiz/lp-1101413
Merge into: lp:compiz/0.9.12
Diff against target: 102 lines (+11/-11)
1 file modified
src/privatescreen/tests/test-privatescreen.cpp (+11/-11)
To merge this branch: bzr merge lp:~bregma/compiz/lp-1101413
Reviewer Review Type Date Requested Status
Christopher Townsend Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+243437@code.launchpad.net

Commit message

PrivateScreen unit tests: added additional assertions to verify the tests are run in an expected state

Description of the change

PrivateScreen unit tests: added additional assertions to verify the tests are run in an extected state.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:3907
http://jenkins.qa.ubuntu.com/job/compiz-ci/21/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-vivid-amd64-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-vivid-armhf-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-vivid-i386-ci/11

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/compiz-ci/21/rebuild

review: Approve (continuous-integration)
Revision history for this message
Christopher Townsend (townsend) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/privatescreen/tests/test-privatescreen.cpp'
2--- src/privatescreen/tests/test-privatescreen.cpp 2013-04-17 06:58:36 +0000
3+++ src/privatescreen/tests/test-privatescreen.cpp 2014-12-02 18:11:26 +0000
4@@ -1057,7 +1057,7 @@
5 MockTriggerableAction triggerableAction;
6 ce::EventArguments arguments;
7
8- option.set (value);
9+ ASSERT_FALSE (option.set (value));
10
11 const ce::ActionModsMatchesEventStateFunc &matchEventState =
12 GetMatchEventStateFuncForMock (triggerableAction);
13@@ -1091,7 +1091,7 @@
14 cps::EventManager eventManager;
15 ce::EventArguments arguments;
16
17- option.set (value);
18+ ASSERT_TRUE (option.set (value));
19 option.value ().action ().setInitiate (initiate);
20 option.value ().action ().setState (CompAction::StateInitButton);
21 ca::setActionActiveState (option.value ().action (), false);
22@@ -1123,7 +1123,7 @@
23 cps::EventManager eventManager;
24 ce::EventArguments arguments;
25
26- option.set (value);
27+ ASSERT_TRUE (option.set (value));
28 option.value ().action ().setInitiate (initiate);
29 option.value ().action ().setState (CompAction::StateInitButton);
30 ca::setActionActiveState (option.value ().action (), true);
31@@ -1155,7 +1155,7 @@
32 cps::EventManager eventManager;
33 ce::EventArguments arguments;
34
35- option.set (value);
36+ ASSERT_TRUE (option.set (value));
37 option.value ().action ().setInitiate (initiate);
38 option.value ().action ().setState (CompAction::StateInitButton);
39 ca::setActionActiveState (option.value ().action (), true);
40@@ -1189,7 +1189,7 @@
41 cps::EventManager eventManager;
42 ce::EventArguments arguments;
43
44- option.set (value);
45+ ASSERT_TRUE (option.set (value));
46 option.value ().action ().setInitiate (initiate);
47 option.value ().action ().setState (CompAction::StateInitButton);
48 ca::setActionActiveState (option.value ().action (), true);
49@@ -1217,7 +1217,7 @@
50 ce::EventArguments arguments;
51 int edgeMask = -1;
52
53- option.set (value);
54+ ASSERT_FALSE (option.set (value));
55
56 const ce::ActionModsMatchesEventStateFunc &matchEventState =
57 GetMatchEventStateFuncForMock (triggerableAction);
58@@ -1241,7 +1241,7 @@
59 ce::EventArguments arguments;
60 int edgeMask = 1 << SCREEN_EDGE_TOP;
61
62- option.set (value);
63+ ASSERT_FALSE (option.set (value));
64
65 const ce::ActionModsMatchesEventStateFunc &matchEventState =
66 GetMatchEventStateFuncForMock (triggerableAction);
67@@ -1276,7 +1276,7 @@
68 ce::EventArguments arguments;
69
70
71- option.set (value);
72+ ASSERT_TRUE (option.set (value));
73 option.value ().action ().setInitiate (initiate);
74 option.value ().action ().setState (CompAction::StateInitButton);
75 ca::setActionActiveState (option.value ().action (), true);
76@@ -1312,7 +1312,7 @@
77 ce::EventArguments arguments;
78
79
80- option.set (value);
81+ ASSERT_TRUE (option.set (value));
82 option.value ().action ().setInitiate (initiate);
83 option.value ().action ().setState (CompAction::StateInitButton);
84 ca::setActionActiveState (option.value ().action (), true);
85@@ -1348,7 +1348,7 @@
86 cps::EventManager eventManager;
87 ce::EventArguments arguments;
88
89- option.set (value);
90+ ASSERT_TRUE (option.set (value));
91 option.value ().action ().setInitiate (initiate);
92 option.value ().action ().setState (CompAction::StateInitButton);
93 ca::setActionActiveState (option.value ().action (), true);
94@@ -1385,7 +1385,7 @@
95 cps::EventManager eventManager;
96 ce::EventArguments arguments;
97
98- option.set (value);
99+ ASSERT_TRUE (option.set (value));
100 option.value ().action ().setInitiate (initiate);
101 option.value ().action ().setState (CompAction::StateInitButton |
102 CompAction::StateInitEdge);

Subscribers

People subscribed via source and target branches