diff options
Diffstat (limited to 'src/mongo/dbtests')
47 files changed, 167 insertions, 0 deletions
diff --git a/src/mongo/dbtests/accumulatortests.cpp b/src/mongo/dbtests/accumulatortests.cpp index b3729bcd071..ccc334d0095 100644 --- a/src/mongo/dbtests/accumulatortests.cpp +++ b/src/mongo/dbtests/accumulatortests.cpp @@ -41,6 +41,8 @@ namespace AccumulatorTests { using boost::intrusive_ptr; + using std::numeric_limits; + using std::string; class Base { protected: diff --git a/src/mongo/dbtests/basictests.cpp b/src/mongo/dbtests/basictests.cpp index 4d1deb94167..f31b8021fe5 100644 --- a/src/mongo/dbtests/basictests.cpp +++ b/src/mongo/dbtests/basictests.cpp @@ -51,6 +51,13 @@ namespace BasicTests { using boost::scoped_ptr; using boost::shared_ptr; + using std::cout; + using std::dec; + using std::endl; + using std::hex; + using std::string; + using std::stringstream; + using std::vector; class Rarely { public: diff --git a/src/mongo/dbtests/chunktests.cpp b/src/mongo/dbtests/chunktests.cpp index e9cb366f199..82862c6cfe8 100644 --- a/src/mongo/dbtests/chunktests.cpp +++ b/src/mongo/dbtests/chunktests.cpp @@ -39,6 +39,10 @@ namespace mongo { + using std::set; + using std::string; + using std::vector; + class TestableChunkManager : public ChunkManager { public: diff --git a/src/mongo/dbtests/clienttests.cpp b/src/mongo/dbtests/clienttests.cpp index 29e5b95d47f..efd31f5e580 100644 --- a/src/mongo/dbtests/clienttests.cpp +++ b/src/mongo/dbtests/clienttests.cpp @@ -38,6 +38,10 @@ namespace ClientTests { + using std::auto_ptr; + using std::string; + using std::vector; + class Base { public: diff --git a/src/mongo/dbtests/commandtests.cpp b/src/mongo/dbtests/commandtests.cpp index b90dd1ec399..f6e87de5885 100644 --- a/src/mongo/dbtests/commandtests.cpp +++ b/src/mongo/dbtests/commandtests.cpp @@ -36,6 +36,9 @@ using namespace mongo; namespace CommandTests { + + using std::string; + // one namespace per command namespace FileMD5 { struct Base { diff --git a/src/mongo/dbtests/config_server_fixture.cpp b/src/mongo/dbtests/config_server_fixture.cpp index 965ed3a6cfd..c92f521d433 100644 --- a/src/mongo/dbtests/config_server_fixture.cpp +++ b/src/mongo/dbtests/config_server_fixture.cpp @@ -48,7 +48,9 @@ namespace mongo { using boost::scoped_ptr; + using std::endl; using std::list; + using std::string; ConfigServerFixture::ConfigServerFixture() : _client(&_txn), diff --git a/src/mongo/dbtests/config_upgrade_tests.cpp b/src/mongo/dbtests/config_upgrade_tests.cpp index 1a93c5c4a0a..841ce48343e 100644 --- a/src/mongo/dbtests/config_upgrade_tests.cpp +++ b/src/mongo/dbtests/config_upgrade_tests.cpp @@ -41,6 +41,8 @@ namespace mongo { + using std::string; + /** * Specialization of the config server fixture with helpers for the tests below. */ diff --git a/src/mongo/dbtests/dbhelper_tests.cpp b/src/mongo/dbtests/dbhelper_tests.cpp index ec695ece1d7..4593fd26e70 100644 --- a/src/mongo/dbtests/dbhelper_tests.cpp +++ b/src/mongo/dbtests/dbhelper_tests.cpp @@ -38,6 +38,9 @@ namespace mongo { + using std::auto_ptr; + using std::set; + /** * Unit tests related to DBHelpers */ diff --git a/src/mongo/dbtests/directclienttests.cpp b/src/mongo/dbtests/directclienttests.cpp index 5c12d77fce0..2c79c26a082 100644 --- a/src/mongo/dbtests/directclienttests.cpp +++ b/src/mongo/dbtests/directclienttests.cpp @@ -46,6 +46,9 @@ namespace DirectClientTests { + using std::auto_ptr; + using std::vector; + class ClientBase { public: ClientBase() { diff --git a/src/mongo/dbtests/documentsourcetests.cpp b/src/mongo/dbtests/documentsourcetests.cpp index 34cb050eaa2..059c48fe62d 100644 --- a/src/mongo/dbtests/documentsourcetests.cpp +++ b/src/mongo/dbtests/documentsourcetests.cpp @@ -51,6 +51,10 @@ namespace DocumentSourceTests { using boost::intrusive_ptr; using boost::shared_ptr; + using std::map; + using std::set; + using std::string; + using std::vector; static const char* const ns = "unittests.documentsourcetests"; static const BSONObj metaTextScore = BSON("$meta" << "textScore"); diff --git a/src/mongo/dbtests/documenttests.cpp b/src/mongo/dbtests/documenttests.cpp index f29b75fd7b2..c525cd412ad 100644 --- a/src/mongo/dbtests/documenttests.cpp +++ b/src/mongo/dbtests/documenttests.cpp @@ -41,6 +41,11 @@ namespace DocumentTests { + using std::endl; + using std::numeric_limits; + using std::string; + using std::vector; + mongo::Document::FieldPair getNthField(mongo::Document doc, size_t index) { mongo::FieldIterator it (doc); while (index--) // advance index times diff --git a/src/mongo/dbtests/executor_registry.cpp b/src/mongo/dbtests/executor_registry.cpp index 9af65a1b013..d526f5389ae 100644 --- a/src/mongo/dbtests/executor_registry.cpp +++ b/src/mongo/dbtests/executor_registry.cpp @@ -47,6 +47,8 @@ namespace ExecutorRegistry { + using std::auto_ptr; + class ExecutorRegistryBase { public: ExecutorRegistryBase() diff --git a/src/mongo/dbtests/expressiontests.cpp b/src/mongo/dbtests/expressiontests.cpp index 5dfc0befe42..ae160fa5f6a 100644 --- a/src/mongo/dbtests/expressiontests.cpp +++ b/src/mongo/dbtests/expressiontests.cpp @@ -40,6 +40,10 @@ namespace ExpressionTests { using boost::intrusive_ptr; + using std::numeric_limits; + using std::set; + using std::string; + using std::vector; /** Convert BSONObj to a BSONObj with our $const wrappings. */ static BSONObj constify(const BSONObj& obj, bool parentIsArray=false) { diff --git a/src/mongo/dbtests/framework.cpp b/src/mongo/dbtests/framework.cpp index c1e807aaea6..d8b1bb9c472 100644 --- a/src/mongo/dbtests/framework.cpp +++ b/src/mongo/dbtests/framework.cpp @@ -58,6 +58,9 @@ namespace moe = mongo::optionenvironment; namespace mongo { + using std::endl; + using std::string; + namespace dbtests { mutex globalCurrentTestNameMutex("globalCurrentTestNameMutex"); diff --git a/src/mongo/dbtests/framework_options.cpp b/src/mongo/dbtests/framework_options.cpp index 6a78ef0a5fa..26b795e0893 100644 --- a/src/mongo/dbtests/framework_options.cpp +++ b/src/mongo/dbtests/framework_options.cpp @@ -46,6 +46,11 @@ namespace mongo { + using std::cout; + using std::endl; + using std::string; + using std::vector; + FrameworkGlobalParams frameworkGlobalParams; Status addTestFrameworkOptions(moe::OptionSection* options) { diff --git a/src/mongo/dbtests/gle_test.cpp b/src/mongo/dbtests/gle_test.cpp index b5f958671a6..4514971578b 100644 --- a/src/mongo/dbtests/gle_test.cpp +++ b/src/mongo/dbtests/gle_test.cpp @@ -37,6 +37,9 @@ using mongo::MsgAssertionException; * Test getLastError client handling */ namespace { + + using std::string; + static const char* const _ns = "unittests.gle"; /** diff --git a/src/mongo/dbtests/jsobjtests.cpp b/src/mongo/dbtests/jsobjtests.cpp index d769e66a043..4ffab7c0f41 100644 --- a/src/mongo/dbtests/jsobjtests.cpp +++ b/src/mongo/dbtests/jsobjtests.cpp @@ -50,6 +50,14 @@ #include "mongo/util/stringutils.h" namespace mongo { + + using std::cout; + using std::endl; + using std::numeric_limits; + using std::string; + using std::stringstream; + using std::vector; + typedef std::map<std::string, BSONElement> BSONMap; BSONMap bson2map(const BSONObj& obj) { BSONMap m; diff --git a/src/mongo/dbtests/jsontests.cpp b/src/mongo/dbtests/jsontests.cpp index 567b7cabf47..5ea9cab5b81 100644 --- a/src/mongo/dbtests/jsontests.cpp +++ b/src/mongo/dbtests/jsontests.cpp @@ -45,6 +45,14 @@ namespace JsonTests { + + using std::cout; + using std::endl; + using std::numeric_limits; + using std::string; + using std::stringstream; + using std::vector; + namespace JsonStringTests { class Empty { diff --git a/src/mongo/dbtests/jstests.cpp b/src/mongo/dbtests/jstests.cpp index d7cfa36bef6..67299420841 100644 --- a/src/mongo/dbtests/jstests.cpp +++ b/src/mongo/dbtests/jstests.cpp @@ -48,7 +48,12 @@ #include "mongo/util/timer.h" using boost::scoped_ptr; +using std::auto_ptr; +using std::cout; +using std::endl; using std::string; +using std::stringstream; +using std::vector; namespace JSTests { diff --git a/src/mongo/dbtests/matchertests.cpp b/src/mongo/dbtests/matchertests.cpp index 043f5f7688e..8d66896eb85 100644 --- a/src/mongo/dbtests/matchertests.cpp +++ b/src/mongo/dbtests/matchertests.cpp @@ -39,6 +39,10 @@ namespace MatcherTests { + using std::cout; + using std::endl; + using std::string; + class CollectionBase { public: CollectionBase() { } diff --git a/src/mongo/dbtests/merge_chunk_tests.cpp b/src/mongo/dbtests/merge_chunk_tests.cpp index 6cdb75cd177..47e233483cd 100644 --- a/src/mongo/dbtests/merge_chunk_tests.cpp +++ b/src/mongo/dbtests/merge_chunk_tests.cpp @@ -39,6 +39,9 @@ namespace mongo { + using std::string; + using std::vector; + /** * Specialization of the config server fixture with helpers for the tests below. */ diff --git a/src/mongo/dbtests/mmaptests.cpp b/src/mongo/dbtests/mmaptests.cpp index acf31062877..6f2cad63043 100644 --- a/src/mongo/dbtests/mmaptests.cpp +++ b/src/mongo/dbtests/mmaptests.cpp @@ -47,6 +47,9 @@ namespace MMapTests { + using std::endl; + using std::string; + class LeakTest { const string fn; const int optOld; diff --git a/src/mongo/dbtests/mock/mock_conn_registry.cpp b/src/mongo/dbtests/mock/mock_conn_registry.cpp index 148f8860679..c50e177667f 100644 --- a/src/mongo/dbtests/mock/mock_conn_registry.cpp +++ b/src/mongo/dbtests/mock/mock_conn_registry.cpp @@ -32,6 +32,9 @@ #include "mongo/dbtests/mock/mock_dbclient_connection.h" namespace mongo { + + using std::string; + boost::scoped_ptr<MockConnRegistry> MockConnRegistry::_instance; MONGO_INITIALIZER(MockConnRegistry)(InitializerContext* context) { diff --git a/src/mongo/dbtests/mock/mock_replica_set.cpp b/src/mongo/dbtests/mock/mock_replica_set.cpp index 851d69e8a7e..ea1ebde067a 100644 --- a/src/mongo/dbtests/mock/mock_replica_set.cpp +++ b/src/mongo/dbtests/mock/mock_replica_set.cpp @@ -37,6 +37,10 @@ using namespace mongo::repl; namespace mongo { + + using std::string; + using std::vector; + MockReplicaSet::MockReplicaSet(const string& setName, size_t nodes): _setName(setName) { BSONObjBuilder configBuilder; diff --git a/src/mongo/dbtests/namespacetests.cpp b/src/mongo/dbtests/namespacetests.cpp index eb6c604c264..1017be597e5 100644 --- a/src/mongo/dbtests/namespacetests.cpp +++ b/src/mongo/dbtests/namespacetests.cpp @@ -57,6 +57,8 @@ namespace NamespaceTests { + using std::string; + const int MinExtentSize = 4096; namespace MissingFieldTests { diff --git a/src/mongo/dbtests/oplogstarttests.cpp b/src/mongo/dbtests/oplogstarttests.cpp index c4da2f33bfb..2248391a5c5 100644 --- a/src/mongo/dbtests/oplogstarttests.cpp +++ b/src/mongo/dbtests/oplogstarttests.cpp @@ -38,6 +38,7 @@ namespace OplogStartTests { using boost::scoped_ptr; + using std::string; class Base { public: diff --git a/src/mongo/dbtests/perftests.cpp b/src/mongo/dbtests/perftests.cpp index c009cf90fa7..1a5456191fe 100644 --- a/src/mongo/dbtests/perftests.cpp +++ b/src/mongo/dbtests/perftests.cpp @@ -75,6 +75,17 @@ namespace PerfTests { using boost::shared_ptr; + using std::cout; + using std::endl; + using std::fixed; + using std::ifstream; + using std::left; + using std::min; + using std::right; + using std::setprecision; + using std::setw; + using std::string; + using std::vector; const bool profiling = false; diff --git a/src/mongo/dbtests/pipelinetests.cpp b/src/mongo/dbtests/pipelinetests.cpp index b5d27da0edf..17b226ff061 100644 --- a/src/mongo/dbtests/pipelinetests.cpp +++ b/src/mongo/dbtests/pipelinetests.cpp @@ -43,6 +43,8 @@ namespace PipelineTests { using boost::intrusive_ptr; + using std::string; + using std::vector; namespace FieldPath { diff --git a/src/mongo/dbtests/plan_ranking.cpp b/src/mongo/dbtests/plan_ranking.cpp index 3429ed88f43..7ff4bc3ab8d 100644 --- a/src/mongo/dbtests/plan_ranking.cpp +++ b/src/mongo/dbtests/plan_ranking.cpp @@ -62,6 +62,7 @@ namespace mongo { namespace PlanRankingTests { using boost::scoped_ptr; + using std::vector; static const char* ns = "unittests.PlanRankingTests"; diff --git a/src/mongo/dbtests/query_multi_plan_runner.cpp b/src/mongo/dbtests/query_multi_plan_runner.cpp index 6ff4e66d060..aaf4cb94736 100644 --- a/src/mongo/dbtests/query_multi_plan_runner.cpp +++ b/src/mongo/dbtests/query_multi_plan_runner.cpp @@ -57,6 +57,8 @@ namespace mongo { namespace QueryMultiPlanRunner { using boost::scoped_ptr; + using std::auto_ptr; + using std::vector; /** * Create query solution. diff --git a/src/mongo/dbtests/query_plan_executor.cpp b/src/mongo/dbtests/query_plan_executor.cpp index 944e1aaeff3..f524c421df2 100644 --- a/src/mongo/dbtests/query_plan_executor.cpp +++ b/src/mongo/dbtests/query_plan_executor.cpp @@ -51,6 +51,8 @@ namespace QueryPlanExecutor { using boost::scoped_ptr; using boost::shared_ptr; + using std::auto_ptr; + using std::string; class PlanExecutorBase { public: diff --git a/src/mongo/dbtests/query_stage_and.cpp b/src/mongo/dbtests/query_stage_and.cpp index 1574db01b07..670c3e4ef72 100644 --- a/src/mongo/dbtests/query_stage_and.cpp +++ b/src/mongo/dbtests/query_stage_and.cpp @@ -53,6 +53,8 @@ namespace QueryStageAnd { using boost::scoped_ptr; using boost::shared_ptr; + using std::auto_ptr; + using std::set; class QueryStageAndBase { public: diff --git a/src/mongo/dbtests/query_stage_collscan.cpp b/src/mongo/dbtests/query_stage_collscan.cpp index 3e0f8b9aa54..17f761b13d8 100644 --- a/src/mongo/dbtests/query_stage_collscan.cpp +++ b/src/mongo/dbtests/query_stage_collscan.cpp @@ -49,6 +49,8 @@ namespace QueryStageCollectionScan { using boost::scoped_ptr; + using std::auto_ptr; + using std::vector; // // Stage-specific tests. diff --git a/src/mongo/dbtests/query_stage_count.cpp b/src/mongo/dbtests/query_stage_count.cpp index 31f7188b4de..63a4649ae83 100644 --- a/src/mongo/dbtests/query_stage_count.cpp +++ b/src/mongo/dbtests/query_stage_count.cpp @@ -43,6 +43,8 @@ namespace QueryStageCount { using boost::scoped_ptr; + using std::auto_ptr; + using std::vector; const int kDocuments = 100; const int kInterjections = kDocuments; diff --git a/src/mongo/dbtests/query_stage_delete.cpp b/src/mongo/dbtests/query_stage_delete.cpp index 49513f6cffc..1c39f39795f 100644 --- a/src/mongo/dbtests/query_stage_delete.cpp +++ b/src/mongo/dbtests/query_stage_delete.cpp @@ -43,6 +43,7 @@ namespace QueryStageDelete { using boost::scoped_ptr; + using std::vector; // // Stage-specific tests. diff --git a/src/mongo/dbtests/query_stage_fetch.cpp b/src/mongo/dbtests/query_stage_fetch.cpp index 8b55f57d51e..c7605f3b6a3 100644 --- a/src/mongo/dbtests/query_stage_fetch.cpp +++ b/src/mongo/dbtests/query_stage_fetch.cpp @@ -47,6 +47,8 @@ namespace QueryStageFetch { using boost::shared_ptr; + using std::auto_ptr; + using std::set; class QueryStageFetchBase { public: diff --git a/src/mongo/dbtests/query_stage_keep.cpp b/src/mongo/dbtests/query_stage_keep.cpp index bc4f37c3ce2..1113fc42f7e 100644 --- a/src/mongo/dbtests/query_stage_keep.cpp +++ b/src/mongo/dbtests/query_stage_keep.cpp @@ -52,6 +52,7 @@ namespace QueryStageKeep { using boost::shared_ptr; + using std::set; class QueryStageKeepBase { public: diff --git a/src/mongo/dbtests/query_stage_limit_skip.cpp b/src/mongo/dbtests/query_stage_limit_skip.cpp index edb745a2d69..46967226a10 100644 --- a/src/mongo/dbtests/query_stage_limit_skip.cpp +++ b/src/mongo/dbtests/query_stage_limit_skip.cpp @@ -46,6 +46,9 @@ using namespace mongo; namespace { using boost::scoped_ptr; + using std::auto_ptr; + using std::max; + using std::min; static const int N = 50; diff --git a/src/mongo/dbtests/query_stage_merge_sort.cpp b/src/mongo/dbtests/query_stage_merge_sort.cpp index a157ef635c6..e2b0d9e44fb 100644 --- a/src/mongo/dbtests/query_stage_merge_sort.cpp +++ b/src/mongo/dbtests/query_stage_merge_sort.cpp @@ -45,6 +45,10 @@ namespace QueryStageMergeSortTests { + using std::auto_ptr; + using std::set; + using std::string; + class QueryStageMergeSortTestBase { public: QueryStageMergeSortTestBase() : _client(&_txn) { diff --git a/src/mongo/dbtests/query_stage_sort.cpp b/src/mongo/dbtests/query_stage_sort.cpp index bb3ef814899..e4c42945f6f 100644 --- a/src/mongo/dbtests/query_stage_sort.cpp +++ b/src/mongo/dbtests/query_stage_sort.cpp @@ -45,6 +45,9 @@ namespace QueryStageSortTests { + using std::auto_ptr; + using std::set; + class QueryStageSortTestBase { public: QueryStageSortTestBase() : _client(&_txn) { diff --git a/src/mongo/dbtests/query_stage_tests.cpp b/src/mongo/dbtests/query_stage_tests.cpp index 2ed9925716c..71490621109 100644 --- a/src/mongo/dbtests/query_stage_tests.cpp +++ b/src/mongo/dbtests/query_stage_tests.cpp @@ -44,6 +44,8 @@ namespace QueryStageTests { + using std::auto_ptr; + class IndexScanBase { public: IndexScanBase() : _client(&_txn) { diff --git a/src/mongo/dbtests/query_stage_update.cpp b/src/mongo/dbtests/query_stage_update.cpp index 814a67e4e4f..eed2e5911ac 100644 --- a/src/mongo/dbtests/query_stage_update.cpp +++ b/src/mongo/dbtests/query_stage_update.cpp @@ -51,6 +51,8 @@ namespace QueryStageUpdate { using boost::scoped_ptr; + using std::auto_ptr; + using std::vector; class QueryStageUpdateBase { public: diff --git a/src/mongo/dbtests/querytests.cpp b/src/mongo/dbtests/querytests.cpp index 80bb6c6f3b0..369a694240c 100644 --- a/src/mongo/dbtests/querytests.cpp +++ b/src/mongo/dbtests/querytests.cpp @@ -55,6 +55,12 @@ namespace mongo { namespace QueryTests { + using std::auto_ptr; + using std::cout; + using std::endl; + using std::string; + using std::vector; + class Base { public: Base() : _scopedXact(&_txn, MODE_X), diff --git a/src/mongo/dbtests/repltests.cpp b/src/mongo/dbtests/repltests.cpp index 9b72477905a..1daaae6ec71 100644 --- a/src/mongo/dbtests/repltests.cpp +++ b/src/mongo/dbtests/repltests.cpp @@ -54,6 +54,12 @@ using namespace mongo::repl; namespace ReplTests { + using std::auto_ptr; + using std::endl; + using std::string; + using std::stringstream; + using std::vector; + BSONObj f( const char *s ) { return fromjson( s ); } diff --git a/src/mongo/dbtests/sharding.cpp b/src/mongo/dbtests/sharding.cpp index 6a70c2b0a9c..c0dd23a6306 100644 --- a/src/mongo/dbtests/sharding.cpp +++ b/src/mongo/dbtests/sharding.cpp @@ -48,6 +48,11 @@ namespace ShardingTests { using boost::shared_ptr; + using std::make_pair; + using std::map; + using std::pair; + using std::set; + using std::string; namespace serverandquerytests { class test1 { diff --git a/src/mongo/dbtests/threadedtests.cpp b/src/mongo/dbtests/threadedtests.cpp index c317906edc6..62d8465e940 100644 --- a/src/mongo/dbtests/threadedtests.cpp +++ b/src/mongo/dbtests/threadedtests.cpp @@ -53,6 +53,11 @@ namespace ThreadedTests { + using std::auto_ptr; + using std::cout; + using std::endl; + using std::string; + template <int nthreads_param=10> class ThreadedTest { public: diff --git a/src/mongo/dbtests/updatetests.cpp b/src/mongo/dbtests/updatetests.cpp index 04968f6be05..1b579f1c0c6 100644 --- a/src/mongo/dbtests/updatetests.cpp +++ b/src/mongo/dbtests/updatetests.cpp @@ -48,6 +48,12 @@ namespace UpdateTests { + using std::auto_ptr; + using std::numeric_limits; + using std::string; + using std::stringstream; + using std::vector; + class ClientBase { public: ClientBase() : _client(&_txn) { |