summaryrefslogtreecommitdiff
path: root/src/mongo/db/repl/replication_process_test.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mongo/db/repl/replication_process_test.cpp')
-rw-r--r--src/mongo/db/repl/replication_process_test.cpp17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/mongo/db/repl/replication_process_test.cpp b/src/mongo/db/repl/replication_process_test.cpp
index 389d6a813fb..d0592001a20 100644
--- a/src/mongo/db/repl/replication_process_test.cpp
+++ b/src/mongo/db/repl/replication_process_test.cpp
@@ -43,7 +43,6 @@
#include "mongo/db/repl/storage_interface_mock.h"
#include "mongo/db/service_context.h"
#include "mongo/db/service_context_d_test_fixture.h"
-#include "mongo/stdx/memory.h"
namespace {
@@ -61,9 +60,9 @@ protected:
void ReplicationProcessTest::setUp() {
ServiceContextMongoDTest::setUp();
- _storageInterface = stdx::make_unique<StorageInterfaceImpl>();
+ _storageInterface = std::make_unique<StorageInterfaceImpl>();
auto service = getServiceContext();
- ReplicationCoordinator::set(service, stdx::make_unique<ReplicationCoordinatorMock>(service));
+ ReplicationCoordinator::set(service, std::make_unique<ReplicationCoordinatorMock>(service));
}
void ReplicationProcessTest::tearDown() {
@@ -80,8 +79,8 @@ TEST_F(ReplicationProcessTest, ServiceContextDecorator) {
ASSERT_FALSE(ReplicationProcess::get(serviceContext));
ReplicationProcess* replicationProcess = new ReplicationProcess(
_storageInterface.get(),
- stdx::make_unique<ReplicationConsistencyMarkersImpl>(_storageInterface.get()),
- stdx::make_unique<ReplicationRecoveryMock>());
+ std::make_unique<ReplicationConsistencyMarkersImpl>(_storageInterface.get()),
+ std::make_unique<ReplicationRecoveryMock>());
ReplicationProcess::set(serviceContext,
std::unique_ptr<ReplicationProcess>(replicationProcess));
ASSERT_TRUE(replicationProcess == ReplicationProcess::get(serviceContext));
@@ -93,8 +92,8 @@ TEST_F(ReplicationProcessTest, RollbackIDIncrementsBy1) {
auto opCtx = makeOpCtx();
ReplicationProcess replicationProcess(
_storageInterface.get(),
- stdx::make_unique<ReplicationConsistencyMarkersImpl>(_storageInterface.get()),
- stdx::make_unique<ReplicationRecoveryMock>());
+ std::make_unique<ReplicationConsistencyMarkersImpl>(_storageInterface.get()),
+ std::make_unique<ReplicationRecoveryMock>());
// We make no assumptions about the initial value of the rollback ID.
ASSERT_OK(replicationProcess.initializeRollbackID(opCtx.get()));
@@ -110,8 +109,8 @@ TEST_F(ReplicationProcessTest, RefreshRollbackIDResetsCachedValueFromStorage) {
auto opCtx = makeOpCtx();
ReplicationProcess replicationProcess(
_storageInterface.get(),
- stdx::make_unique<ReplicationConsistencyMarkersImpl>(_storageInterface.get()),
- stdx::make_unique<ReplicationRecoveryMock>());
+ std::make_unique<ReplicationConsistencyMarkersImpl>(_storageInterface.get()),
+ std::make_unique<ReplicationRecoveryMock>());
// RefreshRollbackID returns NamespaceNotFound if there is no rollback.id collection.
ASSERT_EQUALS(ErrorCodes::NamespaceNotFound, replicationProcess.refreshRollbackID(opCtx.get()));