SERVER-16518 listCollections response changed to cursor object form

As a temporary compatibility measure, the legacy behavior is preserved
if the "cursor" option is not sent with the command.  This
compatibility layer will be removed as part of work for the parent
ticket.

1 files changed, 10 insertions, 7 deletions

diff --git a/jstests/mmap_v1/list_collections2.js b/jstests/mmap_v1/list_collections2.js
index bfa672d412c..5f7de730eea 100644
--- a/jstests/mmap_v1/list_collections2.js
+++ b/jstests/mmap_v1/list_collections2.js
@@ -7,10 +7,11 @@ mydb.foo.insert( { x : 5 } );
 
 mydb.runCommand( { create : "bar", temp : true } );
 
-res = mydb.runCommand( "listCollections" );
+res = mydb.runCommand( "listCollections", { cursor : {} } );
+collections = new DBCommandCursor( db.getMongo(), res ).toArray();
 
-bar = res.collections.filter( function(x){ return x.name == "bar"; } )[0];
-foo = res.collections.filter( function(x){ return x.name == "foo" ; } )[0];
+bar = collections.filter( function(x){ return x.name == "bar"; } )[0];
+foo = collections.filter( function(x){ return x.name == "foo" ; } )[0];
 
 assert( bar );
 assert( foo );
@@ -20,10 +21,12 @@ assert.eq( foo.name, mydb.foo.getName() );
 
 assert( mydb.bar.temp, tojson( bar ) );
 
-assert.eq( mydb._getCollectionNamesSystemNamespaces(),
-           mydb._getCollectionNamesCommand() );
+getCollectionName = function(infoObj) { return infoObj.name; }
 
-assert.eq( mydb.getCollectionNames(),
-           mydb._getCollectionNamesCommand() );
+assert.eq( mydb._getCollectionInfosSystemNamespaces().map(getCollectionName),
+           mydb._getCollectionInfosCommand().map(getCollectionName) );
+
+assert.eq( mydb.getCollectionInfos().map(getCollectionName),
+           mydb._getCollectionInfosCommand().map(getCollectionName) );
 
 mydb.dropDatabase();