summaryrefslogtreecommitdiff
path: root/src/mongo/db/query/collation/collator_factory_mock.cpp
diff options
context:
space:
mode:
authorTess Avitabile <tess.avitabile@mongodb.com>2016-04-28 16:36:11 -0400
committerTess Avitabile <tess.avitabile@mongodb.com>2016-05-05 10:29:06 -0400
commitf7a46a118288ba0ce45c7664777ea0e89c2eb845 (patch)
treed9ba6c6981072ce4b836617ebb1889ac17e4fcc2 /src/mongo/db/query/collation/collator_factory_mock.cpp
parentf49018bca41048d8a4f729ccc0489ea6be073a20 (diff)
downloadmongo-f7a46a118288ba0ce45c7664777ea0e89c2eb845.tar.gz
SERVER-23610 CanonicalQuery should own a CollatorInterface
Diffstat (limited to 'src/mongo/db/query/collation/collator_factory_mock.cpp')
-rw-r--r--src/mongo/db/query/collation/collator_factory_mock.cpp14
1 files changed, 1 insertions, 13 deletions
diff --git a/src/mongo/db/query/collation/collator_factory_mock.cpp b/src/mongo/db/query/collation/collator_factory_mock.cpp
index 0233cbcf262..e1d1f8f7d2d 100644
--- a/src/mongo/db/query/collation/collator_factory_mock.cpp
+++ b/src/mongo/db/query/collation/collator_factory_mock.cpp
@@ -31,24 +31,12 @@
#include "mongo/db/query/collation/collator_factory_mock.h"
#include "mongo/base/init.h"
+#include "mongo/bson/bsonobj.h"
#include "mongo/db/query/collation/collator_interface_mock.h"
-#include "mongo/db/service_context.h"
#include "mongo/stdx/memory.h"
namespace mongo {
-namespace {
-
-// TODO SERVER-22371: We should decorate with a CollatorFactoryICU instead.
-MONGO_INITIALIZER_WITH_PREREQUISITES(CreateCollatorFactory,
- ("SetGlobalEnvironment"))(InitializerContext* context) {
- CollatorFactoryInterface::set(getGlobalServiceContext(),
- stdx::make_unique<CollatorFactoryMock>());
- return Status::OK();
-}
-
-} // namespace
-
StatusWith<std::unique_ptr<CollatorInterface>> CollatorFactoryMock::makeFromBSON(
const BSONObj& spec) {
auto collator =