From 17ed7b32e672c6cab1e489b5499e0b28ee13a161 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 25 Oct 2023 01:15:12 +0200 Subject: [PATCH] Replace assertDictContainsSubset by assertEqual assertDictContainsSubset has been removed in Python 3.12 --- trytond-gis/trytond_gis/tests/test_fields.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/trytond-gis/trytond_gis/tests/test_fields.py b/trytond-gis/trytond_gis/tests/test_fields.py index feca21b9c7..6d688caa7a 100644 --- a/trytond-gis/trytond_gis/tests/test_fields.py +++ b/trytond-gis/trytond_gis/tests/test_fields.py @@ -20,10 +20,11 @@ class TestGeographicFields(unittest.TestCase): pool = Pool() GISPoint = pool.get('test.gis.point') + point = {'dimension': 2, 'geometry_type': 'POINT'} + point = GISPoint.fields_get(['point'])['point'] - self.assertDictContainsSubset( - {'dimension': 2, 'geometry_type': 'POINT'}, - GISPoint.fields_get(['point'])['point']) + self.assertEqual(point['dimension'], 2) + self.assertEqual(point['geometry_type'], 'POINT') @with_transaction() def test_create_save(self): @@ -39,7 +40,8 @@ class TestGeographicFields(unittest.TestCase): point, = GISPoint.create([{ 'point': point_a, }]) - self.assertDictContainsSubset(point_a, point.point) + for key in point_a: + self.assertEqual(point.point[key], point_a[key]) point_b = { 'meta': {'srid': 4326}, @@ -50,7 +52,8 @@ class TestGeographicFields(unittest.TestCase): point.save() reload_point = GISPoint(point.id) - self.assertDictContainsSubset(point_b, reload_point.point) + for key in point_b: + self.assertEqual(reload_point.point[key], point_b[key]) point.point = Null point.save() @@ -88,7 +91,8 @@ class TestGeographicFields(unittest.TestCase): ]) self.assertEqual(len(points), 2) for point in points: - self.assertDictContainsSubset(point_a, point.point) + for key in point_a: + self.assertEqual(point.point[key], point_a[key]) points = GISPoint.search([ ('point', '!=', point_a),