From 5968ed1d97bc0f0b4d9a8840f33747aa998ccdc5 Mon Sep 17 00:00:00 2001 From: Dmitrii Lavrukhin Date: Tue, 30 Jul 2024 20:35:50 +0400 Subject: [PATCH 1/3] moving TestCaseHelper to datumaro/util/test_utils.py --- datumaro/util/test_utils.py | 29 +++++++++++++++++++++++++++-- tests/utils/test_utils.py | 30 ------------------------------ 2 files changed, 27 insertions(+), 32 deletions(-) delete mode 100644 tests/utils/test_utils.py diff --git a/datumaro/util/test_utils.py b/datumaro/util/test_utils.py index 9518d47502..04ab48da97 100644 --- a/datumaro/util/test_utils.py +++ b/datumaro/util/test_utils.py @@ -1,4 +1,4 @@ -# Copyright (C) 2019-2022 Intel Corporation +# Copyright (C) 2019-2024 Intel Corporation # # SPDX-License-Identifier: MIT @@ -12,8 +12,9 @@ import warnings from enum import Enum, auto from glob import glob -from typing import Any, Collection, Optional, Union +from typing import Any, Collection, List, Optional, Union +import pytest from typing_extensions import Literal from datumaro.components.annotation import AnnotationType @@ -358,3 +359,27 @@ def new_init(self, **kwargs): with unittest.mock.patch("tensorflow_datasets.core.DatasetBuilder.__init__", new_init): yield + + +class TestCaseHelper: + """This class will exist until we complete the migration from unittest to pytest. + It is designed to mimic unittest.TestCase behaviors to minimize the migration work labor cost. + """ + + def assertTrue(self, boolean: bool, err_msg: str = ""): + assert boolean, err_msg + + def assertFalse(self, boolean: bool, err_msg: str = ""): + assert not boolean, err_msg + + def assertEqual(self, item1: Any, item2: Any, err_msg: str = ""): + assert item1 == item2, err_msg + + def assertListEqual(self, list1: List[Any], list2: List[Any], err_msg: str = ""): + assert isinstance(list1, list) and isinstance(list2, list), err_msg + assert len(list1) == len(list2), err_msg + for item1, item2 in zip(list1, list2): + self.assertEqual(item1, item2, err_msg) + + def fail(self, msg): + pytest.fail(reason=msg) diff --git a/tests/utils/test_utils.py b/tests/utils/test_utils.py deleted file mode 100644 index 5eee14dcb4..0000000000 --- a/tests/utils/test_utils.py +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright (C) 2019-2024 Intel Corporation -# -# SPDX-License-Identifier: MIT -from typing import Any, List - -import pytest - - -class TestCaseHelper: - """This class will exist until we complete the migration from unittest to pytest. - It is designed to mimic unittest.TestCase behaviors to minimize the migration work labor cost. - """ - - def assertTrue(self, boolean: bool, err_msg: str = ""): - assert boolean, err_msg - - def assertFalse(self, boolean: bool, err_msg: str = ""): - assert not boolean, err_msg - - def assertEqual(self, item1: Any, item2: Any, err_msg: str = ""): - assert item1 == item2, err_msg - - def assertListEqual(self, list1: List[Any], list2: List[Any], err_msg: str = ""): - assert isinstance(list1, list) and isinstance(list2, list), err_msg - assert len(list1) == len(list2), err_msg - for item1, item2 in zip(list1, list2): - self.assertEqual(item1, item2, err_msg) - - def fail(self, msg): - pytest.fail(reason=msg) From e75430c5b994cb58f7e4c5af3cc38f4f3d49ad69 Mon Sep 17 00:00:00 2001 From: Dmitrii Lavrukhin Date: Tue, 30 Jul 2024 20:39:52 +0400 Subject: [PATCH 2/3] moving test_utils.py from datumaro/util to tests/utils --- tests/cli/test_describe_downloads.py | 5 +++-- tests/cli/test_detect_format.py | 4 ++-- tests/cli/test_diff.py | 5 +++-- tests/cli/test_download.py | 5 +++-- tests/cli/test_filter.py | 5 +++-- tests/cli/test_generator.py | 5 +++-- tests/cli/test_image_zip_format.py | 5 +++-- tests/cli/test_info.py | 3 ++- tests/cli/test_kitti_raw_format.py | 5 +++-- tests/cli/test_merge.py | 5 +++-- tests/cli/test_patch.py | 5 +++-- tests/cli/test_project.py | 5 +++-- tests/cli/test_revpath.py | 3 ++- tests/cli/test_sly_point_cloud_format.py | 5 +++-- tests/cli/test_transform.py | 5 +++-- tests/cli/test_utils.py | 5 +++-- tests/cli/test_video.py | 5 ++--- tests/cli/test_voc_format.py | 5 +++-- tests/cli/test_yolo_format.py | 5 +++-- tests/conftest.py | 4 +--- tests/test_ade20k2017_format.py | 2 +- tests/test_ade20k2020_format.py | 2 +- tests/test_align_celeba_format.py | 3 ++- tests/test_brats_format.py | 3 ++- tests/test_brats_numpy_format.py | 3 ++- tests/test_camvid_format.py | 3 ++- tests/test_celeba_format.py | 3 ++- tests/test_cifar_format.py | 3 ++- tests/test_cityscapes_format.py | 3 ++- tests/test_coco_format.py | 7 ++++--- tests/test_common_semantic_segmentation_format.py | 3 ++- tests/test_common_super_resolution_format.py | 3 ++- tests/test_config.py | 3 ++- tests/test_cvat_format.py | 3 ++- tests/test_dataset.py | 3 ++- tests/test_datumaro_format.py | 7 ++++--- tests/test_extractor_tfds.py | 2 +- tests/test_format_detection.py | 2 +- tests/test_fractal_image_generator.py | 3 ++- tests/test_icdar_format.py | 3 ++- tests/test_image.py | 3 ++- tests/test_image_dir_format.py | 3 ++- tests/test_image_zip_format.py | 3 ++- tests/test_imagenet_format.py | 3 ++- tests/test_imagenet_txt_format.py | 3 ++- tests/test_images.py | 3 ++- tests/test_kinetics_format.py | 3 ++- tests/test_kitti_format.py | 3 ++- tests/test_kitti_raw_format.py | 2 +- tests/test_labelme_format.py | 3 ++- tests/test_lfw_format.py | 3 ++- tests/test_mapillary_vistas_format.py | 3 ++- tests/test_market1501_format.py | 3 ++- tests/test_mars_format.py | 2 +- tests/test_mnist_csv_format.py | 3 ++- tests/test_mnist_format.py | 3 ++- tests/test_mot_format.py | 3 ++- tests/test_mots_format.py | 3 ++- tests/test_mpii_format.py | 3 ++- tests/test_mpii_json_format.py | 3 ++- tests/test_nyu_depth_v2_format.py | 3 ++- tests/test_open_images_format.py | 2 +- tests/test_ops.py | 3 ++- tests/test_project.py | 3 ++- tests/test_sampler.py | 3 ++- tests/test_sly_pointcloud_format.py | 3 ++- tests/test_synthia_format.py | 3 ++- tests/test_tfrecord_format.py | 3 ++- tests/test_transforms.py | 3 ++- tests/test_util.py | 3 ++- tests/test_vgg_face2_format.py | 3 ++- tests/test_video.py | 3 ++- tests/test_voc_format.py | 7 ++++--- tests/test_vott_csv_format.py | 3 ++- tests/test_vott_json_format.py | 3 ++- tests/test_widerface_format.py | 3 ++- tests/unit/data_formats/test_yolo_format.py | 3 ++- tests/utils/__init__.py | 0 {datumaro/util => tests/utils}/test_utils.py | 0 79 files changed, 167 insertions(+), 103 deletions(-) create mode 100644 tests/utils/__init__.py rename {datumaro/util => tests/utils}/test_utils.py (100%) diff --git a/tests/cli/test_describe_downloads.py b/tests/cli/test_describe_downloads.py index 949de88b86..db871849fc 100644 --- a/tests/cli/test_describe_downloads.py +++ b/tests/cli/test_describe_downloads.py @@ -6,11 +6,12 @@ from datumaro.components.extractor_tfds import AVAILABLE_TFDS_DATASETS, TFDS_EXTRACTOR_AVAILABLE from datumaro.util import parse_json -from datumaro.util.test_utils import TestDir, mock_tfds_data -from datumaro.util.test_utils import run_datum as run from ..requirements import Requirements, mark_requirement +from tests.utils.test_utils import TestDir, mock_tfds_data +from tests.utils.test_utils import run_datum as run + @skipIf(not TFDS_EXTRACTOR_AVAILABLE, reason="TFDS is not installed") class DescribeDownloadsTest(TestCase): diff --git a/tests/cli/test_detect_format.py b/tests/cli/test_detect_format.py index f7ed1fb1c6..70c2126521 100644 --- a/tests/cli/test_detect_format.py +++ b/tests/cli/test_detect_format.py @@ -11,10 +11,10 @@ from datumaro.plugins.image_dir_format import ImageDirImporter from datumaro.plugins.lfw_format import LfwImporter from datumaro.util.os_util import suppress_output -from datumaro.util.test_utils import TestDir -from datumaro.util.test_utils import run_datum as run from tests.requirements import Requirements, mark_requirement +from tests.utils.test_utils import TestDir +from tests.utils.test_utils import run_datum as run ADE20K2017_DIR = osp.join(osp.dirname(__file__), "../assets/ade20k2017_dataset/dataset") ADE20K2020_DIR = osp.join(osp.dirname(__file__), "../assets/ade20k2020_dataset/dataset") diff --git a/tests/cli/test_diff.py b/tests/cli/test_diff.py index 86b73d5252..baaebbd310 100644 --- a/tests/cli/test_diff.py +++ b/tests/cli/test_diff.py @@ -22,11 +22,12 @@ from datumaro.components.media import Image from datumaro.components.operations import DistanceComparator from datumaro.components.project import Dataset -from datumaro.util.test_utils import TestDir -from datumaro.util.test_utils import run_datum as run from ..requirements import Requirements, mark_requirement +from tests.utils.test_utils import TestDir +from tests.utils.test_utils import run_datum as run + class DiffTest(TestCase): @mark_requirement(Requirements.DATUM_GENERAL_REQ) diff --git a/tests/cli/test_download.py b/tests/cli/test_download.py index dfd23c570e..b37f525d08 100644 --- a/tests/cli/test_download.py +++ b/tests/cli/test_download.py @@ -4,11 +4,12 @@ from datumaro.components.dataset import Dataset from datumaro.components.extractor_tfds import AVAILABLE_TFDS_DATASETS, TFDS_EXTRACTOR_AVAILABLE -from datumaro.util.test_utils import TestDir, compare_datasets, mock_tfds_data -from datumaro.util.test_utils import run_datum as run from ..requirements import Requirements, mark_requirement +from tests.utils.test_utils import TestDir, compare_datasets, mock_tfds_data +from tests.utils.test_utils import run_datum as run + @skipIf(not TFDS_EXTRACTOR_AVAILABLE, reason="TFDS is not installed") class DownloadTest(TestCase): diff --git a/tests/cli/test_filter.py b/tests/cli/test_filter.py index 45c424e241..949d85995c 100644 --- a/tests/cli/test_filter.py +++ b/tests/cli/test_filter.py @@ -7,11 +7,12 @@ from datumaro.components.extractor import DatasetItem from datumaro.components.project import Project from datumaro.util.scope import scope_add, scoped -from datumaro.util.test_utils import TestDir, compare_datasets -from datumaro.util.test_utils import run_datum as run from ..requirements import Requirements, mark_requirement +from tests.utils.test_utils import TestDir, compare_datasets +from tests.utils.test_utils import run_datum as run + class FilterTest(TestCase): @mark_requirement(Requirements.DATUM_GENERAL_REQ) diff --git a/tests/cli/test_generator.py b/tests/cli/test_generator.py index 16c19f9ef6..9f5331babf 100644 --- a/tests/cli/test_generator.py +++ b/tests/cli/test_generator.py @@ -5,11 +5,12 @@ import pytest import datumaro.util.image as image_module -from datumaro.util.test_utils import TestDir -from datumaro.util.test_utils import run_datum as run from ..requirements import Requirements, mark_requirement +from tests.utils.test_utils import TestDir +from tests.utils.test_utils import run_datum as run + # TODO: update links @pytest.mark.xfail(reason="Cannot download the model file from the source") diff --git a/tests/cli/test_image_zip_format.py b/tests/cli/test_image_zip_format.py index afb23d8e29..e8a9cda43e 100644 --- a/tests/cli/test_image_zip_format.py +++ b/tests/cli/test_image_zip_format.py @@ -7,11 +7,12 @@ from datumaro.components.dataset import Dataset, DatasetItem from datumaro.components.media import Image -from datumaro.util.test_utils import TestDir, compare_datasets -from datumaro.util.test_utils import run_datum as run from ..requirements import Requirements, mark_requirement +from tests.utils.test_utils import TestDir, compare_datasets +from tests.utils.test_utils import run_datum as run + def make_zip_archive(src_path, dst_path): with ZipFile(dst_path, "w") as archive: diff --git a/tests/cli/test_info.py b/tests/cli/test_info.py index 6fb28da17b..ece8f514b4 100644 --- a/tests/cli/test_info.py +++ b/tests/cli/test_info.py @@ -9,10 +9,11 @@ import pytest from datumaro.util import parse_json -from datumaro.util.test_utils import run_datum from ..requirements import Requirements, mark_requirement +from tests.utils.test_utils import run_datum + DUMMY_DATASET_DIR = osp.join( __file__[: __file__.rfind(osp.join("tests", ""))], "tests", diff --git a/tests/cli/test_kitti_raw_format.py b/tests/cli/test_kitti_raw_format.py index 7fa7a28ab4..08701a5077 100644 --- a/tests/cli/test_kitti_raw_format.py +++ b/tests/cli/test_kitti_raw_format.py @@ -5,11 +5,12 @@ from datumaro.components.dataset import Dataset from datumaro.components.extractor import DatasetItem from datumaro.components.media import Image, PointCloud -from datumaro.util.test_utils import TestDir, compare_datasets_3d -from datumaro.util.test_utils import run_datum as run from ..requirements import Requirements, mark_requirement +from tests.utils.test_utils import TestDir, compare_datasets_3d +from tests.utils.test_utils import run_datum as run + DUMMY_DATASET_DIR = osp.join( __file__[: __file__.rfind(osp.join("tests", ""))], "tests", diff --git a/tests/cli/test_merge.py b/tests/cli/test_merge.py index 9a7839661b..b2222483f9 100644 --- a/tests/cli/test_merge.py +++ b/tests/cli/test_merge.py @@ -8,11 +8,12 @@ from datumaro.components.extractor import DatasetItem from datumaro.components.media import Image from datumaro.components.project import Dataset, Project -from datumaro.util.test_utils import TestDir, compare_datasets -from datumaro.util.test_utils import run_datum as run from ..requirements import Requirements, mark_requirement +from tests.utils.test_utils import TestDir, compare_datasets +from tests.utils.test_utils import run_datum as run + class MergeTest(TestCase): @mark_requirement(Requirements.DATUM_GENERAL_REQ) diff --git a/tests/cli/test_patch.py b/tests/cli/test_patch.py index 2c8b256d4e..e85a518b89 100644 --- a/tests/cli/test_patch.py +++ b/tests/cli/test_patch.py @@ -8,11 +8,12 @@ from datumaro.components.extractor import DatasetItem from datumaro.components.media import Image from datumaro.components.project import Dataset, Project -from datumaro.util.test_utils import TestDir, compare_datasets -from datumaro.util.test_utils import run_datum as run from ..requirements import Requirements, mark_requirement +from tests.utils.test_utils import TestDir, compare_datasets +from tests.utils.test_utils import run_datum as run + class PatchTest(TestCase): @mark_requirement(Requirements.DATUM_GENERAL_REQ) diff --git a/tests/cli/test_project.py b/tests/cli/test_project.py index b015dfee0b..af818dcf12 100644 --- a/tests/cli/test_project.py +++ b/tests/cli/test_project.py @@ -10,11 +10,12 @@ from datumaro.components.media import Image from datumaro.components.project import Project from datumaro.util.scope import scope_add, scoped -from datumaro.util.test_utils import TestDir, compare_datasets, compare_dirs -from datumaro.util.test_utils import run_datum as run from ..requirements import Requirements, mark_requirement +from tests.utils.test_utils import TestDir, compare_datasets, compare_dirs +from tests.utils.test_utils import run_datum as run + class ProjectIntegrationScenarios(TestCase): @mark_requirement(Requirements.DATUM_GENERAL_REQ) diff --git a/tests/cli/test_revpath.py b/tests/cli/test_revpath.py index 70f2d5143c..8916c43bb8 100644 --- a/tests/cli/test_revpath.py +++ b/tests/cli/test_revpath.py @@ -13,11 +13,12 @@ from datumaro.components.extractor import DatasetItem from datumaro.components.project import Project from datumaro.util.scope import scope_add, scoped -from datumaro.util.test_utils import TestDir from ..conftest import ASSETS_DIR from ..requirements import Requirements, mark_requirement +from tests.utils.test_utils import TestDir + class TestRevpath(TestCase): @mark_requirement(Requirements.DATUM_GENERAL_REQ) diff --git a/tests/cli/test_sly_point_cloud_format.py b/tests/cli/test_sly_point_cloud_format.py index 298274124a..a574a81ece 100644 --- a/tests/cli/test_sly_point_cloud_format.py +++ b/tests/cli/test_sly_point_cloud_format.py @@ -5,11 +5,12 @@ from datumaro.components.dataset import Dataset from datumaro.components.extractor import DatasetItem from datumaro.components.media import Image, PointCloud -from datumaro.util.test_utils import TestDir, compare_datasets_3d -from datumaro.util.test_utils import run_datum as run from ..requirements import Requirements, mark_requirement +from tests.utils.test_utils import TestDir, compare_datasets_3d +from tests.utils.test_utils import run_datum as run + DUMMY_DATASET_DIR = osp.join( __file__[: __file__.rfind(osp.join("tests", ""))], "tests", "assets", "sly_pointcloud_dataset" ) diff --git a/tests/cli/test_transform.py b/tests/cli/test_transform.py index 90cb4de28d..d638abfc15 100644 --- a/tests/cli/test_transform.py +++ b/tests/cli/test_transform.py @@ -7,11 +7,12 @@ from datumaro.components.extractor import DatasetItem from datumaro.components.project import Project from datumaro.util.scope import scope_add, scoped -from datumaro.util.test_utils import TestDir, compare_datasets -from datumaro.util.test_utils import run_datum as run from ..requirements import Requirements, mark_requirement +from tests.utils.test_utils import TestDir, compare_datasets +from tests.utils.test_utils import run_datum as run + class TransformTest(TestCase): @mark_requirement(Requirements.DATUM_GENERAL_REQ) diff --git a/tests/cli/test_utils.py b/tests/cli/test_utils.py index d180bc0a40..cba1363ed8 100644 --- a/tests/cli/test_utils.py +++ b/tests/cli/test_utils.py @@ -4,12 +4,13 @@ from datumaro.components.media_manager import MediaManager from datumaro.util.scope import on_exit_do, scope_add, scoped -from datumaro.util.test_utils import TestDir -from datumaro.util.test_utils import run_datum as run from ..requirements import Requirements, mark_requirement from ..test_video import make_sample_video # pylint: disable=unused-import +from tests.utils.test_utils import TestDir +from tests.utils.test_utils import run_datum as run + class VideoSplittingTest: @mark_requirement(Requirements.DATUM_GENERAL_REQ) diff --git a/tests/cli/test_video.py b/tests/cli/test_video.py index 6ef3cb40d3..a76c6e5551 100644 --- a/tests/cli/test_video.py +++ b/tests/cli/test_video.py @@ -2,12 +2,11 @@ import os.path as osp from unittest import TestCase -from datumaro.util.test_utils import TestDir -from datumaro.util.test_utils import run_datum as run - from ..requirements import Requirements, mark_requirement from tests.test_video import make_sample_video +from tests.utils.test_utils import TestDir +from tests.utils.test_utils import run_datum as run class VideoTest(TestCase): diff --git a/tests/cli/test_voc_format.py b/tests/cli/test_voc_format.py index 979ee17d10..b3bc60055f 100644 --- a/tests/cli/test_voc_format.py +++ b/tests/cli/test_voc_format.py @@ -8,11 +8,12 @@ from datumaro.components.annotation import Bbox, Label, Mask from datumaro.components.dataset import Dataset, DatasetItem from datumaro.components.media import Image -from datumaro.util.test_utils import TestDir, compare_datasets -from datumaro.util.test_utils import run_datum as run from ..requirements import Requirements, mark_requirement +from tests.utils.test_utils import TestDir, compare_datasets +from tests.utils.test_utils import run_datum as run + DUMMY_DATASETS_DIR = osp.join( __file__[: __file__.rfind(osp.join("tests", ""))], "tests", "assets", "voc_dataset" ) diff --git a/tests/cli/test_yolo_format.py b/tests/cli/test_yolo_format.py index 48bf3dab53..9d839bc21b 100644 --- a/tests/cli/test_yolo_format.py +++ b/tests/cli/test_yolo_format.py @@ -8,11 +8,12 @@ from datumaro.components.dataset import Dataset from datumaro.components.extractor import DatasetItem from datumaro.components.media import Image -from datumaro.util.test_utils import TestDir, compare_datasets -from datumaro.util.test_utils import run_datum as run from ..requirements import Requirements, mark_requirement +from tests.utils.test_utils import TestDir, compare_datasets +from tests.utils.test_utils import run_datum as run + class YoloIntegrationScenarios(TestCase): ASSET_PATH = ["yolo_dataset", "yolo"] diff --git a/tests/conftest.py b/tests/conftest.py index 0196fe7bd2..fd2a005680 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -4,10 +4,8 @@ # SPDX-License-Identifier: MIT from pathlib import Path -from datumaro.util.test_utils import TestDir - from .fixtures import * -from .utils.test_utils import TestCaseHelper +from .utils.test_utils import TestCaseHelper, TestDir ASSETS_DIR = Path(__file__).parent / "assets" diff --git a/tests/test_ade20k2017_format.py b/tests/test_ade20k2017_format.py index a946ef11fd..bc6496ca58 100644 --- a/tests/test_ade20k2017_format.py +++ b/tests/test_ade20k2017_format.py @@ -12,9 +12,9 @@ from datumaro.components.environment import Environment from datumaro.components.media import Image from datumaro.plugins.ade20k2017_format import Ade20k2017Importer -from datumaro.util.test_utils import compare_datasets from tests.requirements import Requirements, mark_requirement +from tests.utils.test_utils import compare_datasets DUMMY_DATASET_DIR = osp.join(osp.dirname(__file__), "assets", "ade20k2017_dataset", "dataset") diff --git a/tests/test_ade20k2020_format.py b/tests/test_ade20k2020_format.py index f96b9ef7fb..a9b054bd89 100644 --- a/tests/test_ade20k2020_format.py +++ b/tests/test_ade20k2020_format.py @@ -12,9 +12,9 @@ from datumaro.components.environment import Environment from datumaro.components.media import Image from datumaro.plugins.ade20k2020_format import Ade20k2020Importer -from datumaro.util.test_utils import compare_datasets from tests.requirements import Requirements, mark_requirement +from tests.utils.test_utils import compare_datasets DUMMY_DATASET_DIR = osp.join(osp.dirname(__file__), "assets", "ade20k2020_dataset", "dataset") diff --git a/tests/test_align_celeba_format.py b/tests/test_align_celeba_format.py index 7eaa99da11..3ae89bfbce 100644 --- a/tests/test_align_celeba_format.py +++ b/tests/test_align_celeba_format.py @@ -15,10 +15,11 @@ from datumaro.components.extractor import DatasetItem from datumaro.components.media import Image from datumaro.plugins.align_celeba_format import AlignCelebaImporter -from datumaro.util.test_utils import compare_datasets from .requirements import Requirements, mark_requirement +from tests.utils.test_utils import compare_datasets + DUMMY_ALIGN_DATASET_DIR = osp.join( osp.dirname(__file__), "assets", "align_celeba_dataset", "dataset" ) diff --git a/tests/test_brats_format.py b/tests/test_brats_format.py index 6aa9f44e45..ad126d792e 100644 --- a/tests/test_brats_format.py +++ b/tests/test_brats_format.py @@ -9,10 +9,11 @@ from datumaro.components.extractor import DatasetItem from datumaro.components.media import MultiframeImage from datumaro.plugins.brats_format import BratsImporter -from datumaro.util.test_utils import compare_datasets from .requirements import Requirements, mark_requirement +from tests.utils.test_utils import compare_datasets + DUMMY_DATASET_DIR = osp.join(osp.dirname(__file__), "assets", "brats_dataset") diff --git a/tests/test_brats_numpy_format.py b/tests/test_brats_numpy_format.py index b204b215c8..1930a0c51a 100644 --- a/tests/test_brats_numpy_format.py +++ b/tests/test_brats_numpy_format.py @@ -9,10 +9,11 @@ from datumaro.components.extractor import DatasetItem from datumaro.components.media import MultiframeImage from datumaro.plugins.brats_numpy_format import BratsNumpyImporter -from datumaro.util.test_utils import compare_datasets from .requirements import Requirements, mark_requirement +from tests.utils.test_utils import compare_datasets + DUMMY_DATASET_DIR = osp.join(osp.dirname(__file__), "assets", "brats_numpy_dataset") diff --git a/tests/test_camvid_format.py b/tests/test_camvid_format.py index 21cf61587a..aa9dd7fcc5 100644 --- a/tests/test_camvid_format.py +++ b/tests/test_camvid_format.py @@ -14,10 +14,11 @@ from datumaro.components.media import Image from datumaro.plugins.camvid_format import CamvidConverter, CamvidImporter from datumaro.util.meta_file_util import parse_meta_file -from datumaro.util.test_utils import TestDir, check_save_and_load, compare_datasets from .requirements import Requirements, mark_requirement +from tests.utils.test_utils import TestDir, check_save_and_load, compare_datasets + class CamvidFormatTest(TestCase): @mark_requirement(Requirements.DATUM_GENERAL_REQ) diff --git a/tests/test_celeba_format.py b/tests/test_celeba_format.py index e3c48ea9d6..5900511b73 100644 --- a/tests/test_celeba_format.py +++ b/tests/test_celeba_format.py @@ -16,10 +16,11 @@ from datumaro.components.extractor import DatasetItem from datumaro.components.media import Image from datumaro.plugins.celeba_format import CelebaImporter -from datumaro.util.test_utils import compare_datasets from .requirements import Requirements, mark_requirement +from tests.utils.test_utils import compare_datasets + DUMMY_DATASET_DIR = osp.join(osp.dirname(__file__), "assets", "celeba_dataset", "dataset") DUMMY_DATASET_DIR_WITH_META_FILE = osp.join( osp.dirname(__file__), "assets", "celeba_dataset", "dataset_with_meta_file" diff --git a/tests/test_cifar_format.py b/tests/test_cifar_format.py index d91f42ad49..1a04d2f44d 100644 --- a/tests/test_cifar_format.py +++ b/tests/test_cifar_format.py @@ -11,10 +11,11 @@ from datumaro.components.extractor import DatasetItem from datumaro.components.media import Image from datumaro.plugins.cifar_format import CifarConverter, CifarImporter -from datumaro.util.test_utils import TestDir, compare_datasets from .requirements import Requirements, mark_requirement +from tests.utils.test_utils import TestDir, compare_datasets + class CifarFormatTest(TestCase): @mark_requirement(Requirements.DATUM_GENERAL_REQ) diff --git a/tests/test_cityscapes_format.py b/tests/test_cityscapes_format.py index b516682e9d..28caff0aa9 100644 --- a/tests/test_cityscapes_format.py +++ b/tests/test_cityscapes_format.py @@ -18,10 +18,11 @@ CityscapesImporter, ) from datumaro.util.meta_file_util import parse_meta_file -from datumaro.util.test_utils import IGNORE_ALL, TestDir, check_save_and_load, compare_datasets from .requirements import Requirements, mark_requirement +from tests.utils.test_utils import IGNORE_ALL, TestDir, check_save_and_load, compare_datasets + DUMMY_DATASET_DIR = osp.join(osp.dirname(__file__), "assets", "cityscapes_dataset", "dataset") DUMMY_TRAIN_DATASET_DIR = osp.join( osp.dirname(__file__), "assets", "cityscapes_dataset", "train_dataset" diff --git a/tests/test_coco_format.py b/tests/test_coco_format.py index 57356ebdf7..aea659492c 100644 --- a/tests/test_coco_format.py +++ b/tests/test_coco_format.py @@ -46,15 +46,16 @@ from datumaro.plugins.coco_format.extractor import CocoInstancesExtractor from datumaro.plugins.coco_format.importer import CocoImporter from datumaro.util import dump_json_file -from datumaro.util.test_utils import ( + +from .requirements import Requirements, mark_requirement + +from tests.utils.test_utils import ( TestDir, check_save_and_load, compare_datasets, compare_datasets_strict, ) -from .requirements import Requirements, mark_requirement - DUMMY_DATASET_DIR = osp.join(osp.dirname(__file__), "assets", "coco_dataset") diff --git a/tests/test_common_semantic_segmentation_format.py b/tests/test_common_semantic_segmentation_format.py index e390be9db7..95dade3fd5 100644 --- a/tests/test_common_semantic_segmentation_format.py +++ b/tests/test_common_semantic_segmentation_format.py @@ -13,10 +13,11 @@ CommonSemanticSegmentationImporter, make_categories, ) -from datumaro.util.test_utils import compare_datasets from .requirements import Requirements, mark_requirement +from tests.utils.test_utils import compare_datasets + DUMMY_DATASET_DIR = osp.join( osp.dirname(__file__), "assets", "common_semantic_segmentation_dataset", "dataset" ) diff --git a/tests/test_common_super_resolution_format.py b/tests/test_common_super_resolution_format.py index 2e4faf19f9..c30941cf44 100644 --- a/tests/test_common_super_resolution_format.py +++ b/tests/test_common_super_resolution_format.py @@ -9,10 +9,11 @@ from datumaro.components.extractor import DatasetItem from datumaro.components.media import Image from datumaro.plugins.common_super_resolution_format import CommonSuperResolutionImporter -from datumaro.util.test_utils import compare_datasets from .requirements import Requirements, mark_requirement +from tests.utils.test_utils import compare_datasets + DUMMY_DATASET_DIR = osp.join(osp.dirname(__file__), "assets", "common_super_resolution_dataset") diff --git a/tests/test_config.py b/tests/test_config.py index a41935a91b..8d8cd7c4bf 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -7,10 +7,11 @@ from datumaro.components.config import Config, DictConfig, SchemaBuilder from datumaro.components.errors import ImmutableObjectError -from datumaro.util.test_utils import TestDir from .requirements import Requirements, mark_requirement +from tests.utils.test_utils import TestDir + class ConfigTest(TestCase): @mark_requirement(Requirements.DATUM_GENERAL_REQ) diff --git a/tests/test_cvat_format.py b/tests/test_cvat_format.py index c7f14d4c2b..6cb7141b12 100644 --- a/tests/test_cvat_format.py +++ b/tests/test_cvat_format.py @@ -22,10 +22,11 @@ from datumaro.components.media import Image from datumaro.plugins.cvat_format.converter import CvatConverter from datumaro.plugins.cvat_format.extractor import CvatImporter -from datumaro.util.test_utils import TestDir, check_save_and_load, compare_datasets from .requirements import Requirements, mark_requirement +from tests.utils.test_utils import TestDir, check_save_and_load, compare_datasets + DUMMY_IMAGE_DATASET_DIR = osp.join(osp.dirname(__file__), "assets", "cvat_dataset", "for_images") DUMMY_VIDEO_DATASET_DIR = osp.join(osp.dirname(__file__), "assets", "cvat_dataset", "for_video") diff --git a/tests/test_dataset.py b/tests/test_dataset.py index 3f4f64ad2b..75b30e968c 100644 --- a/tests/test_dataset.py +++ b/tests/test_dataset.py @@ -52,10 +52,11 @@ from datumaro.components.launcher import Launcher from datumaro.components.media import Image, MediaElement, Video from datumaro.components.progress_reporting import NullProgressReporter -from datumaro.util.test_utils import TestDir, compare_datasets, compare_datasets_strict from .requirements import Requirements, mark_requirement +from tests.utils.test_utils import TestDir, compare_datasets, compare_datasets_strict + class DatasetTest(TestCase): @mark_requirement(Requirements.DATUM_GENERAL_REQ) diff --git a/tests/test_datumaro_format.py b/tests/test_datumaro_format.py index 667b14d1da..91611d9ef4 100644 --- a/tests/test_datumaro_format.py +++ b/tests/test_datumaro_format.py @@ -29,7 +29,10 @@ from datumaro.plugins.datumaro_format.extractor import DatumaroImporter from datumaro.util import parse_json_file from datumaro.util.mask_tools import generate_colormap -from datumaro.util.test_utils import ( + +from .requirements import Requirements, mark_requirement + +from tests.utils.test_utils import ( Dimensions, TestDir, check_save_and_load, @@ -37,8 +40,6 @@ compare_datasets_strict, ) -from .requirements import Requirements, mark_requirement - class DatumaroConverterTest(TestCase): def _test_save_and_load( diff --git a/tests/test_extractor_tfds.py b/tests/test_extractor_tfds.py index 7d84ecb1fc..bd4f3fcee6 100644 --- a/tests/test_extractor_tfds.py +++ b/tests/test_extractor_tfds.py @@ -10,9 +10,9 @@ from datumaro.components.extractor_tfds import AVAILABLE_TFDS_DATASETS, TFDS_EXTRACTOR_AVAILABLE from datumaro.components.media import Image, MediaElement from datumaro.util.image import decode_image, encode_image -from datumaro.util.test_utils import compare_datasets, mock_tfds_data from tests.requirements import Requirements, mark_requirement +from tests.utils.test_utils import compare_datasets, mock_tfds_data if TFDS_EXTRACTOR_AVAILABLE: import tensorflow_datasets as tfds diff --git a/tests/test_format_detection.py b/tests/test_format_detection.py index 92fc17bd8e..65cf25edb9 100644 --- a/tests/test_format_detection.py +++ b/tests/test_format_detection.py @@ -9,9 +9,9 @@ apply_format_detector, detect_dataset_format, ) -from datumaro.util.test_utils import TestDir from tests.requirements import Requirements, mark_requirement +from tests.utils.test_utils import TestDir class FormatDetectionTest(TestCase): diff --git a/tests/test_fractal_image_generator.py b/tests/test_fractal_image_generator.py index 03601c64a7..a14551f7b7 100644 --- a/tests/test_fractal_image_generator.py +++ b/tests/test_fractal_image_generator.py @@ -7,10 +7,11 @@ from datumaro.plugins.synthetic_data import FractalImageGenerator from datumaro.util.image import load_image -from datumaro.util.test_utils import TestDir from .requirements import Requirements, mark_requirement +from tests.utils.test_utils import TestDir + # TODO: update links @pytest.mark.xfail(reason="Cannot download the model file from the source") diff --git a/tests/test_icdar_format.py b/tests/test_icdar_format.py index d108604916..978da0d4d1 100644 --- a/tests/test_icdar_format.py +++ b/tests/test_icdar_format.py @@ -19,10 +19,11 @@ IcdarTextSegmentationImporter, IcdarWordRecognitionImporter, ) -from datumaro.util.test_utils import TestDir, check_save_and_load, compare_datasets from .requirements import Requirements, mark_requirement +from tests.utils.test_utils import TestDir, check_save_and_load, compare_datasets + DUMMY_DATASET_DIR = osp.join(osp.dirname(__file__), "assets", "icdar_dataset") diff --git a/tests/test_image.py b/tests/test_image.py index cf48b7c661..2f1f5b6d32 100644 --- a/tests/test_image.py +++ b/tests/test_image.py @@ -5,10 +5,11 @@ import numpy as np import datumaro.util.image as image_module -from datumaro.util.test_utils import TestDir from .requirements import Requirements, mark_requirement +from tests.utils.test_utils import TestDir + class ImageOperationsTest(TestCase): def setUp(self): diff --git a/tests/test_image_dir_format.py b/tests/test_image_dir_format.py index e642ab3a79..2908cb4da2 100644 --- a/tests/test_image_dir_format.py +++ b/tests/test_image_dir_format.py @@ -6,10 +6,11 @@ from datumaro.components.media import Image from datumaro.components.project import Dataset from datumaro.plugins.image_dir_format import ImageDirConverter -from datumaro.util.test_utils import TestDir, check_save_and_load from .requirements import Requirements, mark_requirement +from tests.utils.test_utils import TestDir, check_save_and_load + class ImageDirFormatTest(TestCase): @mark_requirement(Requirements.DATUM_GENERAL_REQ) diff --git a/tests/test_image_zip_format.py b/tests/test_image_zip_format.py index c209b883f5..2155b90baa 100644 --- a/tests/test_image_zip_format.py +++ b/tests/test_image_zip_format.py @@ -7,10 +7,11 @@ from datumaro.components.media import Image, save_image from datumaro.components.project import Dataset from datumaro.plugins.image_zip_format import ImageZipConverter, ImageZipPath -from datumaro.util.test_utils import TestDir, compare_datasets from .requirements import Requirements, mark_requirement +from tests.utils.test_utils import TestDir, compare_datasets + class ImageZipConverterTest(TestCase): @mark_requirement(Requirements.DATUM_267) diff --git a/tests/test_imagenet_format.py b/tests/test_imagenet_format.py index e488dc12c1..5471855e15 100644 --- a/tests/test_imagenet_format.py +++ b/tests/test_imagenet_format.py @@ -10,10 +10,11 @@ from datumaro.components.extractor import DatasetItem from datumaro.components.media import Image from datumaro.plugins.imagenet_format import ImagenetConverter, ImagenetImporter -from datumaro.util.test_utils import TestDir, compare_datasets, compare_datasets_strict from .requirements import Requirements, mark_requirement +from tests.utils.test_utils import TestDir, compare_datasets, compare_datasets_strict + class ImagenetFormatTest(TestCase): @mark_requirement(Requirements.DATUM_GENERAL_REQ) diff --git a/tests/test_imagenet_txt_format.py b/tests/test_imagenet_txt_format.py index a6e6cdc646..b736f90400 100644 --- a/tests/test_imagenet_txt_format.py +++ b/tests/test_imagenet_txt_format.py @@ -9,10 +9,11 @@ from datumaro.components.extractor import DatasetItem from datumaro.components.media import Image from datumaro.plugins.imagenet_txt_format import ImagenetTxtConverter, ImagenetTxtImporter -from datumaro.util.test_utils import TestDir, compare_datasets from .requirements import Requirements, mark_requirement +from tests.utils.test_utils import TestDir, compare_datasets + class ImagenetTxtFormatTest(TestCase): @mark_requirement(Requirements.DATUM_GENERAL_REQ) diff --git a/tests/test_images.py b/tests/test_images.py index dad29796d4..b3c71a6095 100644 --- a/tests/test_images.py +++ b/tests/test_images.py @@ -13,10 +13,11 @@ save_image_meta_file, ) from datumaro.util.image_cache import ImageCache -from datumaro.util.test_utils import TestDir from .requirements import Requirements, mark_requirement +from tests.utils.test_utils import TestDir + class ImageCacheTest(TestCase): @mark_requirement(Requirements.DATUM_GENERAL_REQ) diff --git a/tests/test_kinetics_format.py b/tests/test_kinetics_format.py index 7fc5b072e6..df617a6d57 100644 --- a/tests/test_kinetics_format.py +++ b/tests/test_kinetics_format.py @@ -2,7 +2,8 @@ from unittest import TestCase from datumaro.components.media import Video -from datumaro.util.test_utils import compare_datasets + +from tests.utils.test_utils import compare_datasets DUMMY_DATASET_DIR = osp.join(osp.dirname(__file__), "assets", "kinetics_dataset") diff --git a/tests/test_kitti_format.py b/tests/test_kitti_format.py index c1ee594598..4619e78ce9 100644 --- a/tests/test_kitti_format.py +++ b/tests/test_kitti_format.py @@ -25,10 +25,11 @@ KittiSegmentationImporter, ) from datumaro.util.meta_file_util import parse_meta_file -from datumaro.util.test_utils import TestDir, check_save_and_load, compare_datasets from .requirements import Requirements, mark_requirement +from tests.utils.test_utils import TestDir, check_save_and_load, compare_datasets + DUMMY_DATASET_DIR = osp.join(osp.dirname(__file__), "assets", "kitti_dataset") diff --git a/tests/test_kitti_raw_format.py b/tests/test_kitti_raw_format.py index f0a43defb9..94650521f4 100644 --- a/tests/test_kitti_raw_format.py +++ b/tests/test_kitti_raw_format.py @@ -10,9 +10,9 @@ from datumaro.components.project import Dataset from datumaro.plugins.kitti_raw_format.converter import KittiRawConverter from datumaro.plugins.kitti_raw_format.extractor import KittiRawImporter -from datumaro.util.test_utils import Dimensions, TestDir, check_save_and_load, compare_datasets_3d from tests.requirements import Requirements, mark_requirement +from tests.utils.test_utils import Dimensions, TestDir, check_save_and_load, compare_datasets_3d DUMMY_DATASET_DIR = osp.join(osp.dirname(__file__), "assets", "kitti_dataset", "kitti_raw") diff --git a/tests/test_labelme_format.py b/tests/test_labelme_format.py index a3f3f01059..3509209ff6 100644 --- a/tests/test_labelme_format.py +++ b/tests/test_labelme_format.py @@ -11,10 +11,11 @@ from datumaro.components.extractor import DatasetItem from datumaro.components.media import Image from datumaro.plugins.labelme_format import LabelMeConverter, LabelMeImporter -from datumaro.util.test_utils import TestDir, check_save_and_load, compare_datasets from .requirements import Requirements, mark_requirement +from tests.utils.test_utils import TestDir, check_save_and_load, compare_datasets + class LabelMeConverterTest(TestCase): def _test_save_and_load( diff --git a/tests/test_lfw_format.py b/tests/test_lfw_format.py index c9f492cc71..c2e70a6506 100644 --- a/tests/test_lfw_format.py +++ b/tests/test_lfw_format.py @@ -11,10 +11,11 @@ from datumaro.components.extractor import DatasetItem from datumaro.components.media import Image from datumaro.plugins.lfw_format import LfwConverter, LfwImporter -from datumaro.util.test_utils import TestDir, compare_datasets from .requirements import Requirements, mark_requirement +from tests.utils.test_utils import TestDir, compare_datasets + class LfwFormatTest(TestCase): @mark_requirement(Requirements.DATUM_GENERAL_REQ) diff --git a/tests/test_mapillary_vistas_format.py b/tests/test_mapillary_vistas_format.py index ea0d96d0df..bf11d04cad 100644 --- a/tests/test_mapillary_vistas_format.py +++ b/tests/test_mapillary_vistas_format.py @@ -17,10 +17,11 @@ MapillaryVistasLabelMaps, make_mapillary_instance_categories, ) -from datumaro.util.test_utils import TestDir, compare_datasets from .requirements import Requirements, mark_requirement +from tests.utils.test_utils import TestDir, compare_datasets + DUMMY_DATASET_V1_2 = osp.join(osp.dirname(__file__), "assets", "mapillary_vistas_dataset", "v1.2") DUMMY_DATASET_V2_0 = osp.join(osp.dirname(__file__), "assets", "mapillary_vistas_dataset", "v2.0") DUMMY_DATASET_WITH_META_FILE = osp.join( diff --git a/tests/test_market1501_format.py b/tests/test_market1501_format.py index f5d8d4bb1d..dc36612926 100644 --- a/tests/test_market1501_format.py +++ b/tests/test_market1501_format.py @@ -8,10 +8,11 @@ from datumaro.components.extractor import DatasetItem from datumaro.components.media import Image from datumaro.plugins.market1501_format import Market1501Converter, Market1501Importer -from datumaro.util.test_utils import TestDir, compare_datasets from .requirements import Requirements, mark_requirement +from tests.utils.test_utils import TestDir, compare_datasets + class Market1501FormatTest(TestCase): @mark_requirement(Requirements.DATUM_GENERAL_REQ) diff --git a/tests/test_mars_format.py b/tests/test_mars_format.py index 7ec2c68e46..664f306b1c 100644 --- a/tests/test_mars_format.py +++ b/tests/test_mars_format.py @@ -11,10 +11,10 @@ from datumaro.components.environment import Environment from datumaro.components.media import Image from datumaro.plugins.mars_format import MarsImporter -from datumaro.util.test_utils import compare_datasets from tests.conftest import ASSETS_DIR from tests.requirements import Requirements, mark_requirement +from tests.utils.test_utils import compare_datasets DUMMY_MARS_DATASET = str(ASSETS_DIR / "mars_dataset") diff --git a/tests/test_mnist_csv_format.py b/tests/test_mnist_csv_format.py index d8becd64dc..ebc4feeef9 100644 --- a/tests/test_mnist_csv_format.py +++ b/tests/test_mnist_csv_format.py @@ -9,10 +9,11 @@ from datumaro.components.extractor import DatasetItem from datumaro.components.media import Image from datumaro.plugins.mnist_csv_format import MnistCsvConverter, MnistCsvImporter -from datumaro.util.test_utils import TestDir, compare_datasets from .requirements import Requirements, mark_requirement +from tests.utils.test_utils import TestDir, compare_datasets + class MnistCsvFormatTest(TestCase): @mark_requirement(Requirements.DATUM_GENERAL_REQ) diff --git a/tests/test_mnist_format.py b/tests/test_mnist_format.py index 71208189e0..05e24c630d 100644 --- a/tests/test_mnist_format.py +++ b/tests/test_mnist_format.py @@ -9,10 +9,11 @@ from datumaro.components.extractor import DatasetItem from datumaro.components.media import Image from datumaro.plugins.mnist_format import MnistConverter, MnistImporter -from datumaro.util.test_utils import TestDir, compare_datasets from .requirements import Requirements, mark_requirement +from tests.utils.test_utils import TestDir, compare_datasets + class MnistFormatTest(TestCase): @mark_requirement(Requirements.DATUM_GENERAL_REQ) diff --git a/tests/test_mot_format.py b/tests/test_mot_format.py index d22d8f458c..f40b8f1f7c 100644 --- a/tests/test_mot_format.py +++ b/tests/test_mot_format.py @@ -10,10 +10,11 @@ from datumaro.components.extractor import DatasetItem from datumaro.components.media import Image from datumaro.plugins.mot_format import MotSeqGtConverter, MotSeqImporter -from datumaro.util.test_utils import TestDir, check_save_and_load, compare_datasets from .requirements import Requirements, mark_requirement +from tests.utils.test_utils import TestDir, check_save_and_load, compare_datasets + class MotConverterTest(TestCase): def _test_save_and_load( diff --git a/tests/test_mots_format.py b/tests/test_mots_format.py index 51f62c8916..91ba68f228 100644 --- a/tests/test_mots_format.py +++ b/tests/test_mots_format.py @@ -10,10 +10,11 @@ from datumaro.components.extractor import DatasetItem from datumaro.components.media import Image from datumaro.plugins.mots_format import MotsImporter, MotsPngConverter -from datumaro.util.test_utils import TestDir, check_save_and_load, compare_datasets from .requirements import Requirements, mark_requirement +from tests.utils.test_utils import TestDir, check_save_and_load, compare_datasets + DUMMY_DATASET_DIR = osp.join(osp.dirname(__file__), "assets", "mots_dataset") diff --git a/tests/test_mpii_format.py b/tests/test_mpii_format.py index 178ae2245d..4ae2329aa3 100644 --- a/tests/test_mpii_format.py +++ b/tests/test_mpii_format.py @@ -13,10 +13,11 @@ MPII_POINTS_LABELS, MpiiImporter, ) -from datumaro.util.test_utils import compare_datasets from .requirements import Requirements, mark_requirement +from tests.utils.test_utils import compare_datasets + DUMMY_DATASET_DIR = osp.join(osp.dirname(__file__), "assets", "mpii_dataset") diff --git a/tests/test_mpii_json_format.py b/tests/test_mpii_json_format.py index 02b2a17ad2..ba9adb7789 100644 --- a/tests/test_mpii_json_format.py +++ b/tests/test_mpii_json_format.py @@ -13,10 +13,11 @@ MPII_POINTS_LABELS, MpiiJsonImporter, ) -from datumaro.util.test_utils import compare_datasets from .requirements import Requirements, mark_requirement +from tests.utils.test_utils import compare_datasets + DUMMY_DATASET_DIR_WITH_NUMPY_FILES = osp.join( osp.dirname(__file__), "assets", "mpii_json_dataset", "dataset_with_numpy_files" ) diff --git a/tests/test_nyu_depth_v2_format.py b/tests/test_nyu_depth_v2_format.py index a9c9a2519d..7a51177c52 100644 --- a/tests/test_nyu_depth_v2_format.py +++ b/tests/test_nyu_depth_v2_format.py @@ -9,10 +9,11 @@ from datumaro.components.extractor import DatasetItem from datumaro.components.media import Image from datumaro.plugins.nyu_depth_v2_format import NyuDepthV2Importer -from datumaro.util.test_utils import compare_datasets from .requirements import Requirements, mark_requirement +from tests.utils.test_utils import compare_datasets + DUMMY_DATASET_DIR = osp.join(osp.dirname(__file__), "assets", "nyu_depth_v2_dataset") diff --git a/tests/test_open_images_format.py b/tests/test_open_images_format.py index 9194bc756e..9d5bf4edeb 100644 --- a/tests/test_open_images_format.py +++ b/tests/test_open_images_format.py @@ -15,10 +15,10 @@ from datumaro.components.extractor import DatasetItem from datumaro.components.media import Image from datumaro.plugins.open_images_format import OpenImagesConverter, OpenImagesImporter -from datumaro.util.test_utils import TestDir, compare_datasets from tests.conftest import ASSETS_DIR from tests.requirements import Requirements, mark_requirement +from tests.utils.test_utils import TestDir, compare_datasets class OpenImagesFormatTest(TestCase): diff --git a/tests/test_ops.py b/tests/test_ops.py index a63edfc983..ca06c2176c 100644 --- a/tests/test_ops.py +++ b/tests/test_ops.py @@ -31,10 +31,11 @@ match_segments, mean_std, ) -from datumaro.util.test_utils import compare_datasets from .requirements import Requirements, mark_requirement +from tests.utils.test_utils import compare_datasets + class TestOperations(TestCase): @mark_requirement(Requirements.DATUM_GENERAL_REQ) diff --git a/tests/test_project.py b/tests/test_project.py index 1bad28d4cc..cb8547eda9 100644 --- a/tests/test_project.py +++ b/tests/test_project.py @@ -30,10 +30,11 @@ from datumaro.components.media import Image from datumaro.components.project import DiffStatus, Project from datumaro.util.scope import scope_add, scoped -from datumaro.util.test_utils import TestDir, compare_datasets, compare_dirs from .requirements import Requirements, mark_requirement +from tests.utils.test_utils import TestDir, compare_datasets, compare_dirs + class ProjectTest(TestCase): @mark_requirement(Requirements.DATUM_GENERAL_REQ) diff --git a/tests/test_sampler.py b/tests/test_sampler.py index 8bb5c0bfc9..69f11c4f83 100644 --- a/tests/test_sampler.py +++ b/tests/test_sampler.py @@ -11,7 +11,8 @@ from datumaro.components.media import Image from datumaro.components.project import Dataset from datumaro.plugins.sampler.random_sampler import LabelRandomSampler, RandomSampler -from datumaro.util.test_utils import compare_datasets, compare_datasets_strict + +from tests.utils.test_utils import compare_datasets, compare_datasets_strict from .conftest import ASSETS_DIR diff --git a/tests/test_sly_pointcloud_format.py b/tests/test_sly_pointcloud_format.py index e84ddd8944..79025c87c5 100644 --- a/tests/test_sly_pointcloud_format.py +++ b/tests/test_sly_pointcloud_format.py @@ -10,10 +10,11 @@ from datumaro.components.project import Dataset from datumaro.plugins.sly_pointcloud_format.converter import SuperviselyPointCloudConverter from datumaro.plugins.sly_pointcloud_format.extractor import SuperviselyPointCloudImporter -from datumaro.util.test_utils import Dimensions, TestDir, check_save_and_load, compare_datasets_3d from .requirements import Requirements, mark_requirement +from tests.utils.test_utils import Dimensions, TestDir, check_save_and_load, compare_datasets_3d + DUMMY_DATASET_DIR = osp.join(osp.dirname(__file__), "assets", "sly_pointcloud_dataset") diff --git a/tests/test_synthia_format.py b/tests/test_synthia_format.py index 1018423a69..08c20ccef4 100644 --- a/tests/test_synthia_format.py +++ b/tests/test_synthia_format.py @@ -9,10 +9,11 @@ from datumaro.components.environment import Environment from datumaro.components.extractor import DatasetItem from datumaro.components.media import Image -from datumaro.util.test_utils import compare_datasets from .requirements import Requirements, mark_requirement +from tests.utils.test_utils import compare_datasets + DUMMY_LABELS_SEGM_DATASET_DIR = osp.join( osp.dirname(__file__), "assets", "synthia_dataset", "labels_segm_dataset" ) diff --git a/tests/test_tfrecord_format.py b/tests/test_tfrecord_format.py index d8c2bc8d71..f96b215c86 100644 --- a/tests/test_tfrecord_format.py +++ b/tests/test_tfrecord_format.py @@ -11,11 +11,12 @@ from datumaro.components.extractor import DatasetItem from datumaro.components.media import ByteImage, Image from datumaro.util.image import encode_image -from datumaro.util.test_utils import TestDir, check_save_and_load, compare_datasets from datumaro.util.tf_util import check_import from .requirements import Requirements, mark_requirement +from tests.utils.test_utils import TestDir, check_save_and_load, compare_datasets + try: from datumaro.plugins.tf_detection_api_format.converter import TfDetectionApiConverter from datumaro.plugins.tf_detection_api_format.extractor import ( diff --git a/tests/test_transforms.py b/tests/test_transforms.py index 7913d3865a..06366fc150 100644 --- a/tests/test_transforms.py +++ b/tests/test_transforms.py @@ -25,10 +25,11 @@ from datumaro.components.errors import DatumaroError from datumaro.components.extractor import DatasetItem from datumaro.components.media import Image -from datumaro.util.test_utils import compare_datasets from .requirements import Requirements, mark_bug, mark_requirement +from tests.utils.test_utils import compare_datasets + class TransformsTest(TestCase): @mark_requirement(Requirements.DATUM_GENERAL_REQ) diff --git a/tests/test_util.py b/tests/test_util.py index 648ec632de..e947e84bd4 100644 --- a/tests/test_util.py +++ b/tests/test_util.py @@ -6,10 +6,11 @@ from datumaro.util import is_method_redefined from datumaro.util.os_util import walk from datumaro.util.scope import Scope, on_error_do, on_exit_do, scoped -from datumaro.util.test_utils import TestDir from .requirements import Requirements, mark_requirement +from tests.utils.test_utils import TestDir + class TestException(Exception): pass diff --git a/tests/test_vgg_face2_format.py b/tests/test_vgg_face2_format.py index 4199208a1f..e487776ac9 100644 --- a/tests/test_vgg_face2_format.py +++ b/tests/test_vgg_face2_format.py @@ -9,10 +9,11 @@ from datumaro.components.extractor import DatasetItem from datumaro.components.media import Image from datumaro.plugins.vgg_face2_format import VggFace2Converter, VggFace2Importer -from datumaro.util.test_utils import TestDir, compare_datasets from .requirements import Requirements, mark_requirement +from tests.utils.test_utils import TestDir, compare_datasets + class VggFace2FormatTest(TestCase): @mark_requirement(Requirements.DATUM_GENERAL_REQ) diff --git a/tests/test_video.py b/tests/test_video.py index 24ce08de28..56757b60d9 100644 --- a/tests/test_video.py +++ b/tests/test_video.py @@ -11,10 +11,11 @@ from datumaro.components.media_manager import MediaManager from datumaro.components.project import Project from datumaro.util.scope import Scope, on_exit_do, scope_add, scoped -from datumaro.util.test_utils import TestDir, compare_datasets from .requirements import Requirements, mark_requirement +from tests.utils.test_utils import TestDir, compare_datasets + @scoped def make_sample_video(path, frames=4, frame_size=(10, 20), fps=25.0): diff --git a/tests/test_voc_format.py b/tests/test_voc_format.py index 0c738f4c32..19b33a51b3 100644 --- a/tests/test_voc_format.py +++ b/tests/test_voc_format.py @@ -40,15 +40,16 @@ from datumaro.plugins.voc_format.importer import VocImporter from datumaro.util.image import save_image from datumaro.util.mask_tools import load_mask -from datumaro.util.test_utils import ( + +from .requirements import Requirements, mark_requirement + +from tests.utils.test_utils import ( TestDir, check_save_and_load, compare_datasets, compare_datasets_strict, ) -from .requirements import Requirements, mark_requirement - class VocFormatTest(TestCase): @mark_requirement(Requirements.DATUM_GENERAL_REQ) diff --git a/tests/test_vott_csv_format.py b/tests/test_vott_csv_format.py index 5a5aa9349d..5e70b09aac 100644 --- a/tests/test_vott_csv_format.py +++ b/tests/test_vott_csv_format.py @@ -9,10 +9,11 @@ from datumaro.components.extractor import DatasetItem from datumaro.components.media import Image from datumaro.plugins.vott_csv_format import VottCsvImporter -from datumaro.util.test_utils import compare_datasets from .requirements import Requirements, mark_requirement +from tests.utils.test_utils import compare_datasets + DUMMY_DATASET_DIR = osp.join(osp.dirname(__file__), "assets", "vott_csv_dataset", "dataset") DUMMY_DATASET_DIR_WITH_META_FILE = osp.join( osp.dirname(__file__), "assets", "vott_csv_dataset", "dataset_with_meta_file" diff --git a/tests/test_vott_json_format.py b/tests/test_vott_json_format.py index 7ad29ef574..bc98c5d3f0 100644 --- a/tests/test_vott_json_format.py +++ b/tests/test_vott_json_format.py @@ -9,10 +9,11 @@ from datumaro.components.extractor import DatasetItem from datumaro.components.media import Image from datumaro.plugins.vott_json_format import VottJsonImporter -from datumaro.util.test_utils import compare_datasets from .requirements import Requirements, mark_requirement +from tests.utils.test_utils import compare_datasets + DUMMY_DATASET_DIR = osp.join(osp.dirname(__file__), "assets", "vott_json_dataset", "dataset") DUMMY_DATASET_DIR_WITH_META_FILE = osp.join( osp.dirname(__file__), "assets", "vott_json_dataset", "dataset_with_meta_file" diff --git a/tests/test_widerface_format.py b/tests/test_widerface_format.py index 926985579f..08d94a0fe8 100644 --- a/tests/test_widerface_format.py +++ b/tests/test_widerface_format.py @@ -10,10 +10,11 @@ from datumaro.components.extractor import DatasetItem from datumaro.components.media import Image from datumaro.plugins.widerface_format import WiderFaceConverter, WiderFaceImporter -from datumaro.util.test_utils import IGNORE_ALL, TestDir, compare_datasets from .requirements import Requirements, mark_requirement +from tests.utils.test_utils import IGNORE_ALL, TestDir, compare_datasets + class WiderFaceFormatTest(TestCase): @mark_requirement(Requirements.DATUM_GENERAL_REQ) diff --git a/tests/unit/data_formats/test_yolo_format.py b/tests/unit/data_formats/test_yolo_format.py index 18e6c14b62..beaf89facc 100644 --- a/tests/unit/data_formats/test_yolo_format.py +++ b/tests/unit/data_formats/test_yolo_format.py @@ -60,11 +60,12 @@ YOLOv8SegmentationImporter, ) from datumaro.util.image import save_image -from datumaro.util.test_utils import compare_datasets, compare_datasets_strict from ...requirements import Requirements, mark_requirement from ...utils.assets import get_test_asset_path +from tests.utils.test_utils import compare_datasets, compare_datasets_strict + @pytest.fixture(autouse=True) def seed_random(): diff --git a/tests/utils/__init__.py b/tests/utils/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/datumaro/util/test_utils.py b/tests/utils/test_utils.py similarity index 100% rename from datumaro/util/test_utils.py rename to tests/utils/test_utils.py From 3a566c41205ee450ca61dddf624861f30bd4989c Mon Sep 17 00:00:00 2001 From: Dmitrii Lavrukhin Date: Mon, 5 Aug 2024 16:15:47 +0400 Subject: [PATCH 3/3] moving current_function_name to datumaro/util --- datumaro/util/__init__.py | 6 +++++- tests/test_sampler.py | 4 ++-- tests/utils/test_utils.py | 7 +------ 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/datumaro/util/__init__.py b/datumaro/util/__init__.py index a7181ac1c4..a47a995076 100644 --- a/datumaro/util/__init__.py +++ b/datumaro/util/__init__.py @@ -2,7 +2,7 @@ # Copyright (C) 2022 CVAT.ai Corporation # # SPDX-License-Identifier: MIT - +import inspect from functools import wraps from inspect import isclass from itertools import islice @@ -195,3 +195,7 @@ def dump_json_file( append_newline=append_newline, ) ) + + +def current_function_name(depth=1): + return inspect.getouterframes(inspect.currentframe())[depth].function diff --git a/tests/test_sampler.py b/tests/test_sampler.py index 69f11c4f83..1dac374f90 100644 --- a/tests/test_sampler.py +++ b/tests/test_sampler.py @@ -12,10 +12,10 @@ from datumaro.components.project import Dataset from datumaro.plugins.sampler.random_sampler import LabelRandomSampler, RandomSampler -from tests.utils.test_utils import compare_datasets, compare_datasets_strict - from .conftest import ASSETS_DIR +from tests.utils.test_utils import compare_datasets, compare_datasets_strict + try: import pandas as pd diff --git a/tests/utils/test_utils.py b/tests/utils/test_utils.py index 04ab48da97..d77d2120a4 100644 --- a/tests/utils/test_utils.py +++ b/tests/utils/test_utils.py @@ -3,7 +3,6 @@ # SPDX-License-Identifier: MIT import contextlib -import inspect import os import os.path as osp import tempfile @@ -20,7 +19,7 @@ from datumaro.components.annotation import AnnotationType from datumaro.components.dataset import Dataset, IDataset from datumaro.components.media import Image, MultiframeImage, PointCloud -from datumaro.util import filter_dict, find +from datumaro.util import current_function_name, filter_dict, find from datumaro.util.os_util import rmfile, rmtree @@ -29,10 +28,6 @@ class Dimensions(Enum): dim_3d = auto() -def current_function_name(depth=1): - return inspect.getouterframes(inspect.currentframe())[depth].function - - class FileRemover: def __init__(self, path, is_dir=False): self.path = path