Fixed test names

Author: christkv

lib/mongodb/collection.js

@@ -575,7 +575,7 @@ Collection.prototype.count = function count (query, options, callback) {
  if(typeof limit == 'number') commandObject.limit = limit;
 
  // Set read preference if we set one
- var readPreference = _getReadConcern(this, options);
+ options.readPreference = _getReadConcern(this, options);
 
  // Execute the command
  this.db.command(commandObject, options, function(err, result) {

test/tests/functional/admin_mode_tests.js

@@ -42,7 +42,7 @@ exports.shouldCorrectlyCallValidateCollectionUsingAuthenticatedMode = function(c
  * @_function authenticate
  * @ignore
  */
-exports.shouldCorrectlyAuthenticate_A = function(configure, test) {
+exports.shouldCorrectlyAuthenticate = function(configure, test) {
  var db = configure.newDbInstance({w:1}, {poolSize:1});
  // DOC_LINE var db = new Db('test', new Server('locahost', 27017));
  // DOC_START
@@ -84,7 +84,7 @@ exports.shouldCorrectlyAuthenticate_A = function(configure, test) {
  * @_function admin
  * @ignore
  */
-exports.shouldCorrectlyAuthenticate_B = function(configure, test) {
+exports.accessAdminLevelOperations = function(configure, test) {
  var db = configure.newDbInstance({w:1}, {poolSize:1});
  // DOC_LINE var db = new Db('test', new Server('locahost', 27017));
  // DOC_START
@@ -107,7 +107,7 @@ exports.shouldCorrectlyAuthenticate_B = function(configure, test) {
  * @_function buildInfo
  * @ignore
  */
-exports.shouldCorrectlyAuthenticate_C = function(configure, test) {
+exports.shouldCorrectlyRetrieveBuildInfo = function(configure, test) {
  var db = configure.newDbInstance({w:1}, {poolSize:1});
 
  // DOC_LINE var db = new Db('test', new Server('locahost', 27017));
@@ -149,7 +149,7 @@ exports.shouldCorrectlyAuthenticate_C = function(configure, test) {
  * @_function command
  * @ignore
  */
-exports.shouldCorrectlyAuthenticate_D = function(configure, test) {
+exports.shouldCorrectlyRetrieveBuildInfoUsingCommand = function(configure, test) {
  var db = configure.newDbInstance({w:1}, {poolSize:1});
 
  // DOC_LINE var db = new Db('test', new Server('locahost', 27017));

test/tests/functional/db_tests.js

@@ -431,13 +431,13 @@ exports.shouldCorrectlyOpenASimpleDbSingleServerConnectionAndCloseWithCallback =
 }
 
 /**
- * An example of retrieveing the information of all the collections.
+ * An example of retrieving the information of all the collections.
  *
  * @_class db
  * @_function collectionsInfo
  * @ignore
  */
-exports.shouldCorrectlyRetrieveCollectionInfo_A = function(configuration, test) {
+exports.shouldCorrectlyRetrieveCollectionInformation = function(configuration, test) {
  var db = configuration.newDbInstance({w:0}, {poolSize:1, auto_reconnect:false});
 
  // DOC_LINE var db = new Db('test', new Server('locahost', 27017));
@@ -472,13 +472,13 @@ exports.shouldCorrectlyRetrieveCollectionInfo_A = function(configuration, test)
 }
 
 /**
- * An example of retrieveing the collection names for a database.
+ * An example of retrieving the collection names for a database.
  *
  * @_class db
  * @_function collectionNames
  * @ignore
  */
-exports.shouldCorrectlyRetrieveCollectionInfo_B = function(configuration, test) {
+exports.shouldCorrectlyRetrieveCollectionNames = function(configuration, test) {
  var db = configuration.newDbInstance({w:0}, {poolSize:1, auto_reconnect:false});
 
  // DOC_LINE var db = new Db('test', new Server('locahost', 27017));
@@ -728,7 +728,7 @@ exports.shouldCorrectlyLogoutFromTheDatabase = function(configuration, test) {
  * @_function authenticate
  * @ignore
  */
-exports.shouldCorrectlyAuthenticateAgainstTheDatabase_A = function(configuration, test) {
+exports.shouldCorrectlyAuthenticateAgainstTheDatabase = function(configuration, test) {
  if(configuration.db().serverConfig instanceof configuration.getMongoPackage().ReplSet) return test.done();
  var db = configuration.newDbInstance({w:0}, {poolSize:1, auto_reconnect:false});
 
@@ -761,7 +761,7 @@ exports.shouldCorrectlyAuthenticateAgainstTheDatabase_A = function(configuration
  * @_function addUser
  * @ignore
  */
-exports.shouldCorrectlyAuthenticateAgainstTheDatabase_B = function(configuration, test) {
+exports.shouldCorrectlyAddUserToDb = function(configuration, test) {
  if(configuration.db().serverConfig instanceof configuration.getMongoPackage().ReplSet) return test.done();
  var db = configuration.newDbInstance({w:0}, {poolSize:1, auto_reconnect:false});
 
@@ -1374,7 +1374,7 @@ exports.shouldCorrectlyForceReindexOnCollection = function(configuration, test)
  * @_class db
  * @_function indexInformation
  */
-exports.shouldCorrectlyShowTheResultsFromIndexInformation_A = function(configuration, test) {
+exports.shouldCorrectlyShowTheResultsFromIndexInformation = function(configuration, test) {
  var db = configuration.newDbInstance({w:0}, {poolSize:1, auto_reconnect:false});
 
  // DOC_LINE var db = new Db('test', new Server('locahost', 27017));
@@ -1422,7 +1422,7 @@ exports.shouldCorrectlyShowTheResultsFromIndexInformation_A = function(configura
  * @_class db
  * @_function dropDatabase
  */
-exports.shouldCorrectlyShowTheResultsFromIndexInformation_B = function(configuration, test) {
+exports.shouldCorrectlyDropTheDatabase = function(configuration, test) {
  var db = configuration.newDbInstance({w:0}, {poolSize:1, auto_reconnect:false});
 
  // DOC_LINE var db = new Db('test', new Server('locahost', 27017));

test/tests/functional/find_tests.js

@@ -1407,7 +1407,7 @@ exports.shouldPerformSimpleFindInArray = function(configuration, test) {
  * @_class collection
  * @_function findAndModify
  */
-exports.shouldPerformSimpleFindAndModifyOperations_A = function(configuration, test) {
+exports.shouldPerformSimpleFindAndModifyOperations = function(configuration, test) {
  var db = configuration.newDbInstance({w:0}, {poolSize:1, auto_reconnect:false});
 
  // DOC_LINE var db = new Db('test', new Server('locahost', 27017));
@@ -1465,7 +1465,7 @@ exports.shouldPerformSimpleFindAndModifyOperations_A = function(configuration, t
  * @_class collection
  * @_function findAndRemove
  */
-exports.shouldPerformSimpleFindAndModifyOperations_B = function(configuration, test) {
+exports.shouldPerformSimpleFindAndRemove = function(configuration, test) {
  var db = configuration.newDbInstance({w:0}, {poolSize:1, auto_reconnect:false});
 
  // DOC_LINE var db = new Db('test', new Server('locahost', 27017));

test/tests/functional/mongo_reply_parser_tests.js

@@ -244,7 +244,7 @@ exports['Should correctly parse message + in two packets from socket and smaller
 /**
  * @ignore
  */
-exports['Should correctly parse message + in two packets from socket and smaller than 4 bytes additional one then partial message A'] = function(configuration, test) { 
+exports['Should correctly parse message + in two packets from socket and smaller than 4 bytes additional one then partial message'] = function(configuration, test) { 
  // Data object
  var index = 0;
  var buffer = new Buffer(20);
@@ -295,7 +295,7 @@ exports['Should correctly parse message + in two packets from socket and smaller
 /**
  * @ignore
  */
-exports['Should correctly parse message + in two packets from socket and smaller than 4 bytes additional one then partial message B'] = function(configuration, test) { 
+exports['Should correctly parse message + in two packets from socket and smaller than 4 bytes additional one then partial message into a bigger buffer'] = function(configuration, test) { 
  // Data object
  var index = 0;
  var buffer = new Buffer(40);

test/tests/functional/objectid_tests.js

@@ -84,7 +84,7 @@ exports.shouldCorrectlyGenerate12ByteStringFromTimestamp = function(configuratio
  * @_function toHexString
  * @ignore
  */
-exports.shouldCorrectlyRetrieve24CharacterHexStringFromToString_A = function(configuration, test) {
+exports.shouldCorrectlyRetrieve24CharacterHexStringFromToHexString = function(configuration, test) {
  var ObjectID = configuration.getMongoPackage().ObjectID;
  // DOC_START
  // Create a new ObjectID
@@ -125,7 +125,7 @@ exports.shouldCorrectlyGetAndSetObjectIDUsingGenerationTimeProperty = function(c
 /**
  * @ignore
  */
-exports.shouldCorrectlyRetrieve24CharacterHexStringFromToString_B = function(configuration, test) {
+exports.shouldCorrectlyRetrieve24CharacterHexStringFromToString = function(configuration, test) {
  var ObjectID = configuration.getMongoPackage().ObjectID;
  // Create a new ObjectID
  var objectId = new ObjectID(); 
@@ -137,7 +137,7 @@ exports.shouldCorrectlyRetrieve24CharacterHexStringFromToString_B = function(con
 /**
  * @ignore
  */
-exports.shouldCorrectlyRetrieve24CharacterHexStringFromToString_C = function(configuration, test) {
+exports.shouldCorrectlyRetrieve24CharacterHexStringFromToJSON = function(configuration, test) {
  var ObjectID = configuration.getMongoPackage().ObjectID;
  // Create a new ObjectID
  var objectId = new ObjectID(); 
@@ -153,7 +153,7 @@ exports.shouldCorrectlyRetrieve24CharacterHexStringFromToString_C = function(con
  * @_function ObjectID.createFromHexString
  * @ignore
  */
-exports.shouldCorrectlyTransformObjectIDToAndFromHexString_A = function(configuration, test) {
+exports.shouldCorrectlyTransformObjectIDToHexAndObjectId = function(configuration, test) {
  var ObjectID = configuration.getMongoPackage().ObjectID;
  // DOC_START
  // Create a new ObjectID
@@ -177,7 +177,7 @@ exports.shouldCorrectlyTransformObjectIDToAndFromHexString_A = function(configur
  * @_function equals
  * @ignore
  */
-exports.shouldCorrectlyTransformObjectIDToAndFromHexString_B = function(configuration, test) {
+exports.shouldCorrectlyDifferentiateBetweenObjectIdInstances = function(configuration, test) {
  var ObjectID = configuration.getMongoPackage().ObjectID;
  // DOC_START
  // Create a new ObjectID
@@ -295,7 +295,7 @@ exports.shouldCorrectlyInsertWithObjectId = function(configuration, test) {
  * @_function ObjectID.createFromTime
  * @ignore
  */
-exports.shouldCorrectlyTransformObjectIDToAndFromHexString_C = function(configuration, test) {
+exports.shouldCorrectlyUseCreateFromTime = function(configuration, test) {
  var ObjectID = configuration.getMongoPackage().ObjectID;
  // DOC_START
  var objectId = ObjectID.createFromTime(1);

test/tests/functional/uri_tests.js

@@ -151,7 +151,7 @@ exports['Should correctly connect via normal url using require'] = function(conf
  });
 }
 
-exports['Should correctly connect via normal url A'] = function(configuration, test) {
+exports['Should correctly connect via normal url safe set to false'] = function(configuration, test) {
  if(configuration.db().serverConfig instanceof configuration.getMongoPackage().ReplSet) return test.done();
  var Db = configuration.getMongoPackage().Db;
 
@@ -162,18 +162,7 @@ exports['Should correctly connect via normal url A'] = function(configuration, t
  });
 }
 
-exports['Should correctly connect via normal url B'] = function(configuration, test) {
- if(configuration.db().serverConfig instanceof configuration.getMongoPackage().ReplSet) return test.done();
- var Db = configuration.getMongoPackage().Db;
-
- Db.connect("mongodb://localhost?journal=true", function(err, db) {
- // test.equal(false, db.safe);
- db.close();
- test.done();
- });
-}
-
-exports['Should correctly connect via normal url C'] = function(configuration, test) {
+exports['Should correctly connect via normal url journal option'] = function(configuration, test) {
  if(configuration.db().serverConfig instanceof configuration.getMongoPackage().ReplSet) return test.done();
  var Db = configuration.getMongoPackage().Db;
 

test/tests/repl_set/read_preferences_spec_tests.js

@@ -182,12 +182,11 @@ exports['Should Correctly Vary read server when using readpreference NEAREST'] =
  // Open the database
  var db = new Db('integration_test_', replSet, {w:1});
  db.open(function(err, db) {
- // // Force selection of a secondary
- // db.serverConfig._state.master.runtimeStats['pingMs'] = 5000;
- // // Check that we get a secondary
- // var connection = db.serverConfig.checkoutReader();
- // var keys = Object.keys(db.serverConfig._state.secondaries);
- // var found = false;
+ // Check that we are getting different servers
+ var connection = db.serverConfig.checkoutReader();
+ var port = connection.socketOptions.port;
+ connection = db.serverConfig.checkoutReader();
+ test.ok(port != connection.socketOptions.port);
 
  // Execute a query
  db.collection('nearest_collection_test').insert({a:1}, {w:3, wtimeout:10000}, function(err, doc) {