From 3afbce023dc9a70ec059da3e3c72be470625cbc6 Mon Sep 17 00:00:00 2001
From: kba <unixprog@gmail.com>
Date: Thu, 13 Nov 2025 11:46:31 +0100
Subject: [PATCH] tests: adapt paths

---
 Makefile                             | 2 +-
 tests/cli_tests/test_binarization.py | 8 ++++----
 tests/cli_tests/test_enhance.py      | 6 +++---
 tests/cli_tests/test_layout.py       | 6 +++---
 tests/cli_tests/test_mbreorder.py    | 6 +++---
 tests/cli_tests/test_ocr.py          | 8 ++++----
 tests/conftest.py                    | 2 +-
 7 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/Makefile b/Makefile
index b981d7d..d00acdd 100644
--- a/Makefile
+++ b/Makefile
@@ -83,7 +83,7 @@ smoke-test: tests/resources/kant_aufklaerung_1784_0020.tif
 	eynollah -m $(CURDIR)/models_eynollah layout -di $(<D) -o $(TMPDIR) 
 	test -s $(TMPDIR)/euler_rechenkunst01_1738_0025.xml
 	# mbreorder, directory mode (overwrite):
-	eynollah -m $(CURDIR)/$(SEG_MODELNAME) machine-based-reading-order -di $(<D) -o $(TMPDIR) 
+	eynollah -m $(CURDIR)/models_eynollah machine-based-reading-order -di $(<D) -o $(TMPDIR) 
 	fgrep -q http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15 $(TMPDIR)/$(basename $(<F)).xml
 	fgrep -c -e RegionRefIndexed $(TMPDIR)/$(basename $(<F)).xml
 	# binarize:
diff --git a/tests/cli_tests/test_binarization.py b/tests/cli_tests/test_binarization.py
index 8bb09db..f2b2b61 100644
--- a/tests/cli_tests/test_binarization.py
+++ b/tests/cli_tests/test_binarization.py
@@ -10,11 +10,11 @@ from PIL import Image
 def test_run_eynollah_binarization_filename(
     tmp_path,
     run_eynollah_ok_and_check_logs,
-    tests_dir,
+    resources_dir,
     options,
 ):
-    infile = tests_dir.joinpath('resources/2files/kant_aufklaerung_1784_0020.tif')
-    outfile = tmp_path.joinpath('kant_aufklaerung_1784_0020.png')
+    infile = resources_dir + '/2files/kant_aufklaerung_1784_0020.tif'
+    outfile = tmp_path / 'kant_aufklaerung_1784_0020.png'
     run_eynollah_ok_and_check_logs(
         'binarization',
         [
@@ -42,7 +42,7 @@ def test_run_eynollah_binarization_directory(
     run_eynollah_ok_and_check_logs(
         'binarization',
         [
-            '-di', str(resources_dir),
+            '-di', str(resources_dir / '2files'),
             '-o', str(outdir),
         ],
         [
diff --git a/tests/cli_tests/test_enhance.py b/tests/cli_tests/test_enhance.py
index 91e7c4b..b994c5d 100644
--- a/tests/cli_tests/test_enhance.py
+++ b/tests/cli_tests/test_enhance.py
@@ -13,8 +13,8 @@ def test_run_eynollah_enhancement_filename(
     run_eynollah_ok_and_check_logs,
     options,
 ):
-    infile = resources_dir / 'kant_aufklaerung_1784_0020.tif'
-    outfile = tmp_path.joinpath('kant_aufklaerung_1784_0020.png')
+    infile = resources_dir / '2files/kant_aufklaerung_1784_0020.tif'
+    outfile = tmp_path / 'kant_aufklaerung_1784_0020.png'
     run_eynollah_ok_and_check_logs(
         'enhancement',
         [
@@ -41,7 +41,7 @@ def test_run_eynollah_enhancement_directory(
     run_eynollah_ok_and_check_logs(
         'enhancement',
         [
-            '-di', str(resources_dir),
+            '-di', str(resources_dir/ '2files'),
             '-o', str(outdir),
         ],
         [
diff --git a/tests/cli_tests/test_layout.py b/tests/cli_tests/test_layout.py
index 2e4cd49..a34514e 100644
--- a/tests/cli_tests/test_layout.py
+++ b/tests/cli_tests/test_layout.py
@@ -27,7 +27,7 @@ def test_run_eynollah_layout_filename(
     resources_dir,
     options,
 ):
-    infile = resources_dir / 'kant_aufklaerung_1784_0020.tif'
+    infile = resources_dir / '2files/kant_aufklaerung_1784_0020.tif'
     outfile = tmp_path / 'kant_aufklaerung_1784_0020.xml'
     run_eynollah_ok_and_check_logs(
         'layout',
@@ -61,7 +61,7 @@ def test_run_eynollah_layout_filename2(
     run_eynollah_ok_and_check_logs,
     options,
 ):
-    infile = resources_dir / 'euler_rechenkunst01_1738_0025.tif'
+    infile = resources_dir / '2files/euler_rechenkunst01_1738_0025.tif'
     outfile = tmp_path / 'euler_rechenkunst01_1738_0025.xml'
     run_eynollah_ok_and_check_logs(
         'layout',
@@ -94,7 +94,7 @@ def test_run_eynollah_layout_directory(
     run_eynollah_ok_and_check_logs(
         'layout',
         [
-        '-di', str(resources_dir),
+        '-di', str(resources_dir / '2files'),
         '-o', str(outdir),
         ],
         [
diff --git a/tests/cli_tests/test_mbreorder.py b/tests/cli_tests/test_mbreorder.py
index 25b44d8..e429e98 100644
--- a/tests/cli_tests/test_mbreorder.py
+++ b/tests/cli_tests/test_mbreorder.py
@@ -6,8 +6,8 @@ def test_run_eynollah_mbreorder_filename(
     resources_dir,
     run_eynollah_ok_and_check_logs,
 ):
-    infile = resources_dir / 'kant_aufklaerung_1784_0020.xml'
-    outfile = tmp_path.joinpath('kant_aufklaerung_1784_0020.xml')
+    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',
         [
@@ -36,7 +36,7 @@ def test_run_eynollah_mbreorder_directory(
     run_eynollah_ok_and_check_logs(
         'machine-based-reading-order',
         [
-            '-di', str(resources_dir),
+            '-di', str(resources_dir / '2files'),
             '-o', str(outdir),
         ],
         [
diff --git a/tests/cli_tests/test_ocr.py b/tests/cli_tests/test_ocr.py
index ba56dce..6bf3080 100644
--- a/tests/cli_tests/test_ocr.py
+++ b/tests/cli_tests/test_ocr.py
@@ -16,8 +16,8 @@ def test_run_eynollah_ocr_filename(
     resources_dir,
     options,
 ):
-    infile = resources_dir / 'kant_aufklaerung_1784_0020.tif'
-    outfile = tmp_path.joinpath('kant_aufklaerung_1784_0020.xml')
+    infile = resources_dir / '2files/kant_aufklaerung_1784_0020.tif'
+    outfile = tmp_path / 'kant_aufklaerung_1784_0020.xml'
     outrenderfile = tmp_path / 'render' / 'kant_aufklaerung_1784_0020.png'
     outrenderfile.parent.mkdir()
     if "-doit" in options:
@@ -52,8 +52,8 @@ def test_run_eynollah_ocr_directory(
     run_eynollah_ok_and_check_logs(
         'ocr',
         [
-            '-di', str(resources_dir),
-            '-dx', str(resources_dir),
+            '-di', str(resources_dir / '2files'),
+            '-dx', str(resources_dir / '2files'),
             '-o', str(outdir),
         ],
         [
diff --git a/tests/conftest.py b/tests/conftest.py
index 347b7ee..703095e 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -14,7 +14,7 @@ def model_dir(tests_dir):
 
 @pytest.fixture()
 def resources_dir(tests_dir):
-    return tests_dir / 'resources/2files'
+    return tests_dir / 'resources'
 
 @pytest.fixture()
 def image_resources(resources_dir):