rename enum to bool

Author: abr-egn

source/unified-test-format/schema-1.7.json

@@ -220,10 +220,7 @@
           "enum": ["command", "cmap"]
         },
         "events": { "type": "array" },
-        "eventMatch": {
-          "type": "string",
-          "enum": ["exact", "prefix"]
-        }
+        "ignoreExtraEvents": { "type": "boolean" }
       },
       "oneOf": [
         {

source/unified-test-format/tests/invalid/expectedEventsForClient-eventMatch.json renamed to source/unified-test-format/tests/invalid/expectedEventsForClient-ignoreExtraEvents-type.json

@@ -1,5 +1,5 @@
 {
-  "description": "expectedEventsForClient-additionalProperties",
+  "description": "expectedEventsForClient-ignoreExtraEvents-type",
   "schemaVersion": "1.7",
   "createEntities": [
     {
@@ -16,7 +16,7 @@
         {
           "client": "client0",
           "events": [],
-          "eventMatch": 0
+          "ignoreExtraEvents": 0
         }
       ]
     }

source/unified-test-format/tests/invalid/expectedEventsForClient-eventMatch.yml renamed to source/unified-test-format/tests/invalid/expectedEventsForClient-ignoreExtraEvents-type.yml

@@ -1,4 +1,4 @@
-description: "expectedEventsForClient-additionalProperties"
+description: "expectedEventsForClient-ignoreExtraEvents-type"
 
 schemaVersion: "1.7"
 
@@ -12,4 +12,4 @@ tests:
     expectEvents:
       - client: *client0
         events: []
-        eventMatch: 0
+        ignoreExtraEvents: 0

source/unified-test-format/tests/valid-pass/expectedEventsForClient-eventMatch.json renamed to source/unified-test-format/tests/valid-pass/expectedEventsForClient-ignoreExtraEvents.json

@@ -1,5 +1,5 @@
 {
-  "description": "expectedEventsForClient-eventType",
+  "description": "expectedEventsForClient-ignoreExtraEvents",
   "schemaVersion": "1.7",
   "createEntities": [
     {
@@ -35,7 +35,7 @@
   ],
   "tests": [
     {
-      "description": "eventMatch can be set to exact",
+      "description": "ignoreExtraEvents can be set to false",
       "operations": [
         {
           "name": "insertOne",
@@ -50,7 +50,7 @@
       "expectEvents": [
         {
           "client": "client0",
-          "eventMatch": "exact",
+          "ignoreExtraEvents": false,
           "events": [
             {
               "commandStartedEvent": {
@@ -70,7 +70,7 @@
       ]
     },
     {
-      "description": "eventMatch can be set to prefix",
+      "description": "ignoreExtraEvents can be set to true",
       "operations": [
         {
           "name": "insertOne",
@@ -94,7 +94,7 @@
       "expectEvents": [
         {
           "client": "client0",
-          "eventMatch": "prefix",
+          "ignoreExtraEvents": true,
           "events": [
             {
               "commandStartedEvent": {
@@ -114,7 +114,7 @@
       ]
     },
     {
-      "description": "eventMatch defaults to exact if unset",
+      "description": "ignoreExtraEvents defaults to false if unset",
       "operations": [
         {
           "name": "insertOne",

source/unified-test-format/tests/valid-pass/expectedEventsForClient-eventMatch.yml renamed to source/unified-test-format/tests/valid-pass/expectedEventsForClient-ignoreExtraEvents.yml

@@ -1,4 +1,4 @@
-description: expectedEventsForClient-eventType
+description: expectedEventsForClient-ignoreExtraEvents
 
 schemaVersion: '1.7'
 
@@ -23,15 +23,15 @@ initialData:
     documents: []
 
 tests:
-  - description: eventMatch can be set to exact
+  - description: ignoreExtraEvents can be set to false
     operations:
       - name: insertOne
         object: *collection0
         arguments:
           document: &insertDocument1 { _id: 1 }
     expectEvents:
       - client: *client0
-        eventMatch: exact
+        ignoreExtraEvents: false
         events:
           - commandStartedEvent:
               command:
@@ -40,7 +40,7 @@ tests:
                   - *insertDocument1
               commandName: insert
 
-  - description: eventMatch can be set to prefix
+  - description: ignoreExtraEvents can be set to true
     operations:
       - name: insertOne
         object: *collection0
@@ -52,7 +52,7 @@ tests:
           document: { _id: 3 }
     expectEvents:
       - client: *client0
-        eventMatch: prefix
+        ignoreExtraEvents: true
         events:
           - commandStartedEvent:
               command:
@@ -61,7 +61,7 @@ tests:
                   - *insertDocument2
               commandName: insert
 
-  - description: eventMatch defaults to exact if unset
+  - description: ignoreExtraEvents defaults to false if unset
     operations:
       - name: insertOne
         object: *collection0

source/unified-test-format/unified-test-format.rst

@@ -1006,11 +1006,11 @@ The structure of each object is as follows:
   executing `operations`_. If the array is empty, the test runner MUST assert
   that no events were observed on the client (excluding ignored events).
 
-- ``eventMatch``: Optional string.  Specifies how the ``events`` array is
-  matched against the observed events.  Valid values are ``exact``, meaning
-  that observed events after all specified events have matched MUST cause a
-  test failure, and ``prefix``, meaning that observed events after all
-  specified events have been matched MUST NOT cause a test failure.
+- ``ignoreExtraEvents``: Optional boolean.  Specifies how the ``events`` array
+  is matched against the observed events.  If ``false``, observed events after
+  all specified events have matched MUST cause a test failure; if ``true``,
+  observed events after all specified events have been matched MUST NOT cause a
+  test failure.  Defaults to ``false``.
 
 
 expectedEvent