Restructure unit tests

microsoft · Jan 25, 2021 · 3b293bd · 3b293bd
1 parent 1793c3d
commit 3b293bd
Show file tree

Hide file tree

Showing 57 changed files with 16 additions and 24 deletions.
diff --git a/tests/e2e/test_anchor_e2e.py b/tests/e2e/test_anchor_e2e.py
@@ -10,8 +10,8 @@
 @pytest.mark.parametrize(
     "gt_file, ocr_file",
     zip(
-        sorted(glob.glob("tests/text/data/gt_*.txt")),
-        sorted(glob.glob("tests/text/data/ocr_*.txt")),
+        sorted(glob.glob("tests/unit/text/data/gt_*.txt")),
+        sorted(glob.glob("tests/unit/text/data/ocr_*.txt")),
     ),
 )
 def test_align_w_anchor_and_align(gt_file, ocr_file):
@@ -37,8 +37,8 @@ def test_align_w_anchor_and_align(gt_file, ocr_file):
 @pytest.mark.parametrize(
     "gt_file, ocr_file",
     zip(
-        sorted(glob.glob("tests/text/data/gt_*.txt")),
-        sorted(glob.glob("tests/text/data/ocr_*.txt")),
+        sorted(glob.glob("tests/unit/text/data/gt_*.txt")),
+        sorted(glob.glob("tests/unit/text/data/ocr_*.txt")),
     ),
 )
 @pytest.mark.parametrize("max_seg_length", [25, 50, 75, 100, 150])

diff --git a/tests/e2e/test_document_generation.py b/tests/e2e/test_document_generation.py
@@ -11,7 +11,7 @@
 UNSUPPORTED_CONTENT_FORMAT = ["foo bar"]
 UNSUPPORTED_CONTENT_TYPE = CompositeContent(["foo"], [ContentType.TITLE])
 
-CUSTOM_TEMPLATE_PATH = "tests/generation/templates"
+CUSTOM_TEMPLATE_PATH = "tests/unit/generation/templates"
 CUSTOM_TEMPLATE_NAME = "mock.html.jinja"
 CUSTOM_STYLE_TEMPLATE_NAME = "font_family.html.jinja"
 MULTI_PAGE_TEMPLATE_NAME = "multipage.html.jinja"

diff --git a/tests/e2e/test_pipeline.py b/tests/e2e/test_pipeline.py
@@ -4,7 +4,7 @@
 
 from genalog import pipeline
 
-EXAMPLE_TEXT_FILE = "tests/text/data/gt_1.txt"
+EXAMPLE_TEXT_FILE = "tests/unit/text/data/gt_1.txt"
 
 
 @pytest.fixture
@@ -36,7 +36,7 @@ def test_custom_generate_img(custom_analog_generator):
 
 
 def test_generate_dataset_multiprocess():
-    INPUT_TEXT_FILENAMES = glob.glob("tests/text/data/gt_*.txt")
+    INPUT_TEXT_FILENAMES = glob.glob("tests/unit/text/data/gt_*.txt")
     with pytest.deprecated_call():
         pipeline.generate_dataset_multiprocess(
             INPUT_TEXT_FILENAMES, "test_out", {}, [], "text_block.html.jinja"

diff --git a/tests/ocr/.env b/tests/ocr/.env
diff --git a/tests/cases/__init__.py → tests/unit/__init__.py b/tests/cases/__init__.py → tests/unit/__init__.py
diff --git a/tests/unit/cases/__init__.py b/tests/unit/cases/__init__.py
diff --git a/tests/cases/label_propagation.py → tests/unit/cases/label_propagation.py b/tests/cases/label_propagation.py → tests/unit/cases/label_propagation.py
diff --git a/tests/cases/text_alignment.py → tests/unit/cases/text_alignment.py b/tests/cases/text_alignment.py → tests/unit/cases/text_alignment.py
diff --git a/tests/degradation/test_degrader.py → tests/unit/degradation/test_degrader.py b/tests/degradation/test_degrader.py → tests/unit/degradation/test_degrader.py
diff --git a/tests/degradation/test_effect.py → tests/unit/degradation/test_effect.py b/tests/degradation/test_effect.py → tests/unit/degradation/test_effect.py
diff --git a/tests/generation/2x2.jpg → tests/unit/generation/2x2.jpg b/tests/generation/2x2.jpg → tests/unit/generation/2x2.jpg
diff --git a/...neration/templates/font_family.html.jinja → ...neration/templates/font_family.html.jinja b/...neration/templates/font_family.html.jinja → ...neration/templates/font_family.html.jinja
diff --git a/tests/generation/templates/mock.html.jinja → ...unit/generation/templates/mock.html.jinja b/tests/generation/templates/mock.html.jinja → ...unit/generation/templates/mock.html.jinja
diff --git a/...generation/templates/multipage.html.jinja → ...generation/templates/multipage.html.jinja b/...generation/templates/multipage.html.jinja → ...generation/templates/multipage.html.jinja
diff --git a/tests/generation/test_content.py → tests/unit/generation/test_content.py b/tests/generation/test_content.py → tests/unit/generation/test_content.py
diff --git a/tests/generation/test_document.py → tests/unit/generation/test_document.py b/tests/generation/test_document.py → tests/unit/generation/test_document.py
@@ -12,12 +12,12 @@
 MOCK_TEMPLATE = MagicMock()
 MOCK_TEMPLATE.render.return_value = MOCK_COMPILED_DOCUMENT
 
-IMG_BYTES = open("tests/generation/2x2.jpg", "rb").read()
+IMG_BYTES = open("tests/unit/generation/2x2.jpg", "rb").read()
 
 FILE_DESTINATION_PDF = "sample.pdf"
 FILE_DESTINATION_PNG = "sample.png"
 
-CUSTOM_TEMPLATE_PATH = "tests/generation/templates"
+CUSTOM_TEMPLATE_PATH = "tests/unit/generation/templates"
 CUSTOM_TEMPLATE_NAME = "mock.html.jinja"
 DEFAULT_TEMPLATE_NAME = "text_block.html.jinja"
 DEFAULT_PACKAGE_NAME = "genalog.generation"

diff --git a/tests/ocr/data/img/0.png → tests/unit/ocr/data/img/0.png b/tests/ocr/data/img/0.png → tests/unit/ocr/data/img/0.png
diff --git a/tests/ocr/data/img/1.png → tests/unit/ocr/data/img/1.png b/tests/ocr/data/img/1.png → tests/unit/ocr/data/img/1.png
diff --git a/tests/ocr/data/img/11.png → tests/unit/ocr/data/img/11.png b/tests/ocr/data/img/11.png → tests/unit/ocr/data/img/11.png
diff --git a/...n/521c38122f783673598856cd81d91c21_0.json → ...n/521c38122f783673598856cd81d91c21_0.json b/...n/521c38122f783673598856cd81d91c21_0.json → ...n/521c38122f783673598856cd81d91c21_0.json
diff --git a/...n/521c38122f783673598856cd81d91c21_1.json → ...n/521c38122f783673598856cd81d91c21_1.json b/...n/521c38122f783673598856cd81d91c21_1.json → ...n/521c38122f783673598856cd81d91c21_1.json
diff --git a/.../521c38122f783673598856cd81d91c21_11.json → .../521c38122f783673598856cd81d91c21_11.json b/.../521c38122f783673598856cd81d91c21_11.json → .../521c38122f783673598856cd81d91c21_11.json
diff --git a/tests/ocr/data/metrics.csv → tests/unit/ocr/data/metrics.csv b/tests/ocr/data/metrics.csv → tests/unit/ocr/data/metrics.csv
diff --git a/tests/ocr/data/metrics/json/123_001.json → ...s/unit/ocr/data/metrics/json/123_001.json b/tests/ocr/data/metrics/json/123_001.json → ...s/unit/ocr/data/metrics/json/123_001.json
diff --git a/tests/ocr/data/metrics/json/123_002.json → ...s/unit/ocr/data/metrics/json/123_002.json b/tests/ocr/data/metrics/json/123_002.json → ...s/unit/ocr/data/metrics/json/123_002.json
diff --git a/tests/ocr/data/metrics/json/123_003.json → ...s/unit/ocr/data/metrics/json/123_003.json b/tests/ocr/data/metrics/json/123_003.json → ...s/unit/ocr/data/metrics/json/123_003.json
diff --git a/tests/ocr/data/metrics/metrics.csv → tests/unit/ocr/data/metrics/metrics.csv b/tests/ocr/data/metrics/metrics.csv → tests/unit/ocr/data/metrics/metrics.csv
diff --git a/tests/ocr/data/metrics/substitution.pkl → tests/unit/ocr/data/metrics/substitution.pkl b/tests/ocr/data/metrics/substitution.pkl → tests/unit/ocr/data/metrics/substitution.pkl
diff --git a/tests/ocr/data/metrics/text/001.txt → tests/unit/ocr/data/metrics/text/001.txt b/tests/ocr/data/metrics/text/001.txt → tests/unit/ocr/data/metrics/text/001.txt
diff --git a/tests/ocr/data/metrics/text/002.txt → tests/unit/ocr/data/metrics/text/002.txt b/tests/ocr/data/metrics/text/002.txt → tests/unit/ocr/data/metrics/text/002.txt
diff --git a/tests/ocr/data/metrics/text/003.txt → tests/unit/ocr/data/metrics/text/003.txt b/tests/ocr/data/metrics/text/003.txt → tests/unit/ocr/data/metrics/text/003.txt
diff --git a/tests/ocr/data/substitution.json → tests/unit/ocr/data/substitution.json b/tests/ocr/data/substitution.json → tests/unit/ocr/data/substitution.json
diff --git a/tests/ocr/data/substitution.pkl → tests/unit/ocr/data/substitution.pkl b/tests/ocr/data/substitution.pkl → tests/unit/ocr/data/substitution.pkl
diff --git a/tests/ocr/data/text/0.txt → tests/unit/ocr/data/text/0.txt b/tests/ocr/data/text/0.txt → tests/unit/ocr/data/text/0.txt
diff --git a/tests/ocr/data/text/1.txt → tests/unit/ocr/data/text/1.txt b/tests/ocr/data/text/1.txt → tests/unit/ocr/data/text/1.txt
diff --git a/tests/ocr/data/text/11.txt → tests/unit/ocr/data/text/11.txt b/tests/ocr/data/text/11.txt → tests/unit/ocr/data/text/11.txt
diff --git a/tests/ocr/test_metrics.py → tests/unit/ocr/test_metrics.py b/tests/ocr/test_metrics.py → tests/unit/ocr/test_metrics.py
diff --git a/tests/ocr/test_ocr.py → tests/unit/ocr/test_ocr.py b/tests/ocr/test_ocr.py → tests/unit/ocr/test_ocr.py
diff --git a/tests/text/data/gt_1.txt → tests/unit/text/data/gt_1.txt b/tests/text/data/gt_1.txt → tests/unit/text/data/gt_1.txt
diff --git a/tests/text/data/gt_2.txt → tests/unit/text/data/gt_2.txt b/tests/text/data/gt_2.txt → tests/unit/text/data/gt_2.txt
diff --git a/tests/text/data/gt_3.txt → tests/unit/text/data/gt_3.txt b/tests/text/data/gt_3.txt → tests/unit/text/data/gt_3.txt
diff --git a/tests/text/data/label_generator/labels/0.tsv → ...it/text/data/label_generator/labels/0.tsv b/tests/text/data/label_generator/labels/0.tsv → ...it/text/data/label_generator/labels/0.tsv
diff --git a/tests/text/data/label_generator/labels/1.tsv → ...it/text/data/label_generator/labels/1.tsv b/tests/text/data/label_generator/labels/1.tsv → ...it/text/data/label_generator/labels/1.tsv
diff --git a/...s/text/data/label_generator/labels/11.tsv → ...t/text/data/label_generator/labels/11.tsv b/...s/text/data/label_generator/labels/11.tsv → ...t/text/data/label_generator/labels/11.tsv
diff --git a/tests/text/data/label_generator/text/0.txt → ...unit/text/data/label_generator/text/0.txt b/tests/text/data/label_generator/text/0.txt → ...unit/text/data/label_generator/text/0.txt
diff --git a/tests/text/data/label_generator/text/1.txt → ...unit/text/data/label_generator/text/1.txt b/tests/text/data/label_generator/text/1.txt → ...unit/text/data/label_generator/text/1.txt
diff --git a/tests/text/data/label_generator/text/11.txt → ...nit/text/data/label_generator/text/11.txt b/tests/text/data/label_generator/text/11.txt → ...nit/text/data/label_generator/text/11.txt
diff --git a/tests/text/data/ocr_1.txt → tests/unit/text/data/ocr_1.txt b/tests/text/data/ocr_1.txt → tests/unit/text/data/ocr_1.txt
diff --git a/tests/text/data/ocr_2.txt → tests/unit/text/data/ocr_2.txt b/tests/text/data/ocr_2.txt → tests/unit/text/data/ocr_2.txt
diff --git a/tests/text/data/ocr_3.txt → tests/unit/text/data/ocr_3.txt b/tests/text/data/ocr_3.txt → tests/unit/text/data/ocr_3.txt
diff --git a/tests/text/test_alignment.py → tests/unit/text/test_alignment.py b/tests/text/test_alignment.py → tests/unit/text/test_alignment.py
@@ -5,8 +5,8 @@
 import pytest
 
 from genalog.text import alignment
-from tests.cases.text_alignment import ALIGNMENT_REGRESSION_TEST_CASES
-from tests.cases.text_alignment import PARSE_ALIGNMENT_REGRESSION_TEST_CASES
+from tests.unit.cases.text_alignment import ALIGNMENT_REGRESSION_TEST_CASES
+from tests.unit.cases.text_alignment import PARSE_ALIGNMENT_REGRESSION_TEST_CASES
 
 RANDOM_INT = randint(1, 100)
 MOCK_ALIGNMENT_RESULT = [("X", "X", 0, 0, 1)]

diff --git a/tests/text/test_anchor.py → tests/unit/text/test_anchor.py b/tests/text/test_anchor.py → tests/unit/text/test_anchor.py
@@ -4,7 +4,7 @@
 import pytest
 
 from genalog.text import alignment, anchor, preprocess
-from tests.cases.text_alignment import ALIGNMENT_REGRESSION_TEST_CASES
+from tests.unit.cases.text_alignment import ALIGNMENT_REGRESSION_TEST_CASES
 
 
 @pytest.mark.parametrize(
@@ -200,8 +200,8 @@ def test_find_anchor_recur_fixed_seg_len(
 @pytest.mark.parametrize(
     "gt_file, ocr_file",
     zip(
-        sorted(glob.glob("tests/text/data/gt_1.txt")),
-        sorted(glob.glob("tests/text/data/ocr_1.txt")),
+        sorted(glob.glob("tests/unit/text/data/gt_1.txt")),
+        sorted(glob.glob("tests/unit/text/data/ocr_1.txt")),
     ),
 )
 @pytest.mark.parametrize("max_seg_length", [75])

diff --git a/tests/text/test_conll_format.py → tests/unit/text/test_conll_format.py b/tests/text/test_conll_format.py → tests/unit/text/test_conll_format.py
diff --git a/tests/text/test_lcs.py → tests/unit/text/test_lcs.py b/tests/text/test_lcs.py → tests/unit/text/test_lcs.py
diff --git a/tests/text/test_ner_label.py → tests/unit/text/test_ner_label.py b/tests/text/test_ner_label.py → tests/unit/text/test_ner_label.py
@@ -1,7 +1,7 @@
 import pytest
 
 from genalog.text import ner_label
-from tests.cases.label_propagation import LABEL_PROPAGATION_REGRESSION_TEST_CASES
+from tests.unit.cases.label_propagation import LABEL_PROPAGATION_REGRESSION_TEST_CASES
 
 
 @pytest.mark.parametrize(

diff --git a/tests/text/test_preprocess.py → tests/unit/text/test_preprocess.py b/tests/text/test_preprocess.py → tests/unit/text/test_preprocess.py
diff --git a/tests/text/test_utf8.py → tests/unit/text/test_utf8.py b/tests/text/test_utf8.py → tests/unit/text/test_utf8.py
@@ -5,7 +5,7 @@
 
 from genalog.text import alignment
 from genalog.text.alignment import GAP_CHAR
-from tests.cases.text_alignment import ALIGNMENT_REGRESSION_TEST_CASES
+from tests.unit.cases.text_alignment import ALIGNMENT_REGRESSION_TEST_CASES
 
 
 def random_utf8_char(byte_len=1):