diff options
author | Jonathan Abrahams <jonathan@mongodb.com> | 2016-03-09 12:17:50 -0500 |
---|---|---|
committer | Jonathan Abrahams <jonathan@mongodb.com> | 2016-03-09 12:18:14 -0500 |
commit | 4ae691e8edc87d0e3cfb633bb91c328426be007b (patch) | |
tree | 52079a593f54382ca13a2e741633eab1b6271893 /jstests/gle/core | |
parent | a025d43f3ce2efc1fb1282a718f5d286fa0a4dc1 (diff) | |
download | mongo-4ae691e8edc87d0e3cfb633bb91c328426be007b.tar.gz |
SERVER-22468 Format JS code with approved style in jstests/
Diffstat (limited to 'jstests/gle/core')
-rw-r--r-- | jstests/gle/core/error1.js | 43 | ||||
-rw-r--r-- | jstests/gle/core/error3.js | 8 | ||||
-rw-r--r-- | jstests/gle/core/gle_example.js | 13 | ||||
-rw-r--r-- | jstests/gle/core/gle_shell_server5441.js | 14 | ||||
-rw-r--r-- | jstests/gle/core/remove5.js | 30 | ||||
-rw-r--r-- | jstests/gle/core/update4.js | 42 |
6 files changed, 74 insertions, 76 deletions
diff --git a/jstests/gle/core/error1.js b/jstests/gle/core/error1.js index b29986976c4..44667867d4c 100644 --- a/jstests/gle/core/error1.js +++ b/jstests/gle/core/error1.js @@ -1,41 +1,40 @@ db.jstests_error1.drop(); // test 1 -db.runCommand({reseterror:1}); -assert( db.runCommand({getlasterror:1}).err == null, "A" ); -assert( db.runCommand({getpreverror:1}).err == null, "B" ); +db.runCommand({reseterror: 1}); +assert(db.runCommand({getlasterror: 1}).err == null, "A"); +assert(db.runCommand({getpreverror: 1}).err == null, "B"); db.resetError(); -assert( db.getLastError() == null, "C" ); -assert( db.getPrevError().err == null , "preverror 1" ); +assert(db.getLastError() == null, "C"); +assert(db.getPrevError().err == null, "preverror 1"); // test 2 -db.runCommand({forceerror:1}); -assert( db.runCommand({getlasterror:1}).err != null, "D" ); -assert( db.runCommand({getpreverror:1}).err != null, "E" ); +db.runCommand({forceerror: 1}); +assert(db.runCommand({getlasterror: 1}).err != null, "D"); +assert(db.runCommand({getpreverror: 1}).err != null, "E"); - -assert( db.getLastError() != null, "F" ); -assert( db.getPrevError().err != null , "preverror 2" ); -assert( db.getPrevError().nPrev == 1, "G" ); +assert(db.getLastError() != null, "F"); +assert(db.getPrevError().err != null, "preverror 2"); +assert(db.getPrevError().nPrev == 1, "G"); db.jstests_error1.findOne(); -assert( db.runCommand({getlasterror:1}).err == null, "H" ); -assert( db.runCommand({getpreverror:1}).err != null, "I" ); -assert( db.runCommand({getpreverror:1}).nPrev == 2, "J" ); +assert(db.runCommand({getlasterror: 1}).err == null, "H"); +assert(db.runCommand({getpreverror: 1}).err != null, "I"); +assert(db.runCommand({getpreverror: 1}).nPrev == 2, "J"); db.jstests_error1.findOne(); -assert( db.runCommand({getlasterror:1}).err == null, "K" ); -assert( db.runCommand({getpreverror:1}).err != null, "L" ); -assert( db.runCommand({getpreverror:1}).nPrev == 3, "M" ); +assert(db.runCommand({getlasterror: 1}).err == null, "K"); +assert(db.runCommand({getpreverror: 1}).err != null, "L"); +assert(db.runCommand({getpreverror: 1}).nPrev == 3, "M"); db.resetError(); db.forceError(); db.jstests_error1.findOne(); -assert( db.getLastError() == null , "getLastError 5" ); -assert( db.getPrevError().err != null , "preverror 3" ); +assert(db.getLastError() == null, "getLastError 5"); +assert(db.getPrevError().err != null, "preverror 3"); // test 3 -db.runCommand({reseterror:1}); -assert( db.runCommand({getpreverror:1}).err == null, "N" ); +db.runCommand({reseterror: 1}); +assert(db.runCommand({getpreverror: 1}).err == null, "N"); diff --git a/jstests/gle/core/error3.js b/jstests/gle/core/error3.js index 9f7f298cb5e..7067f68f8a8 100644 --- a/jstests/gle/core/error3.js +++ b/jstests/gle/core/error3.js @@ -1,5 +1,5 @@ -db.runCommand( "forceerror" ); -assert.eq( "forced error" , db.getLastError() ); -db.runCommand( "switchtoclienterrors" ); -assert.isnull( db.getLastError() ); +db.runCommand("forceerror"); +assert.eq("forced error", db.getLastError()); +db.runCommand("switchtoclienterrors"); +assert.isnull(db.getLastError()); diff --git a/jstests/gle/core/gle_example.js b/jstests/gle/core/gle_example.js index 8c6e481b5a7..6096f605217 100644 --- a/jstests/gle/core/gle_example.js +++ b/jstests/gle/core/gle_example.js @@ -5,13 +5,13 @@ var coll = db.getCollection("gle_example"); coll.drop(); -coll.insert({ hello : "world" }); -assert.eq( null, coll.getDB().getLastError() ); +coll.insert({hello: "world"}); +assert.eq(null, coll.getDB().getLastError()); // Error on insert. coll.drop(); -coll.insert({ _id: 1 }); -coll.insert({ _id: 1 }); +coll.insert({_id: 1}); +coll.insert({_id: 1}); var gle = db.getLastErrorObj(); assert.neq(null, gle.err); @@ -22,8 +22,7 @@ assert.eq(null, gle.err); // Error on upsert. coll.drop(); -coll.insert({ _id: 1 }); -coll.update({ y: 1 }, { _id: 1 }, true); +coll.insert({_id: 1}); +coll.update({y: 1}, {_id: 1}, true); gle = db.getLastErrorObj(); assert.neq(null, gle.err); - diff --git a/jstests/gle/core/gle_shell_server5441.js b/jstests/gle/core/gle_shell_server5441.js index dedb135f20a..e488c289299 100644 --- a/jstests/gle/core/gle_shell_server5441.js +++ b/jstests/gle/core/gle_shell_server5441.js @@ -12,16 +12,16 @@ function checkgle(iteration) { assert.eq(2, gle.n, "failed on iteration " + iteration + ", getLastErrorObj()=" + tojson(gle)); } -t.insert( { x : 1 } ); -t.insert( { x : 1 } ); -updateReturn = t.update( {} , { $inc : { x : 2 } } , false , true ); +t.insert({x: 1}); +t.insert({x: 1}); +updateReturn = t.update({}, {$inc: {x: 2}}, false, true); -for ( i=0; i<100; i++ ) { - checkgle(""+i); +for (i = 0; i < 100; i++) { + checkgle("" + i); } -db.adminCommand( { replSetGetStatus : 1 , forShell : 1 } ); -shellPrintHelper( updateReturn ); +db.adminCommand({replSetGetStatus: 1, forShell: 1}); +shellPrintHelper(updateReturn); defaultPrompt(); checkgle("'final'"); diff --git a/jstests/gle/core/remove5.js b/jstests/gle/core/remove5.js index 6558854264f..4a9393ea202 100644 --- a/jstests/gle/core/remove5.js +++ b/jstests/gle/core/remove5.js @@ -2,23 +2,23 @@ f = db.jstests_remove5; f.drop(); getLastError = function() { - return db.runCommand( { getlasterror : 1 } ); + return db.runCommand({getlasterror: 1}); }; -f.remove( {} ); -assert.eq( 0, getLastError().n ); -f.save( {a:1} ); -f.remove( {} ); -assert.eq( 1, getLastError().n ); -for( i = 0; i < 10; ++i ) { - f.save( {i:i} ); +f.remove({}); +assert.eq(0, getLastError().n); +f.save({a: 1}); +f.remove({}); +assert.eq(1, getLastError().n); +for (i = 0; i < 10; ++i) { + f.save({i: i}); } -f.remove( {} ); -assert.eq( 10, getLastError().n ); -assert.eq( 10, db.getPrevError().n ); -assert.eq( 1, db.getPrevError().nPrev ); +f.remove({}); +assert.eq(10, getLastError().n); +assert.eq(10, db.getPrevError().n); +assert.eq(1, db.getPrevError().nPrev); f.findOne(); -assert.eq( 0, getLastError().n ); -assert.eq( 10, db.getPrevError().n ); -assert.eq( 2, db.getPrevError().nPrev ); +assert.eq(0, getLastError().n); +assert.eq(10, db.getPrevError().n); +assert.eq(2, db.getPrevError().nPrev); diff --git a/jstests/gle/core/update4.js b/jstests/gle/core/update4.js index 3d68dc24916..83dbf717019 100644 --- a/jstests/gle/core/update4.js +++ b/jstests/gle/core/update4.js @@ -2,32 +2,32 @@ f = db.jstests_update4; f.drop(); getLastError = function() { - ret = db.runCommand( { getlasterror : 1 } ); -// printjson( ret ); + ret = db.runCommand({getlasterror: 1}); + // printjson( ret ); return ret; }; -f.save( {a:1} ); -f.update( {a:1}, {a:2} ); -assert.eq( true, getLastError().updatedExisting , "A" ); -assert.eq( 1, getLastError().n , "B" ); -f.update( {a:1}, {a:2} ); -assert.eq( false, getLastError().updatedExisting , "C" ); -assert.eq( 0, getLastError().n , "D" ); +f.save({a: 1}); +f.update({a: 1}, {a: 2}); +assert.eq(true, getLastError().updatedExisting, "A"); +assert.eq(1, getLastError().n, "B"); +f.update({a: 1}, {a: 2}); +assert.eq(false, getLastError().updatedExisting, "C"); +assert.eq(0, getLastError().n, "D"); -f.update( {a:1}, {a:1}, true ); -assert.eq( false, getLastError().updatedExisting , "E" ); -assert.eq( 1, getLastError().n , "F" ); -f.update( {a:1}, {a:1}, true ); -assert.eq( true, getLastError().updatedExisting , "G" ); -assert.eq( 1, getLastError().n , "H" ); -assert.eq( true, db.getPrevError().updatedExisting , "I" ); -assert.eq( 1, db.getPrevError().nPrev , "J" ); +f.update({a: 1}, {a: 1}, true); +assert.eq(false, getLastError().updatedExisting, "E"); +assert.eq(1, getLastError().n, "F"); +f.update({a: 1}, {a: 1}, true); +assert.eq(true, getLastError().updatedExisting, "G"); +assert.eq(1, getLastError().n, "H"); +assert.eq(true, db.getPrevError().updatedExisting, "I"); +assert.eq(1, db.getPrevError().nPrev, "J"); f.findOne(); -assert.eq( undefined, getLastError().updatedExisting , "K" ); -assert.eq( true, db.getPrevError().updatedExisting , "L" ); -assert.eq( 2, db.getPrevError().nPrev , "M" ); +assert.eq(undefined, getLastError().updatedExisting, "K"); +assert.eq(true, db.getPrevError().updatedExisting, "L"); +assert.eq(2, db.getPrevError().nPrev, "M"); db.forceError(); -assert.eq( undefined, getLastError().updatedExisting , "N" ); +assert.eq(undefined, getLastError().updatedExisting, "N"); |