sync new tests

mongodb · Jun 20, 2024 · 070f0e2 · 070f0e2
1 parent ec3caba
commit 070f0e2
Show file tree

Hide file tree

Showing 93 changed files with 800 additions and 1,218 deletions.
diff --git a/test/spec/client-side-encryption/etc/data/range-encryptedFields-Date.json b/test/spec/client-side-encryption/etc/data/range-encryptedFields-Date.json
@@ -10,10 +10,13 @@
       "path": "encryptedDate",
       "bsonType": "date",
       "queries": {
-        "queryType": "rangePreview",
+        "queryType": "range",
         "contention": {
           "$numberLong": "0"
         },
+        "trimFactor": {
+          "$numberInt": "1"
+        },
         "sparsity": {
           "$numberLong": "1"
         },
@@ -30,4 +33,4 @@
       }
     }
   ]
-}
+}
diff --git a/test/spec/client-side-encryption/etc/data/range-encryptedFields-DecimalNoPrecision.json b/test/spec/client-side-encryption/etc/data/range-encryptedFields-DecimalNoPrecision.json
@@ -10,14 +10,17 @@
       "path": "encryptedDecimalNoPrecision",
       "bsonType": "decimal",
       "queries": {
-        "queryType": "rangePreview",
+        "queryType": "range",
         "contention": {
           "$numberLong": "0"
         },
+        "trimFactor": {
+          "$numberInt": "1"
+        },
         "sparsity": {
           "$numberLong": "1"
         }
       }
     }
   ]
-}
+}
diff --git a/test/spec/client-side-encryption/etc/data/range-encryptedFields-DecimalPrecision.json b/test/spec/client-side-encryption/etc/data/range-encryptedFields-DecimalPrecision.json
@@ -10,10 +10,13 @@
       "path": "encryptedDecimalPrecision",
       "bsonType": "decimal",
       "queries": {
-        "queryType": "rangePreview",
+        "queryType": "range",
         "contention": {
           "$numberLong": "0"
         },
+        "trimFactor": {
+          "$numberInt": "1"
+        },
         "sparsity": {
           "$numberLong": "1"
         },
@@ -29,4 +32,4 @@
       }
     }
   ]
-}
+}
diff --git a/test/spec/client-side-encryption/etc/data/range-encryptedFields-DoubleNoPrecision.json b/test/spec/client-side-encryption/etc/data/range-encryptedFields-DoubleNoPrecision.json
@@ -10,14 +10,17 @@
       "path": "encryptedDoubleNoPrecision",
       "bsonType": "double",
       "queries": {
-        "queryType": "rangePreview",
+        "queryType": "range",
         "contention": {
           "$numberLong": "0"
         },
+        "trimFactor": {
+          "$numberInt": "1"
+        },
         "sparsity": {
           "$numberLong": "1"
         }
       }
     }
   ]
-}
+}
diff --git a/test/spec/client-side-encryption/etc/data/range-encryptedFields-DoublePrecision.json b/test/spec/client-side-encryption/etc/data/range-encryptedFields-DoublePrecision.json
@@ -10,10 +10,13 @@
       "path": "encryptedDoublePrecision",
       "bsonType": "double",
       "queries": {
-        "queryType": "rangePreview",
+        "queryType": "range",
         "contention": {
           "$numberLong": "0"
         },
+        "trimFactor": {
+          "$numberInt": "1"
+        },
         "sparsity": {
           "$numberLong": "1"
         },
@@ -29,4 +32,4 @@
       }
     }
   ]
-}
+}
diff --git a/test/spec/client-side-encryption/etc/data/range-encryptedFields-Int.json b/test/spec/client-side-encryption/etc/data/range-encryptedFields-Int.json
@@ -10,10 +10,13 @@
       "path": "encryptedInt",
       "bsonType": "int",
       "queries": {
-        "queryType": "rangePreview",
+        "queryType": "range",
         "contention": {
           "$numberLong": "0"
         },
+        "trimFactor": {
+          "$numberInt": "1"
+        },
         "sparsity": {
           "$numberLong": "1"
         },
@@ -26,4 +29,4 @@
       }
     }
   ]
-}
+}
diff --git a/test/spec/client-side-encryption/etc/data/range-encryptedFields-Long.json b/test/spec/client-side-encryption/etc/data/range-encryptedFields-Long.json
@@ -10,10 +10,13 @@
       "path": "encryptedLong",
       "bsonType": "long",
       "queries": {
-        "queryType": "rangePreview",
+        "queryType": "range",
         "contention": {
           "$numberLong": "0"
         },
+        "trimFactor": {
+          "$numberInt": "1"
+        },
         "sparsity": {
           "$numberLong": "1"
         },
@@ -26,4 +29,4 @@
       }
     }
   ]
-}
+}
diff --git a/...s/legacy/fle2v2-Range-Date-Aggregate.json → ...legacy/fle2v2-Rangev2-Date-Aggregate.json b/...s/legacy/fle2v2-Range-Date-Aggregate.json → ...legacy/fle2v2-Rangev2-Date-Aggregate.json
@@ -1,13 +1,12 @@
 {
   "runOn": [
     {
-      "minServerVersion": "7.0.0",
+      "minServerVersion": "8.0.0",
       "topology": [
         "replicaset",
         "sharded",
         "load-balanced"
-      ],
-      "maxServerVersion": "7.99.99"
+      ]
     }
   ],
   "database_name": "default",
@@ -25,10 +24,13 @@
         "path": "encryptedDate",
         "bsonType": "date",
         "queries": {
-          "queryType": "rangePreview",
+          "queryType": "range",
           "contention": {
             "$numberLong": "0"
           },
+          "trimFactor": {
+            "$numberInt": "1"
+          },
           "sparsity": {
             "$numberLong": "1"
           },
@@ -226,10 +228,13 @@
                         "path": "encryptedDate",
                         "bsonType": "date",
                         "queries": {
-                          "queryType": "rangePreview",
+                          "queryType": "range",
                           "contention": {
                             "$numberLong": "0"
                           },
+                          "trimFactor": {
+                            "$numberInt": "1"
+                          },
                           "sparsity": {
                             "$numberLong": "1"
                           },
@@ -283,10 +288,13 @@
                         "path": "encryptedDate",
                         "bsonType": "date",
                         "queries": {
-                          "queryType": "rangePreview",
+                          "queryType": "range",
                           "contention": {
                             "$numberLong": "0"
                           },
+                          "trimFactor": {
+                            "$numberInt": "1"
+                          },
                           "sparsity": {
                             "$numberLong": "1"
                           },
@@ -346,10 +354,13 @@
                         "path": "encryptedDate",
                         "bsonType": "date",
                         "queries": {
-                          "queryType": "rangePreview",
+                          "queryType": "range",
                           "contention": {
                             "$numberLong": "0"
                           },
+                          "trimFactor": {
+                            "$numberInt": "1"
+                          },
                           "sparsity": {
                             "$numberLong": "1"
                           },
@@ -383,12 +394,6 @@
                 "$$type": "binData"
               },
               "__safeContent__": [
-                {
-                  "$binary": {
-                    "base64": "5nRutVIyq7URVOVtbE4vM01APSIajAVnsShMwjBlzkM=",
-                    "subType": "00"
-                  }
-                },
                 {
                   "$binary": {
                     "base64": "RjBYT2h3ZAoHxhf8DU6/dFbDkEBZp0IxREcsRTu2MXs=",
@@ -445,12 +450,6 @@
                 "$$type": "binData"
               },
               "__safeContent__": [
-                {
-                  "$binary": {
-                    "base64": "bE1vqWj3KNyM7cCYUv/cnYm8BPaUL3eMp5syTHq6NF4=",
-                    "subType": "00"
-                  }
-                },
                 {
                   "$binary": {
                     "base64": "25j9sQXZCihCmHKvTHgaBsAVZFcGPn7JjHdrCGlwyyw=",

diff --git a/...ts/legacy/fle2v2-Range-Date-Aggregate.yml → .../legacy/fle2v2-Rangev2-Date-Aggregate.yml b/...ts/legacy/fle2v2-Range-Date-Aggregate.yml → .../legacy/fle2v2-Rangev2-Date-Aggregate.yml
@@ -1,16 +1,14 @@
 
 # Requires libmongocrypt 1.8.0.
 runOn:
-  - minServerVersion: "7.0.0"
+  - minServerVersion: "8.0.0"
     # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol.
     # FLE 2 Encrypted collections are not supported on standalone.
     topology: [ "replicaset", "sharded", "load-balanced" ]
-    # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range".
-    maxServerVersion: "7.99.99"
 database_name: &database_name "default"
 collection_name: &collection_name "default"
 data: []
-encrypted_fields: &encrypted_fields {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedDate', 'bsonType': 'date', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$date': {'$numberLong': '0'}}, 'max': {'$date': {'$numberLong': '200'}}}}]}
+encrypted_fields: &encrypted_fields {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedDate', 'bsonType': 'date', 'queries': {'queryType': 'range', 'contention': {'$numberLong': '0'}, 'trimFactor': {'$numberInt': '1'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$date': {'$numberLong': '0'}}, 'max': {'$date': {'$numberLong': '200'}}}}]}
 key_vault_data: [ {'_id': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'keyMaterial': {'$binary': {'base64': 'sHe0kz57YW7v8g9VP9sf/+K1ex4JqKc5rf/URX3n3p8XdZ6+15uXPaSayC6adWbNxkFskuMCOifDoTT+rkqMtFkDclOy884RuGGtUysq3X7zkAWYTKi8QAfKkajvVbZl2y23UqgVasdQu3OVBQCrH/xY00nNAs/52e958nVjBuzQkSb1T8pKJAyjZsHJ60+FtnfafDZSTAIBJYn7UWBCwQ==', 'subType': '00'}}, 'creationDate': {'$date': {'$numberLong': '1648914851981'}}, 'updateDate': {'$date': {'$numberLong': '1648914851981'}}, 'status': {'$numberInt': '0'}, 'masterKey': {'provider': 'local'}} ]
 tests:
   - description: "FLE2 Range Date. Aggregate."
@@ -124,12 +122,6 @@ tests:
               "_id": 0,
               "encryptedDate": { $$type: "binData" },
               "__safeContent__": [
-                  {
-                      "$binary": {
-                          "base64": "5nRutVIyq7URVOVtbE4vM01APSIajAVnsShMwjBlzkM=",
-                          "subType": "00"
-                      }
-                  },
                   {
                       "$binary": {
                           "base64": "RjBYT2h3ZAoHxhf8DU6/dFbDkEBZp0IxREcsRTu2MXs=",
@@ -185,12 +177,6 @@ tests:
               "_id": 1,
               "encryptedDate": { $$type: "binData" },
               "__safeContent__": [
-                  {
-                      "$binary": {
-                          "base64": "bE1vqWj3KNyM7cCYUv/cnYm8BPaUL3eMp5syTHq6NF4=",
-                          "subType": "00"
-                      }
-                  },
                   {
                       "$binary": {
                           "base64": "25j9sQXZCihCmHKvTHgaBsAVZFcGPn7JjHdrCGlwyyw=",

diff --git a/...legacy/fle2v2-Range-Date-Correctness.json → ...gacy/fle2v2-Rangev2-Date-Correctness.json b/...legacy/fle2v2-Range-Date-Correctness.json → ...gacy/fle2v2-Rangev2-Date-Correctness.json
@@ -1,13 +1,12 @@
 {
   "runOn": [
     {
-      "minServerVersion": "7.0.0",
+      "minServerVersion": "8.0.0",
       "topology": [
         "replicaset",
         "sharded",
         "load-balanced"
-      ],
-      "maxServerVersion": "7.99.99"
+      ]
     }
   ],
   "database_name": "default",
@@ -25,10 +24,13 @@
         "path": "encryptedDate",
         "bsonType": "date",
         "queries": {
-          "queryType": "rangePreview",
+          "queryType": "range",
           "contention": {
             "$numberLong": "0"
           },
+          "trimFactor": {
+            "$numberInt": "1"
+          },
           "sparsity": {
             "$numberLong": "1"
           },

diff --git a/.../legacy/fle2v2-Range-Date-Correctness.yml → ...egacy/fle2v2-Rangev2-Date-Correctness.yml b/.../legacy/fle2v2-Range-Date-Correctness.yml → ...egacy/fle2v2-Rangev2-Date-Correctness.yml
@@ -3,16 +3,14 @@
 
 # Requires libmongocrypt 1.8.0.
 runOn:
-  - minServerVersion: "7.0.0"
+  - minServerVersion: "8.0.0"
     # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol.
     # FLE 2 Encrypted collections are not supported on standalone.
     topology: [ "replicaset", "sharded", "load-balanced" ]
-    # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range".
-    maxServerVersion: "7.99.99"
 database_name: &database_name "default"
 collection_name: &collection_name "default"
 data: []
-encrypted_fields: &encrypted_fields {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedDate', 'bsonType': 'date', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$date': {'$numberLong': '0'}}, 'max': {'$date': {'$numberLong': '200'}}}}]}
+encrypted_fields: &encrypted_fields {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedDate', 'bsonType': 'date', 'queries': {'queryType': 'range', 'contention': {'$numberLong': '0'}, 'trimFactor': {'$numberInt': '1'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$date': {'$numberLong': '0'}}, 'max': {'$date': {'$numberLong': '200'}}}}]}
 key_vault_data: [ {'_id': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'keyMaterial': {'$binary': {'base64': 'sHe0kz57YW7v8g9VP9sf/+K1ex4JqKc5rf/URX3n3p8XdZ6+15uXPaSayC6adWbNxkFskuMCOifDoTT+rkqMtFkDclOy884RuGGtUysq3X7zkAWYTKi8QAfKkajvVbZl2y23UqgVasdQu3OVBQCrH/xY00nNAs/52e958nVjBuzQkSb1T8pKJAyjZsHJ60+FtnfafDZSTAIBJYn7UWBCwQ==', 'subType': '00'}}, 'creationDate': {'$date': {'$numberLong': '1648914851981'}}, 'updateDate': {'$date': {'$numberLong': '1648914851981'}}, 'status': {'$numberInt': '0'}, 'masterKey': {'provider': 'local'}} ]
 tests:
   - description: "Find with $gt"