PYTHON-5110 - Convert test.test_unified_format to async (#2130)

test/asynchronous/test_unified_format.py

@@ -0,0 +1,99 @@
+# Copyright 2020-present MongoDB, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+from __future__ import annotations
+
+import os
+import sys
+from pathlib import Path
+from typing import Any
+
+sys.path[0:0] = [""]
+
+from test import UnitTest, unittest
+from test.asynchronous.unified_format import MatchEvaluatorUtil, generate_test_classes
+
+from bson import ObjectId
+
+_IS_SYNC = False
+
+# Location of JSON test specifications.
+if _IS_SYNC:
+    TEST_PATH = os.path.join(Path(__file__).resolve().parent, "unified-test-format")
+else:
+    TEST_PATH = os.path.join(Path(__file__).resolve().parent.parent, "unified-test-format")
+
+
+globals().update(
+    generate_test_classes(
+        os.path.join(TEST_PATH, "valid-pass"),
+        module=__name__,
+        class_name_prefix="UnifiedTestFormat",
+        expected_failures=[
+            "Client side error in command starting transaction",  # PYTHON-1894
+        ],
+        RUN_ON_SERVERLESS=False,
+    )
+)
+
+
+globals().update(
+    generate_test_classes(
+        os.path.join(TEST_PATH, "valid-fail"),
+        module=__name__,
+        class_name_prefix="UnifiedTestFormat",
+        bypass_test_generation_errors=True,
+        expected_failures=[
+            ".*",  # All tests expected to fail
+        ],
+        RUN_ON_SERVERLESS=False,
+    )
+)
+
+
+class TestMatchEvaluatorUtil(UnitTest):
+    def setUp(self):
+        self.match_evaluator = MatchEvaluatorUtil(self)
+
+    def test_unsetOrMatches(self):
+        spec: dict[str, Any] = {"$$unsetOrMatches": {"y": {"$$unsetOrMatches": 2}}}
+        for actual in [{}, {"y": 2}, None]:
+            self.match_evaluator.match_result(spec, actual)
+
+        spec = {"x": {"$$unsetOrMatches": {"y": {"$$unsetOrMatches": 2}}}}
+        for actual in [{}, {"x": {}}, {"x": {"y": 2}}]:
+            self.match_evaluator.match_result(spec, actual)
+
+        spec = {"y": {"$$unsetOrMatches": {"$$exists": True}}}
+        self.match_evaluator.match_result(spec, {})
+        self.match_evaluator.match_result(spec, {"y": 2})
+        self.match_evaluator.match_result(spec, {"x": 1})
+        self.match_evaluator.match_result(spec, {"y": {}})
+
+    def test_type(self):
+        self.match_evaluator.match_result(
+            {
+                "operationType": "insert",
+                "ns": {"db": "change-stream-tests", "coll": "test"},
+                "fullDocument": {"_id": {"$$type": "objectId"}, "x": 1},
+            },
+            {
+                "operationType": "insert",
+                "fullDocument": {"_id": ObjectId("5fc93511ac93941052098f0c"), "x": 1},
+                "ns": {"db": "change-stream-tests", "coll": "test"},
+            },
+        )
+
+
+if __name__ == "__main__":
+    unittest.main()

test/asynchronous/unified_format.py

@@ -711,7 +711,7 @@ class UnifiedSpecTestMixinV1(AsyncIntegrationTest):
         return await target.command(**kwargs)
 
     async def _databaseOperation_runCursorCommand(self, target, **kwargs):
-        return list(await self._databaseOperation_createCommandCursor(target, **kwargs))
+        return await (await self._databaseOperation_createCommandCursor(target, **kwargs)).to_list()
 
     async def _databaseOperation_createCommandCursor(self, target, **kwargs):
         self.__raise_if_unsupported("createCommandCursor", target, AsyncDatabase)

test/test_unified_format.py

@@ -15,21 +15,28 @@ from __future__ import annotations
 
 import os
 import sys
+from pathlib import Path
 from typing import Any
 
 sys.path[0:0] = [""]
 
-from test import unittest
+from test import UnitTest, unittest
 from test.unified_format import MatchEvaluatorUtil, generate_test_classes
 
 from bson import ObjectId
 
-_TEST_PATH = os.path.join(os.path.dirname(os.path.realpath(__file__)), "unified-test-format")
+_IS_SYNC = True
+
+# Location of JSON test specifications.
+if _IS_SYNC:
+    TEST_PATH = os.path.join(Path(__file__).resolve().parent, "unified-test-format")
+else:
+    TEST_PATH = os.path.join(Path(__file__).resolve().parent.parent, "unified-test-format")
 
 
 globals().update(
     generate_test_classes(
-        os.path.join(_TEST_PATH, "valid-pass"),
+        os.path.join(TEST_PATH, "valid-pass"),
         module=__name__,
         class_name_prefix="UnifiedTestFormat",
         expected_failures=[
@@ -42,7 +49,7 @@ globals().update(
 
 globals().update(
     generate_test_classes(
-        os.path.join(_TEST_PATH, "valid-fail"),
+        os.path.join(TEST_PATH, "valid-fail"),
         module=__name__,
         class_name_prefix="UnifiedTestFormat",
         bypass_test_generation_errors=True,
@@ -54,7 +61,7 @@ globals().update(
 )
 
 
-class TestMatchEvaluatorUtil(unittest.TestCase):
+class TestMatchEvaluatorUtil(UnitTest):
     def setUp(self):
         self.match_evaluator = MatchEvaluatorUtil(self)
 

test/unified_format.py

@@ -708,7 +708,7 @@ class UnifiedSpecTestMixinV1(IntegrationTest):
         return target.command(**kwargs)
 
     def _databaseOperation_runCursorCommand(self, target, **kwargs):
-        return list(self._databaseOperation_createCommandCursor(target, **kwargs))
+        return (self._databaseOperation_createCommandCursor(target, **kwargs)).to_list()
 
     def _databaseOperation_createCommandCursor(self, target, **kwargs):
         self.__raise_if_unsupported("createCommandCursor", target, Database)

tools/synchro.py

@@ -228,6 +228,7 @@ converted_tests = [
     "test_session.py",
     "test_srv_polling.py",
     "test_transactions.py",
+    "test_unified_format.py",
     "unified_format.py",
 ]