summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorDaniel Burrows <dburrows@debian.org>2010-07-10 12:27:30 -0700
committerDaniel Burrows <dburrows@debian.org>2010-07-10 12:27:30 -0700
commit8dcd3cb6ae414a961891782a8cb4283d997e48d1 (patch)
treefc78a59e63a3e3d39af31c998b5786315271b279 /tests
parent750e7bfefb17cb188d62ec722fde5c66c41f5b6c (diff)
downloadaptitude-8dcd3cb6ae414a961891782a8cb4283d997e48d1.tar.gz
Make combining_terminal_output implement the same interface as Mock.
I can't use Mock directly because this class already inherits from Mock, so there would be confusion about which static members to expose (well, I could resolve it, but that's about as much trouble as implementing the interface directly).
Diffstat (limited to 'tests')
-rw-r--r--tests/test_teletype_mock.cc2
-rw-r--r--tests/test_terminal_mock.cc2
-rw-r--r--tests/test_transient_message.cc2
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/test_teletype_mock.cc b/tests/test_teletype_mock.cc
index b8e2997d..66a85b4c 100644
--- a/tests/test_teletype_mock.cc
+++ b/tests/test_teletype_mock.cc
@@ -345,7 +345,7 @@ TEST_F(TeletypeTest, testOverwritePastEOL)
TEST_F(TeletypeTest, TeletypeDoesNotBreakTerminalMock)
{
shared_ptr<mocks::combining_terminal_output> real_term_output =
- mocks::combining_terminal_output::create();
+ mocks::combining_terminal_output::create_strict();
shared_ptr<mocks::teletype> teletype =
mocks::create_teletype(term_locale, term_metrics, real_term_output);
diff --git a/tests/test_terminal_mock.cc b/tests/test_terminal_mock.cc
index 86574f59..b033d42f 100644
--- a/tests/test_terminal_mock.cc
+++ b/tests/test_terminal_mock.cc
@@ -37,7 +37,7 @@ namespace
public:
TerminalMock()
- : terminal(mocks::combining_terminal_output::create())
+ : terminal(mocks::combining_terminal_output::create_strict())
{
}
};
diff --git a/tests/test_transient_message.cc b/tests/test_transient_message.cc
index c0dbd6d9..2844854e 100644
--- a/tests/test_transient_message.cc
+++ b/tests/test_transient_message.cc
@@ -60,7 +60,7 @@ namespace
static shared_ptr<mocks::combining_terminal_output> create_terminal_output()
{
shared_ptr<mocks::combining_terminal_output> rval =
- mocks::combining_terminal_output::create();
+ mocks::combining_terminal_output::create_strict();
EXPECT_CALL(*rval, output_is_a_terminal())
.WillRepeatedly(Return(true));