1
=== added file 'tests/include/mir_test_doubles/null_logger.h'
2
--- tests/include/mir_test_doubles/null_logger.h	1970-01-01 00:00:00 +0000
3
+++ tests/include/mir_test_doubles/null_logger.h	2014-11-21 11:16:21 +0000
4
@@ -0,0 +1,42 @@
5
1
/*
6
2
 * Copyright © 2014 Canonical Ltd.
7
3
 *
8
4
 * This program is free software: you can redistribute it and/or modify it
9
5
 * under the terms of the GNU General Public License version 3,
10
6
 * as published by the Free Software Foundation.
11
7
 *
12
8
 * This program is distributed in the hope that it will be useful,
13
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
15
11
 * GNU General Public License for more details.
16
12
 *
17
13
 * You should have received a copy of the GNU General Public License
18
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
19
15
 *
20
16
 * Authored By: Alan Griffiths <alan@octopull.co.uk>
21
17
 */
22
18
23
19
#ifndef MIR_TEST_DOUBLES_NULL_LOGGER_H_
24
20
#define MIR_TEST_DOUBLES_NULL_LOGGER_H_
25
21
26
22
#include "mir/logging/logger.h"
27
23
28
24
namespace mir
29
25
{
30
26
namespace test
31
27
{
32
28
namespace doubles
33
29
{
34
30
/// Command line option to enable logging_opt
35
31
extern char const* const logging_opt;
36
32
extern char const* const logging_descr;
37
33
38
34
class NullLogger : public mir::logging::Logger
39
35
{
40
36
void log(mir::logging::Severity, const std::string&, const std::string&) override;
41
37
};
42
38
}
43
39
}
44
40
}
45
41
46
42
#endif /* MIR_TEST_DOUBLES_NULL_LOGGER_H_ */
47
0
43
48
=== modified file 'tests/include/mir_test_framework/stubbed_server_configuration.h'
49
--- tests/include/mir_test_framework/stubbed_server_configuration.h	2014-10-21 16:21:14 +0000
50
+++ tests/include/mir_test_framework/stubbed_server_configuration.h	2014-11-21 11:16:21 +0000
51
@@ -49,6 +49,7 @@
52
49
    std::shared_ptr<input::InputSender> the_input_sender() override;
49
    std::shared_ptr<input::InputSender> the_input_sender() override;
53
50
50
54
51
    std::shared_ptr<graphics::Cursor> the_cursor() override;
51
    std::shared_ptr<graphics::Cursor> the_cursor() override;
55
52
    std::shared_ptr<logging::Logger> the_logger() override;
56
52
53
57
53
private:
54
private:
58
54
    std::shared_ptr<graphics::Platform> graphics_platform;
55
    std::shared_ptr<graphics::Platform> graphics_platform;
59
55
56
60
=== modified file 'tests/mir_test_doubles/CMakeLists.txt'
61
--- tests/mir_test_doubles/CMakeLists.txt	2014-11-17 17:41:54 +0000
62
+++ tests/mir_test_doubles/CMakeLists.txt	2014-11-21 11:16:21 +0000
63
@@ -17,6 +17,7 @@
64
17
  test_protobuf_socket_server.cpp
17
  test_protobuf_socket_server.cpp
65
18
  mock_timer.cpp
18
  mock_timer.cpp
66
19
  mock_frame_dropping_policy_factory.cpp
19
  mock_frame_dropping_policy_factory.cpp
67
20
  null_logger.cpp
68
20
  platform_factory.cpp
21
  platform_factory.cpp
69
21
  stub_buffer.cpp
22
  stub_buffer.cpp
70
22
)
23
)
71
23
24
72
=== added file 'tests/mir_test_doubles/null_logger.cpp'
73
--- tests/mir_test_doubles/null_logger.cpp	1970-01-01 00:00:00 +0000
74
+++ tests/mir_test_doubles/null_logger.cpp	2014-11-21 11:16:21 +0000
75
@@ -0,0 +1,28 @@
76
1
/*
77
2
 * Copyright © 2014 Canonical Ltd.
78
3
 *
79
4
 * This program is free software: you can redistribute it and/or modify it
80
5
 * under the terms of the GNU General Public License version 3,
81
6
 * as published by the Free Software Foundation.
82
7
 *
83
8
 * This program is distributed in the hope that it will be useful,
84
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
85
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
86
11
 * GNU General Public License for more details.
87
12
 *
88
13
 * You should have received a copy of the GNU General Public License
89
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
90
15
 *
91
16
 * Authored By: Alan Griffiths <alan@octopull.co.uk>
92
17
 */
93
18
94
19
#include "mir_test_doubles/null_logger.h"
95
20
96
21
namespace mtd = mir::test::doubles;
97
22
98
23
char const* const mtd::logging_opt = "logging";
99
24
char const* const mtd::logging_descr = "output log during tests";
100
25
101
26
void mtd::NullLogger::log(mir::logging::Severity, const std::string&, const std::string&)
102
27
{
103
28
}
104
0
29
105
=== modified file 'tests/mir_test_framework/headless_test.cpp'
106
--- tests/mir_test_framework/headless_test.cpp	2014-11-21 11:16:21 +0000
107
+++ tests/mir_test_framework/headless_test.cpp	2014-11-21 11:16:21 +0000
108
@@ -22,9 +22,12 @@
109
22
#include "mir/fd.h"
22
#include "mir/fd.h"
110
23
#include "mir/main_loop.h"
23
#include "mir/main_loop.h"
111
24
#include "mir/options/option.h"
24
#include "mir/options/option.h"
112
25
#include "mir_test_doubles/null_logger.h"
113
25
26
114
26
#include <boost/throw_exception.hpp>
27
#include <boost/throw_exception.hpp>
115
27
28
116
29
namespace ml = mir::logging;
117
30
namespace mtd = mir::test::doubles;
118
28
namespace mtf = mir_test_framework;
31
namespace mtf = mir_test_framework;
119
29
32
120
30
namespace
33
namespace
121
@@ -36,6 +39,16 @@
122
36
{
39
{
123
37
    configure_from_commandline(server);
40
    configure_from_commandline(server);
124
38
    add_to_environment("MIR_SERVER_PLATFORM_GRAPHICS_LIB", "libmirplatformstub.so");
41
    add_to_environment("MIR_SERVER_PLATFORM_GRAPHICS_LIB", "libmirplatformstub.so");
125
42
    server.add_configuration_option(mtd::logging_opt, mtd::logging_descr, false);
126
43
    server.override_the_logger([&]()
127
44
        {
128
45
            std::shared_ptr<ml::Logger> result{};
129
46
130
47
            if (!server.get_options()->get<bool>(mtd::logging_opt))
131
48
                result = std::make_shared<mtd::NullLogger>();
132
49
133
50
            return result;
134
51
        });
135
39
}
52
}
136
40
53
137
41
void mtf::HeadlessTest::add_to_environment(char const* key, char const* value)
54
void mtf::HeadlessTest::add_to_environment(char const* key, char const* value)
138
42
55
139
=== modified file 'tests/mir_test_framework/stubbed_server_configuration.cpp'
140
--- tests/mir_test_framework/stubbed_server_configuration.cpp	2014-10-30 18:37:11 +0000
141
+++ tests/mir_test_framework/stubbed_server_configuration.cpp	2014-11-21 11:16:21 +0000
142
@@ -32,12 +32,14 @@
143
32
#include "src/server/input/null_input_manager.h"
32
#include "src/server/input/null_input_manager.h"
144
33
#include "src/server/input/null_input_dispatcher.h"
33
#include "src/server/input/null_input_dispatcher.h"
145
34
#include "src/server/input/null_input_targeter.h"
34
#include "src/server/input/null_input_targeter.h"
146
35
#include "mir_test_doubles/null_logger.h"
147
35
36
148
36
namespace geom = mir::geometry;
37
namespace geom = mir::geometry;
149
37
namespace mc = mir::compositor;
38
namespace mc = mir::compositor;
150
38
namespace msh = mir::shell;
39
namespace msh = mir::shell;
151
39
namespace mg = mir::graphics;
40
namespace mg = mir::graphics;
152
40
namespace mi = mir::input;
41
namespace mi = mir::input;
153
42
namespace ml = mir::logging;
154
41
namespace mo = mir::options;
43
namespace mo = mir::options;
155
42
namespace mtd = mir::test::doubles;
44
namespace mtd = mir::test::doubles;
156
43
namespace mtf = mir_test_framework;
45
namespace mtf = mir_test_framework;
157
@@ -76,6 +78,7 @@
158
76
          namespace po = boost::program_options;
78
          namespace po = boost::program_options;
159
77
79
160
78
          result->add_options()
80
          result->add_options()
161
81
                  (mtd::logging_opt, po::value<bool>()->default_value(false), mtd::logging_descr)
162
79
                  ("tests-use-real-graphics", po::value<bool>()->default_value(false), "Use real graphics in tests.")
82
                  ("tests-use-real-graphics", po::value<bool>()->default_value(false), "Use real graphics in tests.")
163
80
                  ("tests-use-real-input", po::value<bool>()->default_value(false), "Use real input in tests.");
83
                  ("tests-use-real-input", po::value<bool>()->default_value(false), "Use real input in tests.");
164
81
84
165
@@ -153,3 +156,11 @@
166
153
{
156
{
167
154
    return std::make_shared<StubCursor>();
157
    return std::make_shared<StubCursor>();
168
155
}
158
}
169
159
170
160
std::shared_ptr<ml::Logger> mtf::StubbedServerConfiguration::the_logger()
171
161
{
172
162
    if (the_options()->get<bool>(mtd::logging_opt))
173
163
        return DefaultServerConfiguration::the_logger();
174
164
175
165
    return std::make_shared<mtd::NullLogger>();
176
166
}
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2014-11-21
Cemil Azizoglu (community)		2014-11-21	Approve on 2014-11-21
Review via email: mp+242477@code.launchpad.net