extend tests for thread pool additions

Author: lonvia

test/test_io.py

@@ -11,17 +11,6 @@
 from helpers import CountingHandler
 
 
-class NullHandler:
-
-    def node(self, n):
-        pass
-
-
-def _run_file(fn):
-    with osmium.io.Reader(fn) as rd:
-        osmium.apply(rd, NullHandler())
-
-
 @pytest.mark.parametrize('as_string', [True, False])
 def test_file_simple(tmp_path, as_string):
     fn = tmp_path / f"{uuid.uuid4()}.opl"
@@ -48,36 +37,12 @@ def test_file_with_format(tmp_path, as_string):
         assert n.id == 1
 
 
-def test_node_only(test_data):
-    _run_file(test_data('n1'))
-
-
-def test_way_only(test_data):
-    _run_file(test_data('w1 Nn1,n2,n3'))
-
-
-def test_relation_only(test_data):
-    _run_file(test_data('r573 Mw1@'))
-
-
-def test_node_with_tags(test_data):
-    _run_file(test_data('n32 Tbar=xx'))
-
-
-def test_way_with_tags(test_data):
-    _run_file(test_data('w5666 Nn1,n2,n3 Tbar=xx'))
-
-
-def test_relation_with_tags(test_data):
-    _run_file(test_data('r573 Mw1@ Tbar=xx'))
-
-
 def test_broken_timestamp(test_data):
     fn = test_data('n1 tx')
 
     with osmium.io.Reader(fn) as rd:
         with pytest.raises(RuntimeError):
-            osmium.apply(rd, NullHandler())
+            osmium.apply(rd, CountingHandler())
 
 
 @pytest.mark.parametrize('as_string', [True, False])
@@ -101,11 +66,38 @@ def test_file_header(tmp_path, as_string):
 
 def test_reader_with_filebuffer():
     rd = osmium.io.Reader(osmium.io.FileBuffer('n1 x4 y1'.encode('utf-8'), 'opl'))
-    handler = CountingHandler()
+    try:
+        handler = CountingHandler()
+
+        osmium.apply(rd, handler)
+
+        assert handler.counts == [1, 0, 0, 0]
+        assert rd.eof()
+    finally:
+        rd.close()
+
+
+def test_reader_with_separate_thread_pool(test_data):
+    with osmium.io.Reader(test_data('n1 x1 y1'), thread_pool=osmium.io.ThreadPool()) as rd:
+        for obj in osmium.OsmFileIterator(rd):
+            assert obj.id == 1
+
+
+@pytest.mark.parametrize("entities,expected", [(osmium.osm.NODE, [2, 0, 0, 0]),
+                                               (osmium.osm.ALL, [2, 1, 1, 0])])
+def test_reader_with_entity_filter(test_data, entities, expected):
+    fn = test_data("""\
+        n1 x1 y2
+        n2 x1 y3
+        w34 Nn1,n2
+        r67 Mw34@
+        """)
 
-    osmium.apply(rd, handler)
+    h = CountingHandler()
+    with osmium.io.Reader(fn, entities) as rd:
+        osmium.apply(rd, h)
 
-    assert handler.counts == [1, 0, 0, 0]
+    assert h.counts == expected
 
 
 def test_thread_pool():

test/test_replication.py

@@ -48,14 +48,28 @@ def test_get_diff_url(inp, outp):
     assert outp, svr.get_diff_url(inp)
 
 
-def test_get_newest_change_from_file(tmp_path):
+@pytest.mark.parametrize("as_string", [True, False])
+def test_get_newest_change_from_file(tmp_path, as_string):
     fn = tmp_path / f"{uuid.uuid4()}.opl"
     fn.write_text('n6365 v1 c63965061 t2018-10-29T03:56:07Z i8369524 ux x1 y7')
 
-    val = osmium.replication.newest_change_from_file(str(fn))
+    if as_string:
+        fn = str(fn)
+
+    val = osmium.replication.newest_change_from_file(fn)
     assert val == mkdate(2018, 10, 29, 3, 56, 7)
 
 
+def test_get_newest_change_from_reader():
+    fb = osmium.io.FileBuffer(
+        'n6365 v1 t2018-10-29T03:56:07Z x1 y7\n'
+        'n6366 v1 t2018-10-29T04:56:07Z x1 y7\n'.encode('utf-8'), 'opl')
+
+    with osmium.io.Reader(fb, thread_pool=osmium.io.ThreadPool()) as rd:
+        val = osmium.replication.newest_change_from_file(rd)
+        assert val == mkdate(2018, 10, 29, 4, 56, 7)
+
+
 def test_get_state_valid(httpserver):
     httpserver.expect_request('/state.txt').respond_with_data("""\
         #Sat Aug 26 11:04:04 UTC 2017

test/test_writer.py

@@ -20,7 +20,7 @@
 def test_writer(tmp_path):
     @contextmanager
     def _WriteExpect(filename, expected):
-        with osmium.SimpleWriter(str(filename), 1024*1024) as writer:
+        with osmium.SimpleWriter(filename, 1024*1024) as writer:
             yield writer
 
         assert filename.read_text().strip() == expected
@@ -373,3 +373,10 @@ def test_write_to_file(tmp_path):
 
     with osmium.SimpleWriter(osmium.io.File(test_file, 'opl'), bufsz=4000) as writer:
         writer.add_node(osmium.osm.mutable.Node(id=123))
+
+
+def test_write_with_pool(tmp_path):
+    test_file = tmp_path / f"{uuid.uuid4()}.opl"
+
+    with osmium.SimpleWriter(test_file, bufsz=400, thread_pool=osmium.io.ThreadPool()) as writer:
+        writer.add_node(osmium.osm.mutable.Node(id=123))