syncing with upstream a bit (#65)

* using get_test_asset_path everywhere in tests

* moving cli to integration/cli

* moving most tests to unit

* pylint fixes

* moving make_sample_video to tests/utils/video.py

* removing ASSETS_DIR var

tests/conftest.py

@@ -2,13 +2,10 @@
 # Copyright (C) 2022-2024 CVAT.ai Corporation
 #
 # SPDX-License-Identifier: MIT
-from pathlib import Path
 
 from .fixtures import *
 from .utils.test_utils import TestCaseHelper, TestDir
 
-ASSETS_DIR = Path(__file__).parent / "assets"
-
 
 def pytest_configure(config):
     # register additional markers

tests/cli/test_diff.py → tests/integration/cli/test_compare.py

@@ -23,8 +23,7 @@
 from datumaro.components.operations import DistanceComparator
 from datumaro.components.project import Dataset
 
-from ..requirements import Requirements, mark_requirement
-
+from tests.requirements import Requirements, mark_requirement
 from tests.utils.test_utils import TestDir
 from tests.utils.test_utils import run_datum as run
 

tests/cli/test_describe_downloads.py → tests/integration/cli/test_describe_downloads.py

@@ -7,8 +7,7 @@
 from datumaro.components.extractor_tfds import AVAILABLE_TFDS_DATASETS, TFDS_EXTRACTOR_AVAILABLE
 from datumaro.util import parse_json
 
-from ..requirements import Requirements, mark_requirement
-
+from tests.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
 

tests/cli/test_detect_format.py → tests/integration/cli/test_detect_format.py

@@ -13,12 +13,13 @@
 from datumaro.util.os_util import suppress_output
 
 from tests.requirements import Requirements, mark_requirement
+from tests.utils.assets import get_test_asset_path
 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")
-LFW_DIR = osp.join(osp.dirname(__file__), "../assets/lfw_dataset")
+ADE20K2017_DIR = get_test_asset_path("ade20k2017_dataset", "dataset")
+ADE20K2020_DIR = get_test_asset_path("ade20k2020_dataset", "dataset")
+LFW_DIR = get_test_asset_path("lfw_dataset")
 
 
 class DetectFormatTest(TestCase):

tests/cli/test_download.py → tests/integration/cli/test_download.py

@@ -5,8 +5,7 @@
 from datumaro.components.dataset import Dataset
 from datumaro.components.extractor_tfds import AVAILABLE_TFDS_DATASETS, TFDS_EXTRACTOR_AVAILABLE
 
-from ..requirements import Requirements, mark_requirement
-
+from tests.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
 

tests/cli/test_filter.py → tests/integration/cli/test_filter.py

@@ -8,8 +8,7 @@
 from datumaro.components.project import Project
 from datumaro.util.scope import scope_add, scoped
 
-from ..requirements import Requirements, mark_requirement
-
+from tests.requirements import Requirements, mark_requirement
 from tests.utils.test_utils import TestDir, compare_datasets
 from tests.utils.test_utils import run_datum as run
 

tests/cli/test_generator.py → tests/integration/cli/test_generator.py

@@ -6,8 +6,7 @@
 
 import datumaro.util.image as image_module
 
-from ..requirements import Requirements, mark_requirement
-
+from tests.requirements import Requirements, mark_requirement
 from tests.utils.test_utils import TestDir
 from tests.utils.test_utils import run_datum as run
 

tests/cli/test_image_zip_format.py → tests/integration/cli/test_image_zip_format.py

@@ -8,8 +8,7 @@
 from datumaro.components.dataset import Dataset, DatasetItem
 from datumaro.components.media import Image
 
-from ..requirements import Requirements, mark_requirement
-
+from tests.requirements import Requirements, mark_requirement
 from tests.utils.test_utils import TestDir, compare_datasets
 from tests.utils.test_utils import run_datum as run
 

tests/cli/test_info.py → tests/integration/cli/test_info.py

@@ -10,8 +10,7 @@
 
 from datumaro.util import parse_json
 
-from ..requirements import Requirements, mark_requirement
-
+from tests.requirements import Requirements, mark_requirement
 from tests.utils.test_utils import run_datum
 
 DUMMY_DATASET_DIR = osp.join(

tests/cli/test_kitti_raw_format.py → tests/integration/cli/test_kitti_raw_format.py

@@ -6,8 +6,7 @@
 from datumaro.components.extractor import DatasetItem
 from datumaro.components.media import Image, PointCloud
 
-from ..requirements import Requirements, mark_requirement
-
+from tests.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
 

tests/cli/test_merge.py → tests/integration/cli/test_merge.py

@@ -9,8 +9,7 @@
 from datumaro.components.media import Image
 from datumaro.components.project import Dataset, Project
 
-from ..requirements import Requirements, mark_requirement
-
+from tests.requirements import Requirements, mark_requirement
 from tests.utils.test_utils import TestDir, compare_datasets
 from tests.utils.test_utils import run_datum as run
 

tests/cli/test_patch.py → tests/integration/cli/test_patch.py

@@ -9,8 +9,7 @@
 from datumaro.components.media import Image
 from datumaro.components.project import Dataset, Project
 
-from ..requirements import Requirements, mark_requirement
-
+from tests.requirements import Requirements, mark_requirement
 from tests.utils.test_utils import TestDir, compare_datasets
 from tests.utils.test_utils import run_datum as run
 

tests/cli/test_project.py → tests/integration/cli/test_project.py

@@ -11,8 +11,7 @@
 from datumaro.components.project import Project
 from datumaro.util.scope import scope_add, scoped
 
-from ..requirements import Requirements, mark_requirement
-
+from tests.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
 

tests/cli/test_revpath.py → tests/integration/cli/test_revpath.py

@@ -14,9 +14,8 @@
 from datumaro.components.project import Project
 from datumaro.util.scope import scope_add, scoped
 
-from ..conftest import ASSETS_DIR
-from ..requirements import Requirements, mark_requirement
-
+from tests.requirements import Requirements, mark_requirement
+from tests.utils.assets import get_test_asset_path
 from tests.utils.test_utils import TestDir
 
 
@@ -140,7 +139,7 @@ def test_ambiguous_format(self):
             ("ade20k2017_dataset", "1_atr.txt"),
             ("ade20k2020_dataset", "1.json"),
         ):
-            asset = ASSETS_DIR / root / "dataset" / "training" / "street" / asset_name
+            asset = get_test_asset_path(root, "dataset", "training", "street", asset_name)
             shutil.copy(asset, annotation_dir)
 
         with self.subTest("no context"):

tests/cli/test_sly_point_cloud_format.py → tests/integration/cli/test_sly_point_cloud_format.py

@@ -6,8 +6,7 @@
 from datumaro.components.extractor import DatasetItem
 from datumaro.components.media import Image, PointCloud
 
-from ..requirements import Requirements, mark_requirement
-
+from tests.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
 

tests/cli/test_transform.py → tests/integration/cli/test_transform.py

@@ -8,8 +8,7 @@
 from datumaro.components.project import Project
 from datumaro.util.scope import scope_add, scoped
 
-from ..requirements import Requirements, mark_requirement
-
+from tests.requirements import Requirements, mark_requirement
 from tests.utils.test_utils import TestDir, compare_datasets
 from tests.utils.test_utils import run_datum as run
 

tests/cli/test_utils.py → tests/integration/cli/test_utils.py

@@ -5,11 +5,10 @@
 from datumaro.components.media_manager import MediaManager
 from datumaro.util.scope import on_exit_do, scope_add, scoped
 
-from ..requirements import Requirements, mark_requirement
-from ..test_video import make_sample_video  # pylint: disable=unused-import
-
+from tests.requirements import Requirements, mark_requirement
 from tests.utils.test_utils import TestDir
 from tests.utils.test_utils import run_datum as run
+from tests.utils.video import make_sample_video
 
 
 class VideoSplittingTest:

tests/cli/test_video.py → tests/integration/cli/test_video.py

@@ -2,11 +2,10 @@
 import os.path as osp
 from unittest import TestCase
 
-from ..requirements import Requirements, mark_requirement
-
-from tests.test_video import make_sample_video
+from tests.requirements import Requirements, mark_requirement
 from tests.utils.test_utils import TestDir
 from tests.utils.test_utils import run_datum as run
+from tests.utils.video import make_sample_video
 
 
 class VideoTest(TestCase):

tests/cli/test_voc_format.py → tests/integration/cli/test_voc_format.py

@@ -9,8 +9,7 @@
 from datumaro.components.dataset import Dataset, DatasetItem
 from datumaro.components.media import Image
 
-from ..requirements import Requirements, mark_requirement
-
+from tests.requirements import Requirements, mark_requirement
 from tests.utils.test_utils import TestDir, compare_datasets
 from tests.utils.test_utils import run_datum as run
 

tests/cli/test_yolo_format.py → tests/integration/cli/test_yolo_format.py

@@ -9,8 +9,7 @@
 from datumaro.components.extractor import DatasetItem
 from datumaro.components.media import Image
 
-from ..requirements import Requirements, mark_requirement
-
+from tests.requirements import Requirements, mark_requirement
 from tests.utils.test_utils import TestDir, compare_datasets
 from tests.utils.test_utils import run_datum as run
 

tests/test_RISE.py → tests/unit/algorithms/test_RISE.py

@@ -7,7 +7,7 @@
 from datumaro.components.annotation import Bbox, Label
 from datumaro.components.launcher import Launcher
 
-from .requirements import Requirements, mark_requirement
+from tests.requirements import Requirements, mark_requirement
 
 
 class RiseTest(TestCase):

tests/test_datumaro_format.py → tests/unit/data_formats/datumaro/test_datumaro_format.py

@@ -30,8 +30,8 @@
 from datumaro.util import parse_json_file
 from datumaro.util.mask_tools import generate_colormap
 
-from .requirements import Requirements, mark_requirement
-
+from tests.requirements import Requirements, mark_requirement
+from tests.utils.assets import get_test_asset_path
 from tests.utils.test_utils import (
     Dimensions,
     TestDir,
@@ -203,7 +203,7 @@ def test_can_save_and_load_with_no_save_media(self):
 
     @mark_requirement(Requirements.DATUM_GENERAL_REQ)
     def test_can_import_pcd_dataset(self):
-        dataset_path = str(Path(__file__).parent / "assets" / "datumaro_dataset" / "with_pcd")
+        dataset_path = get_test_asset_path("datumaro_dataset", "with_pcd")
 
         label_categories = LabelCategories(attributes={"occluded"})
         label_categories.add("cat")
@@ -254,7 +254,7 @@ def test_can_import_pcd_dataset(self):
 
     @mark_requirement(Requirements.DATUM_GENERAL_REQ)
     def test_can_import_skeleton_dataset(self):
-        dataset_path = str(Path(__file__).parent / "assets" / "datumaro_dataset" / "with_skeleton")
+        dataset_path = get_test_asset_path("datumaro_dataset", "with_skeleton")
 
         label_categories = LabelCategories.from_iterable(
             [

tests/test_common_semantic_segmentation_format.py → tests/unit/data_formats/test_common_semantic_segmentation_format.py

@@ -1,4 +1,3 @@
-import os.path as osp
 from collections import OrderedDict
 from unittest import TestCase
 
@@ -14,17 +13,13 @@
     make_categories,
 )
 
-from .requirements import Requirements, mark_requirement
-
+from tests.requirements import Requirements, mark_requirement
+from tests.utils.assets import get_test_asset_path
 from tests.utils.test_utils import compare_datasets
 
-DUMMY_DATASET_DIR = osp.join(
-    osp.dirname(__file__), "assets", "common_semantic_segmentation_dataset", "dataset"
-)
+DUMMY_DATASET_DIR = get_test_asset_path("common_semantic_segmentation_dataset", "dataset")
 
-DUMMY_NON_STANDARD_DATASET_DIR = osp.join(
-    osp.dirname(__file__),
-    "assets",
+DUMMY_NON_STANDARD_DATASET_DIR = get_test_asset_path(
     "common_semantic_segmentation_dataset",
     "non_standard_dataset",
 )

tests/test_mapillary_vistas_format.py → tests/unit/data_formats/test_mapillary_vistas_format.py

@@ -18,14 +18,14 @@
     make_mapillary_instance_categories,
 )
 
-from .requirements import Requirements, mark_requirement
-
+from tests.requirements import Requirements, mark_requirement
+from tests.utils.assets import get_test_asset_path
 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(
-    osp.dirname(__file__), "assets", "mapillary_vistas_dataset", "dataset_with_meta_file"
+DUMMY_DATASET_V1_2 = get_test_asset_path("mapillary_vistas_dataset", "v1.2")
+DUMMY_DATASET_V2_0 = get_test_asset_path("mapillary_vistas_dataset", "v2.0")
+DUMMY_DATASET_WITH_META_FILE = get_test_asset_path(
+    "mapillary_vistas_dataset", "dataset_with_meta_file"
 )
 
 

tests/test_synthia_format.py → tests/unit/data_formats/test_synthia_format.py

@@ -1,4 +1,3 @@
-import os.path as osp
 from unittest import TestCase
 
 import numpy as np
@@ -10,25 +9,19 @@
 from datumaro.components.extractor import DatasetItem
 from datumaro.components.media import Image
 
-from .requirements import Requirements, mark_requirement
-
+from tests.requirements import Requirements, mark_requirement
+from tests.utils.assets import get_test_asset_path
 from tests.utils.test_utils import compare_datasets
 
-DUMMY_LABELS_SEGM_DATASET_DIR = osp.join(
-    osp.dirname(__file__), "assets", "synthia_dataset", "labels_segm_dataset"
-)
+DUMMY_LABELS_SEGM_DATASET_DIR = get_test_asset_path("synthia_dataset", "labels_segm_dataset")
 
-DUMMY_COLOR_SEGM_DATASET_DIR = osp.join(
-    osp.dirname(__file__), "assets", "synthia_dataset", "color_segm_dataset"
-)
+DUMMY_COLOR_SEGM_DATASET_DIR = get_test_asset_path("synthia_dataset", "color_segm_dataset")
 
-DUMMY_DATASET_DIR_CUSTOM_LABELMAP = osp.join(
-    osp.dirname(__file__), "assets", "synthia_dataset", "dataset_with_custom_labelmap"
+DUMMY_DATASET_DIR_CUSTOM_LABELMAP = get_test_asset_path(
+    "synthia_dataset", "dataset_with_custom_labelmap"
 )
 
-DUMMY_DATASET_DIR_META_FILE = osp.join(
-    osp.dirname(__file__), "assets", "synthia_dataset", "dataset_with_meta_file"
-)
+DUMMY_DATASET_DIR_META_FILE = get_test_asset_path("synthia_dataset", "dataset_with_meta_file")
 
 
 class SynthiaImporterTest(TestCase):

tests/unit/data_formats/test_yolo_format.py

@@ -65,9 +65,8 @@
 )
 from datumaro.util.image import save_image
 
-from ...requirements import Requirements, mark_requirement
-from ...utils.assets import get_test_asset_path
-
+from tests.requirements import Requirements, mark_requirement
+from tests.utils.assets import get_test_asset_path
 from tests.utils.test_utils import compare_annotations, compare_datasets, compare_datasets_strict
 
 

tests/test_ade20k2017_format.py → tests/unit/test_ade20k2017_format.py

@@ -2,7 +2,6 @@
 #
 # SPDX-License-Identifier: MIT
 
-import os.path as osp
 from unittest.case import TestCase
 
 import numpy as np
@@ -14,13 +13,12 @@
 from datumaro.plugins.ade20k2017_format import Ade20k2017Importer
 
 from tests.requirements import Requirements, mark_requirement
+from tests.utils.assets import get_test_asset_path
 from tests.utils.test_utils import compare_datasets
 
-DUMMY_DATASET_DIR = osp.join(osp.dirname(__file__), "assets", "ade20k2017_dataset", "dataset")
+DUMMY_DATASET_DIR = get_test_asset_path("ade20k2017_dataset", "dataset")
 
-DUMMY_DATASET_DIR_META_FILE = osp.join(
-    osp.dirname(__file__), "assets", "ade20k2017_dataset", "dataset_with_meta_file"
-)
+DUMMY_DATASET_DIR_META_FILE = get_test_asset_path("ade20k2017_dataset", "dataset_with_meta_file")
 
 
 class Ade20k2017ImporterTest(TestCase):