summaryrefslogtreecommitdiff
path: root/src/mongo/unittest
diff options
context:
space:
mode:
authorBen Caimano <ben.caimano@10gen.com>2018-03-16 13:54:14 -0400
committerBen Caimano <ben.caimano@10gen.com>2018-03-21 18:01:52 -0400
commit09d7a4c298d6b65ac2a1d028085df4168aea086d (patch)
tree00eeeafcf83ac60fdafbdf5e84c88ab807afb32f /src/mongo/unittest
parentbbcff548d0c9922f6dc8f23a4dc8bd02ff9f57fc (diff)
downloadmongo-09d7a4c298d6b65ac2a1d028085df4168aea086d.tar.gz
SERVER-33758 Make mongo::logger classes use more unique_ptrs
Appenders and LogDomains now use unique ptrs internally and on signature.
Diffstat (limited to 'src/mongo/unittest')
-rw-r--r--src/mongo/unittest/unittest.cpp10
-rw-r--r--src/mongo/unittest/unittest.h2
2 files changed, 6 insertions, 6 deletions
diff --git a/src/mongo/unittest/unittest.cpp b/src/mongo/unittest/unittest.cpp
index 9a87664f4c9..f3388758ba0 100644
--- a/src/mongo/unittest/unittest.cpp
+++ b/src/mongo/unittest/unittest.cpp
@@ -76,9 +76,9 @@ logger::LogstreamBuilder log() {
}
void setupTestLogger() {
- unittestOutput->attachAppender(logger::MessageLogDomain::AppenderAutoPtr(
- new logger::ConsoleAppender<logger::MessageLogDomain::Event>(
- new logger::MessageEventDetailsEncoder)));
+ unittestOutput->attachAppender(
+ std::make_unique<logger::ConsoleAppender<logger::MessageLogDomain::Event>>(
+ std::make_unique<logger::MessageEventDetailsEncoder>()));
}
MONGO_INITIALIZER_WITH_PREREQUISITES(UnitTestOutput, ("GlobalLogManager", "default"))
@@ -231,7 +231,7 @@ void Test::startCapturingLogMessages() {
invariant(!_isCapturingLogMessages);
_capturedLogMessages.clear();
if (!_captureAppender) {
- _captureAppender = stdx::make_unique<StringVectorAppender>(&_capturedLogMessages);
+ _captureAppender = std::make_unique<StringVectorAppender>(&_capturedLogMessages);
}
checked_cast<StringVectorAppender*>(_captureAppender.get())->enable();
_captureAppenderHandle = logger::globalLogDomain()->attachAppender(std::move(_captureAppender));
@@ -266,7 +266,7 @@ Suite::Suite(const std::string& name) : _name(name) {
Suite::~Suite() {}
void Suite::add(const std::string& name, const TestFunction& testFn) {
- _tests.push_back(stdx::make_unique<TestHolder>(name, testFn));
+ _tests.push_back(std::make_unique<TestHolder>(name, testFn));
}
Result* Suite::run(const std::string& filter, int runsPerTest) {
diff --git a/src/mongo/unittest/unittest.h b/src/mongo/unittest/unittest.h
index 1a41f7acbf3..29a6c76f5b9 100644
--- a/src/mongo/unittest/unittest.h
+++ b/src/mongo/unittest/unittest.h
@@ -363,7 +363,7 @@ private:
bool _isCapturingLogMessages;
std::vector<std::string> _capturedLogMessages;
logger::MessageLogDomain::AppenderHandle _captureAppenderHandle;
- logger::MessageLogDomain::AppenderAutoPtr _captureAppender;
+ std::unique_ptr<logger::MessageLogDomain::EventAppender> _captureAppender;
};
/**