1 files changed, 21 insertions, 0 deletions
diff --git a/jstests/arrayfinda.js b/jstests/arrayfinda.js
new file mode 100644
index 00000000000..179d3985580
--- /dev/null
+++ b/jstests/arrayfinda.js
@@ -0,0 +1,21 @@
+// Assorted $elemMatch matching behavior checks.
+
+t = db.jstests_arrayfinda;
+t.drop();
+
+// $elemMatch only matches elements within arrays (a descriptive, not a normative test).
+t.save( { a:[ { b:1 } ] } );
+t.save( { a:{ b:1 } } );
+
+function assertExpectedMatch( cursor ) {
+    assert.eq( [ { b:1 } ], cursor.next().a );
+    assert( !cursor.hasNext() );
+}
+
+assertExpectedMatch( t.find( { a:{ $elemMatch:{ b:{ $gte:1 } } } } ) );
+assertExpectedMatch( t.find( { a:{ $elemMatch:{ b:1 } } } ) );
+
+// $elemMatch is not used to perform key matching.  SERVER-6001
+t.ensureIndex( { a:1 } );
+assertExpectedMatch( t.find( { a:{ $elemMatch:{ b:{ $gte:1 } } } } ).hint( { a:1 } ) );
+assertExpectedMatch( t.find( { a:{ $elemMatch:{ b:1 } } } ).hint( { a:1 } ) );