SERVER-30987: Enable and test $jsonSchema in the aggregation $match stage

1 files changed, 9 insertions, 3 deletions

diff --git a/jstests/libs/assert_schema_match.js b/jstests/libs/assert_schema_match.js
index fe901829027..9a055c389af 100644
--- a/jstests/libs/assert_schema_match.js
+++ b/jstests/libs/assert_schema_match.js
@@ -8,7 +8,13 @@
 function assertSchemaMatch(coll, schema, doc, valid) {
     coll.drop();
     assert.writeOK(coll.insert(doc));
-    const count = coll.find({$jsonSchema: schema}).itcount();
-    const errmsg = valid ? " should have matched the schema " : " unexpectedly matched the schema ";
-    assert.eq(count, valid ? 1 : 0, "Document " + tojson(doc) + errmsg + tojson(schema));
+    let count = coll.find({$jsonSchema: schema}).itcount();
+    const errmsg = "Document " + tojson(doc) +
+        (valid ? " should have matched the schema " : " unexpectedly matched the schema ") +
+        tojson(schema);
+    assert.eq(count, valid ? 1 : 0, errmsg);
+
+    // Repeat the same query in an aggregation $match stage.
+    count = coll.aggregate([{$match: {$jsonSchema: schema}}]).itcount();
+    assert.eq(count, valid ? 1 : 0, errmsg + " in a $match stage");
 }