diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6546463..0166600 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -33,4 +33,4 @@ jobs:
- name: Test
run: |
- pytest mokuro/tests
+ pytest -v mokuro/tests
diff --git a/tests/conftest.py b/tests/conftest.py
new file mode 100644
index 0000000..36c0817
--- /dev/null
+++ b/tests/conftest.py
@@ -0,0 +1,27 @@
+from pathlib import Path
+
+import pytest
+
+
+def pytest_addoption(parser):
+ parser.addoption("-R", "--regenerate", action="store_true", default=False)
+
+
+@pytest.fixture
+def regenerate(request):
+ return request.config.getoption("--regenerate")
+
+
+@pytest.fixture
+def test_data_root():
+ return Path(__file__).parent / 'data'
+
+
+@pytest.fixture
+def input_data_root(test_data_root):
+ return test_data_root / 'input'
+
+
+@pytest.fixture
+def expected_results_root(test_data_root):
+ return test_data_root / 'expected_results'
diff --git a/tests/data/volumes/_ocr/vol1/000a.json b/tests/data/expected_results/test0/_ocr/vol1/000a.json
similarity index 100%
rename from tests/data/volumes/_ocr/vol1/000a.json
rename to tests/data/expected_results/test0/_ocr/vol1/000a.json
diff --git a/tests/data/volumes/_ocr/vol1/000b.json b/tests/data/expected_results/test0/_ocr/vol1/000b.json
similarity index 100%
rename from tests/data/volumes/_ocr/vol1/000b.json
rename to tests/data/expected_results/test0/_ocr/vol1/000b.json
diff --git a/tests/data/volumes/_ocr/vol1/001a.json b/tests/data/expected_results/test0/_ocr/vol1/001a.json
similarity index 100%
rename from tests/data/volumes/_ocr/vol1/001a.json
rename to tests/data/expected_results/test0/_ocr/vol1/001a.json
diff --git a/tests/data/volumes/_ocr/vol1/001b.json b/tests/data/expected_results/test0/_ocr/vol1/001b.json
similarity index 100%
rename from tests/data/volumes/_ocr/vol1/001b.json
rename to tests/data/expected_results/test0/_ocr/vol1/001b.json
diff --git a/tests/data/volumes/_ocr/vol1/002a.json b/tests/data/expected_results/test0/_ocr/vol1/002a.json
similarity index 100%
rename from tests/data/volumes/_ocr/vol1/002a.json
rename to tests/data/expected_results/test0/_ocr/vol1/002a.json
diff --git a/tests/data/volumes/_ocr/vol1/002b.json b/tests/data/expected_results/test0/_ocr/vol1/002b.json
similarity index 100%
rename from tests/data/volumes/_ocr/vol1/002b.json
rename to tests/data/expected_results/test0/_ocr/vol1/002b.json
diff --git a/tests/data/volumes/vol1.html b/tests/data/expected_results/test0/vol1.html
similarity index 53%
rename from tests/data/volumes/vol1.html
rename to tests/data/expected_results/test0/vol1.html
index 6b76c26..6f011ac 100644
--- a/tests/data/volumes/vol1.html
+++ b/tests/data/expected_results/test0/vol1.html
@@ -299,7 +299,7 @@
input[type=number] {
-moz-appearance: textfield;
}
-