1 files changed, 49 insertions, 47 deletions
diff --git a/jstests/core/or5.js b/jstests/core/or5.js
index 8d9d8802860..dd32c1c3c50 100644
--- a/jstests/core/or5.js
+++ b/jstests/core/or5.js
@@ -1,63 +1,65 @@
 t = db.jstests_or5;
 t.drop();
 
-t.ensureIndex( {a:1} );
-t.ensureIndex( {b:1} );
-
-t.ensureIndex( {c:1} );
-
-t.save( {a:2} );
-t.save( {b:3} );
-t.save( {c:4} );
-t.save( {a:2,b:3} );
-t.save( {a:2,c:4} );
-t.save( {b:3,c:4} );
-t.save( {a:2,b:3,c:4} );
-
-assert.eq.automsg( "7", "t.count( {$or:[{a:2},{b:3},{c:4}]} )" );
-assert.eq.automsg( "6", "t.count( {$or:[{a:6},{b:3},{c:4}]} )" );
-assert.eq.automsg( "6", "t.count( {$or:[{a:2},{b:6},{c:4}]} )" );
-assert.eq.automsg( "6", "t.count( {$or:[{a:2},{b:3},{c:6}]} )" );
-
-assert.eq.automsg( "7", "t.find( {$or:[{a:2},{b:3},{c:4}]} ).toArray().length" );
-assert.eq.automsg( "6", "t.find( {$or:[{a:6},{b:3},{c:4}]} ).toArray().length" );
-assert.eq.automsg( "6", "t.find( {$or:[{a:2},{b:6},{c:4}]} ).toArray().length" );
-assert.eq.automsg( "6", "t.find( {$or:[{a:2},{b:3},{c:6}]} ).toArray().length" );
-
-for( i = 2; i <= 7; ++i ) {
-assert.eq.automsg( "7", "t.find( {$or:[{a:2},{b:3},{c:4}]} ).batchSize( i ).toArray().length" );
-assert.eq.automsg( "6", "t.find( {$or:[{a:6},{b:3},{c:4}]} ).batchSize( i ).toArray().length" );
-assert.eq.automsg( "6", "t.find( {$or:[{a:2},{b:6},{c:4}]} ).batchSize( i ).toArray().length" );
-assert.eq.automsg( "6", "t.find( {$or:[{a:2},{b:3},{c:6}]} ).batchSize( i ).toArray().length" );
+t.ensureIndex({a: 1});
+t.ensureIndex({b: 1});
+
+t.ensureIndex({c: 1});
+
+t.save({a: 2});
+t.save({b: 3});
+t.save({c: 4});
+t.save({a: 2, b: 3});
+t.save({a: 2, c: 4});
+t.save({b: 3, c: 4});
+t.save({a: 2, b: 3, c: 4});
+
+assert.eq.automsg("7", "t.count( {$or:[{a:2},{b:3},{c:4}]} )");
+assert.eq.automsg("6", "t.count( {$or:[{a:6},{b:3},{c:4}]} )");
+assert.eq.automsg("6", "t.count( {$or:[{a:2},{b:6},{c:4}]} )");
+assert.eq.automsg("6", "t.count( {$or:[{a:2},{b:3},{c:6}]} )");
+
+assert.eq.automsg("7", "t.find( {$or:[{a:2},{b:3},{c:4}]} ).toArray().length");
+assert.eq.automsg("6", "t.find( {$or:[{a:6},{b:3},{c:4}]} ).toArray().length");
+assert.eq.automsg("6", "t.find( {$or:[{a:2},{b:6},{c:4}]} ).toArray().length");
+assert.eq.automsg("6", "t.find( {$or:[{a:2},{b:3},{c:6}]} ).toArray().length");
+
+for (i = 2; i <= 7; ++i) {
+    assert.eq.automsg("7", "t.find( {$or:[{a:2},{b:3},{c:4}]} ).batchSize( i ).toArray().length");
+    assert.eq.automsg("6", "t.find( {$or:[{a:6},{b:3},{c:4}]} ).batchSize( i ).toArray().length");
+    assert.eq.automsg("6", "t.find( {$or:[{a:2},{b:6},{c:4}]} ).batchSize( i ).toArray().length");
+    assert.eq.automsg("6", "t.find( {$or:[{a:2},{b:3},{c:6}]} ).batchSize( i ).toArray().length");
 }
 
-t.ensureIndex( {z:"2d"} );
+t.ensureIndex({z: "2d"});
 
-assert.throws.automsg( function() { return t.find( {$or:[{z:{$near:[50,50]}},{a:2}]} ).toArray(); } );
+assert.throws.automsg(function() {
+    return t.find({$or: [{z: {$near: [50, 50]}}, {a: 2}]}).toArray();
+});
 
 function reset() {
     t.drop();
-    
-    t.ensureIndex( {a:1} );
-    t.ensureIndex( {b:1} );
-    t.ensureIndex( {c:1} );
-    
-    t.save( {a:2} );
-    t.save( {a:2} );
-    t.save( {b:3} );
-    t.save( {b:3} );
-    t.save( {c:4} );
-    t.save( {c:4} );
+
+    t.ensureIndex({a: 1});
+    t.ensureIndex({b: 1});
+    t.ensureIndex({c: 1});
+
+    t.save({a: 2});
+    t.save({a: 2});
+    t.save({b: 3});
+    t.save({b: 3});
+    t.save({c: 4});
+    t.save({c: 4});
 }
 
 reset();
 
-assert.eq.automsg( "6", "t.find( {$or:[{a:2},{b:3},{c:4}]} ).batchSize( 1 ).itcount()" );
-assert.eq.automsg( "6", "t.find( {$or:[{a:2},{b:3},{c:4}]} ).batchSize( 2 ).itcount()" );
+assert.eq.automsg("6", "t.find( {$or:[{a:2},{b:3},{c:4}]} ).batchSize( 1 ).itcount()");
+assert.eq.automsg("6", "t.find( {$or:[{a:2},{b:3},{c:4}]} ).batchSize( 2 ).itcount()");
 
 t.drop();
 
-t.save( {a:[1,2]} );
-assert.eq.automsg( "1", "t.find( {$or:[{a:[1,2]}]} ).itcount()" );
-assert.eq.automsg( "1", "t.find( {$or:[{a:{$all:[1,2]}}]} ).itcount()" );
-assert.eq.automsg( "0", "t.find( {$or:[{a:{$all:[1,3]}}]} ).itcount()" );
+t.save({a: [1, 2]});
+assert.eq.automsg("1", "t.find( {$or:[{a:[1,2]}]} ).itcount()");
+assert.eq.automsg("1", "t.find( {$or:[{a:{$all:[1,2]}}]} ).itcount()");
+assert.eq.automsg("0", "t.find( {$or:[{a:{$all:[1,3]}}]} ).itcount()");