From 8d0a9de3e11acf2abab97e0da7d76686b55f96d2 Mon Sep 17 00:00:00 2001 From: Robert Sachunsky Date: Mon, 20 Jul 2026 12:32:54 +0200 Subject: [PATCH] reorder: adapt tests --- tests/cli_tests/test_mbreorder.py | 21 ++++++++++++++++----- tests/conftest.py | 2 +- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/tests/cli_tests/test_mbreorder.py b/tests/cli_tests/test_mbreorder.py index e429e98..e452857 100644 --- a/tests/cli_tests/test_mbreorder.py +++ b/tests/cli_tests/test_mbreorder.py @@ -1,21 +1,30 @@ +import pytest from ocrd_modelfactory import page_from_file from ocrd_models.constants import NAMESPACES as NS +@pytest.mark.parametrize( + "options", + [ + [], # defaults + ["--model_based"], + ], ids=str) def test_run_eynollah_mbreorder_filename( tmp_path, resources_dir, run_eynollah_ok_and_check_logs, + options, ): infile = resources_dir / '2files/kant_aufklaerung_1784_0020.xml' outfile = tmp_path /'kant_aufklaerung_1784_0020.xml' run_eynollah_ok_and_check_logs( - 'machine-based-reading-order', + 'reorder', [ '-i', str(infile), + '-dim', str(resources_dir / '2files'), '-o', str(outfile.parent), - ], + ] + options, [ - # FIXME: mbreorder has no logging! + str(infile) ] ) assert outfile.exists() @@ -34,13 +43,15 @@ def test_run_eynollah_mbreorder_directory( ): outdir = tmp_path run_eynollah_ok_and_check_logs( - 'machine-based-reading-order', + 'reorder', [ '-di', str(resources_dir / '2files'), + '-dim', str(resources_dir / '2files'), '-o', str(outdir), ], [ - # FIXME: mbreorder has no logging! + 'Job done in', + 'All jobs done in', ] ) assert len(list(outdir.iterdir())) == 2 diff --git a/tests/conftest.py b/tests/conftest.py index 69f3d28..8ef14ba 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -31,7 +31,7 @@ def eynollah_subcommands(): 'layout', 'ocr', 'enhancement', - 'machine-based-reading-order', + 'reorder', 'models', ]