SERVER-10026 remove test code that relies on dead code

2 files changed, 0 insertions, 79 deletions

diff --git a/jstests/stages_ixscan.js b/jstests/stages_ixscan.js
index b0a0050044c..a7cd6bedc3a 100644
--- a/jstests/stages_ixscan.js
+++ b/jstests/stages_ixscan.js
@@ -74,41 +74,3 @@ ixscan1 = {ixscan: {args:{name: "stages_ixscan", keyPattern:{foo:1, baz: 1},
 res = db.runCommand({stageDebug: ixscan1});
 assert(db.getLastError());
 assert.eq(res.ok, 0);
-
-// Try 2dsphere.
-t.drop();
-
-Random.setRandomSeed();
-var random = Random.rand;
-function sign() { return random() > 0.5 ? 1 : -1; }
-var minDist = 0;
-var maxDist = 1;
-for(var i = 0; i < N; i++){
-    var lat = sign() * (minDist + random() * (maxDist - minDist));
-    var lng = sign() * (minDist + random() * (maxDist - minDist));
-    var point = { geo: [lng, lat]};
-    t.insert(point);
-    assert(!db.getLastError());
-}
-t.ensureIndex({geo: "2dsphere"});
-
-ixscan1 = {ixscan: {args:{name: "stages_ixscan", keyPattern:{geo: "2dsphere"},
-                          startKey: {geo: {$geoNear: {$geometry: {type: "Point", coordinates:[0,0]}}}},
-                          endKey: {}, endKeyInclusive: false,
-                          direction: 1}}};
-res = db.runCommand({stageDebug: ixscan1});
-assert(!db.getLastError());
-assert.eq(res.ok, 1);
-assert.eq(res.results.length, N);
-
-// Also, try 2d.
-t.dropIndex({geo: "2dsphere"});
-t.ensureIndex({geo: "2d"});
-ixscan1 = {ixscan: {args:{name: "stages_ixscan", keyPattern:{geo: "2d"},
-                          startKey: {geo: {$near: [0,0]}},
-                          endKey: {}, endKeyInclusive: false,
-                          direction: 1, limit: 100}}};
-res = db.runCommand({stageDebug: ixscan1});
-assert(!db.getLastError());
-assert.eq(res.ok, 1);
-assert.eq(res.results.length, N);
diff --git a/src/mongo/dbtests/queryoptimizercursortests.cpp b/src/mongo/dbtests/queryoptimizercursortests.cpp
index bea12a93280..f599549e32f 100644
--- a/src/mongo/dbtests/queryoptimizercursortests.cpp
+++ b/src/mongo/dbtests/queryoptimizercursortests.cpp
@@ -3633,45 +3633,6 @@ namespace QueryOptimizerCursorTests {
             }
         };
         
-        class Geo : public Base {
-        public:
-            Geo() {
-                _cli.insert( ns(), BSON( "_id" << 44 << "loc" << BSON_ARRAY( 44 << 45 ) ) );
-                _cli.ensureIndex( ns(), BSON( "loc" << "2d" ) );
-            }
-            string expectedType() const { return "GeoSearchCursor"; }
-            BSONObj query() const { return fromjson( "{ loc : { $near : [50,50] } }" ); }
-            void check( const shared_ptr<Cursor> &c ) {
-                ASSERT( c->ok() );
-                ASSERT( c->matcher() );
-                ASSERT( c->matcher()->matchesCurrent( c.get() ) );
-                ASSERT_EQUALS( 44, c->current().getIntField( "_id" ) );
-                ASSERT( !c->advance() );
-            }
-        };
-        
-        class GeoNumWanted : public Base {
-        public:
-            GeoNumWanted() {
-                _cli.ensureIndex( ns(), BSON( "loc" << "2d" ) );
-                for( int i = 0; i < 140; ++i ) {
-                    _cli.insert( ns(), BSON( "loc" << BSON_ARRAY( 44 << 45 ) ) );
-                }
-            }
-            string expectedType() const { return "GeoSearchCursor"; }
-            BSONObj query() const { return fromjson( "{ loc : { $near : [50,50] } }" ); }
-            void check( const shared_ptr<Cursor> &c ) {
-                int count = 0;
-                while( c->ok() ) {
-                    ++count;
-                    c->advance();
-                }
-                ASSERT_EQUALS( 130, count );
-            }
-            int skip() const { return 27; }
-            int limit() const { return 103; }
-        };
-        
         class PreventOutOfOrderPlan : public QueryOptimizerCursorTests::Base {
         public:
             void run() {
@@ -4961,8 +4922,6 @@ namespace QueryOptimizerCursorTests {
             add<GetCursor::SimpleId>();
             add<GetCursor::OptimalIndex>();
             add<GetCursor::SimpleKeyMatch>();
-            add<GetCursor::Geo>();
-            add<GetCursor::GeoNumWanted>();
             add<GetCursor::PreventOutOfOrderPlan>();
             add<GetCursor::AllowOutOfOrderPlan>();
             add<GetCursor::BestSavedOutOfOrder>();