Merge lp:~robertcarr/mir/dedupe-null-display-config into lp:~mir-team/mir/trunk

[Robert Carr]

Deduplicate mtd::NullDisplayConfig and mtd::NullDisplayConfiguration

Dedupe NullDisplayConfig/Configuration

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1056
http://jenkins.qa.ubuntu.com/job/mir-ci/1455/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1964
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1849
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/693
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/693/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/1455/rebuild

review: Approve (continuous-integration)

[Kevin DuBois (kdub)]

ok

review: Approve

[Daniel van Vugt (vanvugt)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/661/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/generic-cleanup-mbs/2102/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1969
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1854
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-autolanding/316/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'include/test/mir_test_doubles/null_display_changer.h'
--- include/test/mir_test_doubles/null_display_changer.h	2013-08-28 03:41:48 +0000
+++ include/test/mir_test_doubles/null_display_changer.h	2013-09-09 19:12:27 +0000
@@ -20,7 +20,7 @@
 #define MIR_TEST_DOUBLES_NULL_DISPLAY_CHANGER_H_
 
 #include "mir/frontend/display_changer.h"
-#include "null_display_config.h"
+#include "null_display_configuration.h"
 
 namespace mir
 {
@@ -34,7 +34,7 @@
 public:
     virtual std::shared_ptr<graphics::DisplayConfiguration> active_configuration()
     {
-        return std::make_shared<NullDisplayConfig>();
+        return std::make_shared<NullDisplayConfiguration>();
     }
     virtual void configure(std::shared_ptr<frontend::Session> const&, std::shared_ptr<graphics::DisplayConfiguration> const&)
     {

=== removed file 'include/test/mir_test_doubles/null_display_config.h'
--- include/test/mir_test_doubles/null_display_config.h	2013-09-06 03:46:37 +0000
+++ include/test/mir_test_doubles/null_display_config.h	1970-01-01 00:00:00 +0000
@@ -1,51 +0,0 @@
-/*
- * 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: Kevin DuBois <[e-mail]>
- */
-
-#ifndef MIR_TEST_DOUBLES_NULL_DISPLAY_CONFIG_H_
-#define MIR_TEST_DOUBLES_NULL_DISPLAY_CONFIG_H_
-
-#include "mir/graphics/display_configuration.h"
-
-namespace mir
-{
-namespace test
-{
-namespace doubles
-{
-
-struct NullDisplayConfig : public graphics::DisplayConfiguration
-{
-    NullDisplayConfig()
-    {
-    }
-    virtual void for_each_card(std::function<void(graphics::DisplayConfigurationCard const&)>) const
-    {
-    }
-    virtual void for_each_output(std::function<void(graphics::DisplayConfigurationOutput const&)>) const
-    {
-    }
-    virtual void configure_output(graphics::DisplayConfigurationOutputId, bool, geometry::Point, size_t, MirPowerMode)
-    {
-    }
-};
-
-}
-}
-}
-
-#endif /*MIR_TEST_DOUBLES_NULL_DISPLAY_CONFIG_H_ */

=== modified file 'tests/integration-tests/test_display_info.cpp'
--- tests/integration-tests/test_display_info.cpp	2013-08-28 03:41:48 +0000
+++ tests/integration-tests/test_display_info.cpp	2013-09-09 19:12:27 +0000
@@ -30,7 +30,6 @@
 #include "mir_test_doubles/stub_buffer.h"
 #include "mir_test_doubles/null_display.h"
 #include "mir_test_doubles/null_event_sink.h"
-#include "mir_test_doubles/null_display_config.h"
 #include "mir_test_doubles/null_display_changer.h"
 #include "mir_test_doubles/stub_display_buffer.h"
 #include "mir_test_doubles/null_platform.h"

=== modified file 'tests/unit-tests/frontend/test_session_mediator.cpp'
--- tests/unit-tests/frontend/test_session_mediator.cpp	2013-09-06 03:46:37 +0000
+++ tests/unit-tests/frontend/test_session_mediator.cpp	2013-09-09 19:12:27 +0000
@@ -61,7 +61,7 @@
 
 namespace
 {
-struct StubConfig : public mtd::NullDisplayConfig
+struct StubConfig : public mtd::NullDisplayConfiguration
 {
     StubConfig(std::shared_ptr<mg::DisplayConfigurationOutput> const& conf)
        : outputs{conf, conf}