From 8784ad77c5a1e2327c5c0b9f50343e0186f6bfab Mon Sep 17 00:00:00 2001 From: Vesselina Ratcheva Date: Mon, 7 Oct 2019 20:11:46 +0000 Subject: SERVER-43273 Add UUID support to count and getIndexSpecs in DBClient --- src/mongo/dbtests/clienttests.cpp | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'src/mongo/dbtests/clienttests.cpp') diff --git a/src/mongo/dbtests/clienttests.cpp b/src/mongo/dbtests/clienttests.cpp index 77d690847cd..a18f4c259b7 100644 --- a/src/mongo/dbtests/clienttests.cpp +++ b/src/mongo/dbtests/clienttests.cpp @@ -62,6 +62,10 @@ public: db.dropCollection(_ns); } + const NamespaceString nss() { + return NamespaceString(_ns); + } + const char* ns() { return _ns.c_str(); } @@ -79,19 +83,19 @@ public: DBDirectClient db(&opCtx); db.insert(ns(), BSON("x" << 2)); - ASSERT_EQUALS(1u, db.getIndexSpecs(ns()).size()); + ASSERT_EQUALS(1u, db.getIndexSpecs(nss()).size()); ASSERT_OK(dbtests::createIndex(&opCtx, ns(), BSON("x" << 1))); - ASSERT_EQUALS(2u, db.getIndexSpecs(ns()).size()); + ASSERT_EQUALS(2u, db.getIndexSpecs(nss()).size()); db.dropIndex(ns(), BSON("x" << 1)); - ASSERT_EQUALS(1u, db.getIndexSpecs(ns()).size()); + ASSERT_EQUALS(1u, db.getIndexSpecs(nss()).size()); ASSERT_OK(dbtests::createIndex(&opCtx, ns(), BSON("x" << 1))); - ASSERT_EQUALS(2u, db.getIndexSpecs(ns()).size()); + ASSERT_EQUALS(2u, db.getIndexSpecs(nss()).size()); db.dropIndexes(ns()); - ASSERT_EQUALS(1u, db.getIndexSpecs(ns()).size()); + ASSERT_EQUALS(1u, db.getIndexSpecs(nss()).size()); } }; @@ -118,18 +122,18 @@ public: ASSERT_EQUALS(1, indexCatalog->numIndexesReady(&opCtx)); // _id index - ASSERT_EQUALS(1U, db.getIndexSpecs(ns()).size()); + ASSERT_EQUALS(1U, db.getIndexSpecs(nss()).size()); ASSERT_EQUALS(ErrorCodes::DuplicateKey, dbtests::createIndex(&opCtx, ns(), BSON("y" << 1), true)); ASSERT_EQUALS(1, indexCatalog->numIndexesReady(&opCtx)); - ASSERT_EQUALS(1U, db.getIndexSpecs(ns()).size()); + ASSERT_EQUALS(1U, db.getIndexSpecs(nss()).size()); ASSERT_OK(dbtests::createIndex(&opCtx, ns(), BSON("x" << 1), true)); ASSERT_EQUALS(2, indexCatalog->numIndexesReady(&opCtx)); - ASSERT_EQUALS(2U, db.getIndexSpecs(ns()).size()); + ASSERT_EQUALS(2U, db.getIndexSpecs(nss()).size()); } }; -- cgit v1.2.1