SERVER-23243 Replace Listener::getElapsedTimeMillis() in scoped_timer.cpp

1 files changed, 14 insertions, 6 deletions

diff --git a/src/mongo/dbtests/query_stage_near.cpp b/src/mongo/dbtests/query_stage_near.cpp
index 58833e6a2bf..d973779e7ed 100644
--- a/src/mongo/dbtests/query_stage_near.cpp
+++ b/src/mongo/dbtests/query_stage_near.cpp
@@ -34,6 +34,7 @@
 #include "mongo/platform/basic.h"
 
 #include "mongo/base/owned_pointer_vector.h"
+#include "mongo/db/client.h"
 #include "mongo/db/exec/near.h"
 #include "mongo/db/exec/queued_data_stage.h"
 #include "mongo/db/exec/working_set_common.h"
@@ -48,6 +49,12 @@ using std::unique_ptr;
 using std::vector;
 using stdx::make_unique;
 
+class QueryStageNearTest : public unittest::Test {
+protected:
+    const ServiceContext::UniqueOperationContext _uniqOpCtx = cc().makeOperationContext();
+    OperationContext* const _opCtx = _uniqOpCtx.get();
+};
+
 /**
  * Stage which implements a basic distance search, and interprets the "distance" field of
  * fetched documents as the distance.
@@ -63,8 +70,9 @@ public:
         double max;
     };
 
-    MockNearStage(WorkingSet* workingSet)
-        : NearStage(NULL, "MOCK_DISTANCE_SEARCH_STAGE", STAGE_UNKNOWN, workingSet, NULL), _pos(0) {}
+    MockNearStage(OperationContext* opCtx, WorkingSet* workingSet)
+        : NearStage(opCtx, "MOCK_DISTANCE_SEARCH_STAGE", STAGE_UNKNOWN, workingSet, NULL),
+          _pos(0) {}
 
     void addInterval(vector<BSONObj> data, double min, double max) {
         _intervals.mutableVector().push_back(new MockInterval(data, min, max));
@@ -139,11 +147,11 @@ static void assertAscendingAndValid(const vector<BSONObj>& results) {
     }
 }
 
-TEST(query_stage_near, Basic) {
+TEST_F(QueryStageNearTest, Basic) {
     vector<BSONObj> mockData;
     WorkingSet workingSet;
 
-    MockNearStage nearStage(&workingSet);
+    MockNearStage nearStage(_opCtx, &workingSet);
 
     // First set of results
     mockData.clear();
@@ -174,11 +182,11 @@ TEST(query_stage_near, Basic) {
     assertAscendingAndValid(results);
 }
 
-TEST(query_stage_near, EmptyResults) {
+TEST_F(QueryStageNearTest, EmptyResults) {
     vector<BSONObj> mockData;
     WorkingSet workingSet;
 
-    MockNearStage nearStage(&workingSet);
+    MockNearStage nearStage(_opCtx, &workingSet);
 
     // Empty set of results
     mockData.clear();