address failing tests

Author: blink1073

bindings/python/test/test_bson.py

@@ -24,7 +24,7 @@
 class TestBsonToArrowConversionBase(TestCase):
     def setUp(self):
         self.schema = Schema({"_id": ObjectId, "data": int64(), "title": string()})
-        self.context = PyMongoArrowContext.from_schema(self.schema)
+        self.context = PyMongoArrowContext(self.schema)
 
     @staticmethod
     def _generate_payload(doclist):
@@ -36,7 +36,7 @@ def _generate_payload(doclist):
     def _run_test(self, doclist, as_dict):
         payload = type(self)._generate_payload(doclist)
 
-        process_bson_stream(payload, self.context)
+        self.context.process_bson_stream(payload)
         table = self.context.finish()
         table_dict = table.to_pydict()
 
@@ -104,13 +104,13 @@ def test_simple(self):
         schema = Schema({"_id": ObjectId, "data": int64(), "fake": pa.float16()})
         msg = 'Unsupported data type in schema for field "fake" of type "halffloat"'
         with self.assertRaisesRegex(ValueError, msg):
-            PyMongoArrowContext.from_schema(schema)
+            PyMongoArrowContext(schema)
 
 
 class TestNonAsciiFieldName(TestBsonToArrowConversionBase):
     def setUp(self):
         self.schema = Schema({"_id": ObjectIdType(), "dätá": int64()})
-        self.context = PyMongoArrowContext.from_schema(self.schema)
+        self.context = PyMongoArrowContext(self.schema)
 
     def test_simple(self):
         ids = [ObjectId() for i in range(4)]
@@ -150,7 +150,7 @@ def test_object_id_type(self):
 class TestInt64Type(TestBsonToArrowConversionBase):
     def setUp(self):
         self.schema = Schema({"data": Int64})
-        self.context = PyMongoArrowContext.from_schema(self.schema)
+        self.context = PyMongoArrowContext(self.schema)
 
     def test_simple(self):
         docs = [
@@ -165,7 +165,7 @@ def test_simple(self):
 class TestBooleanType(TestBsonToArrowConversionBase):
     def setUp(self):
         self.schema = Schema({"data": bool})
-        self.context = PyMongoArrowContext.from_schema(self.schema)
+        self.context = PyMongoArrowContext(self.schema)
 
     def test_simple(self):
         docs = [
@@ -183,7 +183,7 @@ def test_simple(self):
 class TestStringType(TestBsonToArrowConversionBase):
     def setUp(self):
         self.schema = Schema({"data": str})
-        self.context = PyMongoArrowContext.from_schema(self.schema)
+        self.context = PyMongoArrowContext(self.schema)
 
     def test_simple(self):
         docs = [
@@ -197,7 +197,7 @@ def test_simple(self):
 class TestDecimal128Type(TestBsonToArrowConversionBase):
     def setUp(self):
         self.schema = Schema({"data": Decimal128})
-        self.context = PyMongoArrowContext.from_schema(self.schema)
+        self.context = PyMongoArrowContext(self.schema)
 
     def test_simple(self):
         docs = [
@@ -212,7 +212,7 @@ def test_simple(self):
 class TestSubdocumentType(TestBsonToArrowConversionBase):
     def setUp(self):
         self.schema = Schema({"data": dict(x=bool)})
-        self.context = PyMongoArrowContext.from_schema(self.schema)
+        self.context = PyMongoArrowContext(self.schema)
 
     def test_simple(self):
         docs = [
@@ -237,7 +237,7 @@ def test_simple(self):
 
     def test_nested(self):
         self.schema = Schema({"data": dict(x=bool, y=dict(a=int))})
-        self.context = PyMongoArrowContext.from_schema(self.schema)
+        self.context = PyMongoArrowContext(self.schema)
 
         docs = [
             {"data": dict(x=True, y=dict(a=1))},

bindings/python/test/test_builders.py

@@ -187,7 +187,7 @@ def test_simple(self):
         manager.process_bson_stream(data, len(data))
         array_map = manager.finish()
         assert list(array_map) == ["a"]
-        assert next(iter(array_map.values())).to_pylist() == [1, 2, None, 4]
+        assert next(iter(array_map.values())).finish().to_pylist() == [1, 2, None, 4]
 
     def test_nested_object(self):
         inner_values = []
@@ -204,6 +204,8 @@ def test_nested_object(self):
         data = b"".join(encode(v) for v in values)
         manager.process_bson_stream(data, len(data))
         array_map = manager.finish()
+        for key, value in array_map.items():
+            array_map[key] = value.finish()
         assert sorted(array_map.keys()) == [
             "c",
             "c.a",
@@ -220,7 +222,7 @@ def test_nested_object(self):
             "g[].a",
         ]
         # Dict has its top level keys.
-        assert array_map["c"] == set(("a", "b", "c", "d", "e", "f"))
+        assert array_map["c"] == ["a", "b", "c", "d", "e", "f"]
         # Deferred nested field.
         assert array_map["c.c"].to_pylist() == [None, None, None, None, 1.0]
         assert array_map["f"].to_pylist() == [None, None, None, None, None]

bindings/python/test/test_datetime.py

@@ -52,7 +52,7 @@ def test_context_creation_fails_with_unsupported_granularity(self):
         for g in unsupported_granularities:
             schema = Schema({"_id": int32(), "data": timestamp(g)})
             with self.assertRaises(TypeError):
-                PyMongoArrowContext.from_schema(schema)
+                PyMongoArrowContext(schema)
 
     def test_round_trip(self):
         expected = Table.from_pydict(