Merge lp:~robertcarr/mir/dedupe-mock-session into lp:~mir-team/mir/trunk

[Robert Carr]

Dedupe mock session definition in cucumber bridge test and single visibility focus mechanism test. Style cleanup to single visibility focus mechanism test in the process.

Dedupe mock session definition in cucumber bridge test and single visibility focus mechanism test. Style cleanup to single visibility focus mechanism test in the process.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:468
http://jenkins.qa.ubuntu.com/job/mir-ci/17/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/17//console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/mir-ci/17//rebuild/?

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:468
http://jenkins.qa.ubuntu.com/job/mir-ci/21/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/21//console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/mir-ci/21//rebuild/?

review: Approve (continuous-integration)

[Alexandros Frantzis (afrantzis)]

Looks good (had to resubmit the build because of a spurious jenkins failure).

review: Approve

[Alan Griffiths (alan-griffiths)]

59 +++ tests/integration-tests/cucumber/test_session_management_context.cpp 2013-03-07 21:37:23 +0000
...
64 +#include "mir_test_doubles/mock_session.h"
...
72 +namespace mtd = mir::test::doubles;

No need for these changes

review: Needs Fixing

[Alan Griffiths (alan-griffiths)]

> 59 +++ tests/integration-
> tests/cucumber/test_session_management_context.cpp 2013-03-07 21:37:23 +0000
> ...
> 64 +#include "mir_test_doubles/mock_session.h"
> ...
> 72 +namespace mtd = mir::test::doubles;
>
> No need for these changes

Sorry, bad cut & paste. That sould be:

126 +++ tests/unit-tests/frontend/test_application_mediator.cpp 2013-03-07 21:37:23 +0000
...
131 +#include "mir/shell/surface_creation_parameters.h"
...
138 +#include "mir_test_doubles/mock_session.h"

[Robert Carr (robertcarr)]

Removed unnecessary changes.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:469
http://jenkins.qa.ubuntu.com/job/mir-ci/29/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/29//console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/mir-ci/29//rebuild/?

review: Approve (continuous-integration)

[Kevin DuBois (kdub)]

changes look ok

187 + EXPECT_CALL(app1, show()).Times(1);
188 + EXPECT_CALL(app2, hide()).Times(1);
189 + EXPECT_CALL(app3, hide()).Times(1);
obviously existing prior to these changes, but is the ordering of this important?

[Alan Griffiths (alan-griffiths)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/20/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-autolanding/21//console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:470
http://jenkins.qa.ubuntu.com/job/mir-ci/41/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/42//console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/mir-ci/41//rebuild/?

review: Approve (continuous-integration)

[Robert Carr (robertcarr)]

Jenkins error was spurious hostname resolution failure.

=== added file 'include/mir_test_doubles/mock_session.h'
--- include/mir_test_doubles/mock_session.h	1970-01-01 00:00:00 +0000
+++ include/mir_test_doubles/mock_session.h	2013-03-11 17:50:24 +0000
@@ -0,0 +1,51 @@
+/*
+ * Copyright © 2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Robert Carr <[e-mail]>
+ */
+
+#ifndef MIR_TEST_DOUBLES_MOCK_SESSION_H_
+#define MIR_TEST_DOUBLES_MOCK_SESSION_H_
+
+#include "mir/shell/session.h"
+
+#include <gmock/gmock.h>
+
+namespace mir
+{
+namespace test
+{
+namespace doubles
+{
+
+struct MockSession : public shell::Session
+{
+    MOCK_METHOD1(create_surface, shell::SurfaceId(shell::SurfaceCreationParameters const&));
+    MOCK_METHOD1(destroy_surface, void(shell::SurfaceId));
+    MOCK_CONST_METHOD1(get_surface, std::shared_ptr<shell::Surface>(shell::SurfaceId));
+    
+    MOCK_METHOD0(name, std::string());
+    MOCK_METHOD0(shutdown, void());
+    
+    MOCK_METHOD0(hide, void());
+    MOCK_METHOD0(show, void());
+};
+
+}
+}
+} // namespace mir
+
+
+#endif // MIR_TEST_DOUBLES_MOCK_SESSION_H_

=== modified file 'tests/integration-tests/cucumber/test_session_management_context.cpp'
--- tests/integration-tests/cucumber/test_session_management_context.cpp	2013-03-06 16:48:33 +0000
+++ tests/integration-tests/cucumber/test_session_management_context.cpp	2013-03-11 17:50:24 +0000
@@ -24,6 +24,7 @@
 #include "mir/shell/surface_creation_parameters.h"
 #include "mir/graphics/viewable_area.h"
 
+#include "mir_test_doubles/mock_session.h"
 #include "mir_test/fake_shared.h"
 
 #include <gtest/gtest.h>
@@ -36,6 +37,7 @@
 namespace msh = mir::shell;
 namespace geom = mir::geometry;
 namespace mt = mir::test;
+namespace mtd = mir::test::doubles;
 namespace mtc = mt::cucumber;
 
 namespace
@@ -61,19 +63,6 @@
     MOCK_METHOD0(shutdown, void());
 };
 
-struct MockSession : public msh::Session
-{
-    MOCK_METHOD1(create_surface, msh::SurfaceId(msh::SurfaceCreationParameters const&));
-    MOCK_METHOD1(destroy_surface, void(msh::SurfaceId));
-    MOCK_CONST_METHOD1(get_surface, std::shared_ptr<msh::Surface>(msh::SurfaceId));
-    
-    MOCK_METHOD0(name, std::string());
-    MOCK_METHOD0(shutdown, void());
-    
-    MOCK_METHOD0(hide, void());
-    MOCK_METHOD0(show, void());
-};
-
 struct MockSurface : public msh::Surface
 {
     MOCK_METHOD0(hide, void());
@@ -166,7 +155,7 @@
 {
     using namespace ::testing;
 
-    MockSession session;
+    mtd::MockSession session;
 
     EXPECT_CALL(session_store, open_session(test_window_name)).Times(1)
         .WillOnce(Return(mt::fake_shared<msh::Session>(session)));
@@ -182,7 +171,7 @@
 {
     using namespace ::testing;
     
-    MockSession session;
+    mtd::MockSession session;
 
     EXPECT_CALL(session_store, open_session(test_window_name)).Times(1)
         .WillOnce(Return(mt::fake_shared<msh::Session>(session)));
@@ -197,7 +186,7 @@
 {
     using namespace ::testing;
 
-    MockSession session;
+    mtd::MockSession session;
     MockSurface surface;
 
     EXPECT_CALL(session_store, open_session(test_window_name)).Times(1)

=== modified file 'tests/unit-tests/shell/test_single_visibility_focus_mechanism.cpp'
--- tests/unit-tests/shell/test_single_visibility_focus_mechanism.cpp	2013-03-06 12:54:33 +0000
+++ tests/unit-tests/shell/test_single_visibility_focus_mechanism.cpp	2013-03-11 17:50:24 +0000
@@ -26,6 +26,7 @@
 #include "mir_test_doubles/mock_buffer_bundle.h"
 #include "mir_test/fake_shared.h"
 #include "mir_test_doubles/mock_surface_factory.h"
+#include "mir_test_doubles/mock_session.h"
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
@@ -37,45 +38,25 @@
 namespace mt = mir::test;
 namespace mtd = mir::test::doubles;
 
-namespace
-{
-
-struct MockApplicationSession : public msh::ApplicationSession
-{
-  MockApplicationSession(std::shared_ptr<msh::SurfaceFactory> factory,
-                         std::string name) : ApplicationSession(factory, name)
-  {
-  }
-  MOCK_METHOD0(hide,void());
-  MOCK_METHOD0(show,void());
-};
-
-}
-
 TEST(SingleVisibilityFocusMechanism, mechanism_sets_visibility)
 {
     using namespace ::testing;
-    std::shared_ptr<msh::SurfaceFactory> factory(new mtd::MockSurfaceFactory);
-    std::shared_ptr<msh::SessionContainer> model(new msh::SessionContainer);
-
-    MockApplicationSession m1(factory, "Visual Studio 7");
-    MockApplicationSession m2(factory, "Visual Studio 8");
-    MockApplicationSession m3(factory, "Visual Studio 9");
-
-    auto app1 = mt::fake_shared(m1);
-    auto app2 = mt::fake_shared(m2);
-    auto app3 = mt::fake_shared(m3);
-
-    msh::SingleVisibilityFocusMechanism focus_mechanism(model);
-
-    EXPECT_CALL(m1, show()).Times(1);
-    EXPECT_CALL(m2, hide()).Times(1);
-    EXPECT_CALL(m3, hide()).Times(1);
-
-    model->insert_session(app1);
-    model->insert_session(app2);
-    model->insert_session(app3);
-
-    focus_mechanism.set_focus_to(app1);
+
+    mtd::MockSession app1;
+    mtd::MockSession app2;
+    mtd::MockSession app3;
+
+    msh::SessionContainer model;
+    msh::SingleVisibilityFocusMechanism focus_mechanism(mt::fake_shared(model));
+
+    EXPECT_CALL(app1, show()).Times(1);
+    EXPECT_CALL(app2, hide()).Times(1);
+    EXPECT_CALL(app3, hide()).Times(1);
+
+    model.insert_session(mt::fake_shared(app1));
+    model.insert_session(mt::fake_shared(app2));
+    model.insert_session(mt::fake_shared(app3));
+
+    focus_mechanism.set_focus_to(mt::fake_shared(app1));
 }