From f8a88aa35be3c2022ff8a34808b6b68f7f47a0ae Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Mon, 6 Jan 2025 16:44:45 +0100 Subject: [PATCH 1/2] rtree.index: fix test bugs --- tests/test_index.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/test_index.py b/tests/test_index.py index d1651f46..eb518655 100644 --- a/tests/test_index.py +++ b/tests/test_index.py @@ -240,7 +240,7 @@ def test_intersection(self) -> None: self.assertTrue(0 in self.idx.intersection((0, 0, 60, 60))) hits = list(self.idx.intersection((0, 0, 60, 60))) - self.assertTrue(len(hits), 10) + self.assertEqual(len(hits), 10) self.assertEqual(hits, [0, 4, 16, 27, 35, 40, 47, 50, 76, 80]) def test_objects(self) -> None: @@ -436,14 +436,14 @@ def test_custom_filenames(self) -> None: idx.add(i, coords) hits = list(idx.intersection((0, 0, 60, 60))) - self.assertTrue(len(hits), 10) + self.assertEqual(len(hits), 10) self.assertEqual(hits, [0, 4, 16, 27, 35, 40, 47, 50, 76, 80]) del idx # Check we can reopen the index and get the same results idx2 = index.Index(tname, properties=p) hits = list(idx2.intersection((0, 0, 60, 60))) - self.assertTrue(len(hits), 10) + self.assertEqual(len(hits), 10) self.assertEqual(hits, [0, 4, 16, 27, 35, 40, 47, 50, 76, 80]) @pytest.mark.skipif(not sys.maxsize > 2**32, reason="Fails on 32bit systems") @@ -465,7 +465,7 @@ def data_gen( tname, data_gen(interleaved=False), properties=p, interleaved=False ) hits1 = sorted(list(idx.intersection((0, 60, 0, 60)))) - self.assertTrue(len(hits1), 10) + self.assertEqual(len(hits1), 10) self.assertEqual(hits1, [0, 4, 16, 27, 35, 40, 47, 50, 76, 80]) leaves = idx.leaves() @@ -591,7 +591,7 @@ def data_gen( ) hits2 = sorted(list(idx.intersection((0, 60, 0, 60), objects=True))) - self.assertTrue(len(hits2), 10) + self.assertEqual(len(hits2), 10) self.assertEqual(hits2[0].object, 42) def test_overwrite(self) -> None: @@ -855,6 +855,6 @@ def test_custom_storage_reopening(self) -> None: del r1 self.assertTrue(storage.hasData) - r2 = index.Index(storage, properly=settings, overwrite=False) + r2 = index.Index(storage, properties=settings, overwrite=False) count = r2.count((0, 0, 10, 10)) self.assertEqual(count, 1) From 02a9e205c24b1dc4befa96c4536e4970a9a927fa Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Sat, 11 Jan 2025 15:45:05 +0100 Subject: [PATCH 2/2] properties not needed for test --- tests/test_index.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/tests/test_index.py b/tests/test_index.py index eb518655..6b0b0c73 100644 --- a/tests/test_index.py +++ b/tests/test_index.py @@ -846,15 +846,11 @@ def test_custom_storage_reopening(self) -> None: """Reopening custom index storage works as expected""" storage = DictStorage() - settings = index.Property() - settings.writethrough = True - settings.buffering_capacity = 1 - - r1 = index.Index(storage, properties=settings, overwrite=True) + r1 = index.Index(storage, overwrite=True) r1.add(555, (2, 2)) del r1 self.assertTrue(storage.hasData) - r2 = index.Index(storage, properties=settings, overwrite=False) + r2 = index.Index(storage, overwrite=False) count = r2.count((0, 0, 10, 10)) self.assertEqual(count, 1)