From 1874a9cd994714958fa79ade68cc7b80fc75a612 Mon Sep 17 00:00:00 2001
From: Ilya Trushkin <ilya.trushkin@intel.com>
Date: Mon, 29 Jul 2024 17:21:32 +0900
Subject: [PATCH] Add test

Signed-off-by: Ilya Trushkin <ilya.trushkin@intel.com>
---
 tests/assets/image_dir_dataset/1.jpg | Bin 0 -> 631 bytes
 tests/assets/image_dir_dataset/2.jpg | Bin 0 -> 631 bytes
 tests/unit/test_image_dir_format.py  |  43 +++++++++++++++++++--------
 3 files changed, 31 insertions(+), 12 deletions(-)
 create mode 100644 tests/assets/image_dir_dataset/1.jpg
 create mode 100644 tests/assets/image_dir_dataset/2.jpg

diff --git a/tests/assets/image_dir_dataset/1.jpg b/tests/assets/image_dir_dataset/1.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..ee889d22692144aa0004b545eb7c097f101aa3de
GIT binary patch
literal 631
zcmex=<NpH&0WUXCHwH#V1_nkTWcYuZ!I^=Bjg6g+m4ls~os*M;i${c)hnt&6Qb?Fz
zL{>^(PF6}rMnOeST|r4lSw=>~TvNxu(8R<<Uft5x!pKI?*u)5A2qPyaCl5D|1TU|I
zk)n*E5y{~H0R}-11}+9JW=16jCP7AKLB{__803NOWMu>c1}I=;VrF4wW9Q)H;sz?%
zD!{<R$jr>d!pzFb!U9xX3zTPI5o8roG<0MW4oqZMDikqloVbuf*=gfJ(V&YTRE(2~
znmD<{#3dx9RMpfqG__1j&CD$<t(;w4-P}Dqy@EqR!@?sXqmoln)6z3Cvx-Yf%gQS%
ztD0L{+uA!iyCzMZGIiSY88c@sTD)ZGvgIpQuG+MD%hqk%ckJAC=<t!F$Bv&kdFs;T
zD_5^wzj5={!$*&wJbm{3#miS8KYjl4_1pI!KYxMz#mK-6@fMJTcnr;7f<S*Uv9K_+
zu!H=?$W#u*%z`YeiiT`Lj)Clng~CckjT|CQ6Blkg$f;}`^g%SK=pvVxipfLOk07ss
meMX$en#l4Q++zrT-D2QjW&}navmk>#!v`*nMGf}<Zvp@U-_4!?

literal 0
HcmV?d00001

diff --git a/tests/assets/image_dir_dataset/2.jpg b/tests/assets/image_dir_dataset/2.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..222682d80bf9740d8eb672035ae34a240f949592
GIT binary patch
literal 631
zcmex=<NpH&0WUXCHwH#V1_nkTWcYuZ!I^=Bjg6g+m4ls~os*M;i${c)hnt&6Qb?Fz
zL{>^(PF6}rMnOeST|r4lSw=>~TvNxu(8R<<Uft5x!pKI?*u)5A2qPyaCl5D|1TU|I
zk)n*E5y{~H0R}-1237_xW=16jCP7AKLB{__803NOWMu>c1}I=;VrF4wW9Q)H;sz?%
zD!{<R$jr>d!pzFb!U9xX3zTPI5o8roG<0MW4oqZMDikqloVbuf*=gfJ(V&YTRE(2~
znmD<{#3dx9RMpfqG__1j&CD$<t(;w4-P}Dqy@EqR!@?sXqmoln)6z3Cvx-Yf%gQS%
ztD0L{+uA!iyCzMZGIiSY88c@sTD)ZGvgIpQuG+MD%hqk%ckJAC=<t!F$Bv&kdFs;T
zD_5^wzj5={!$*&wJbm{3#miS8KYjl4_1pI!KYxMz#mK-6@fMJTcnr;7f<S*Uv9K_+
zu!H=?$W#u*%z`YeiiT`Lj)Clng~CckjT|CQ6Blkg$f;}`^g%SK=pvVxipfLOk07ss
meMX$en#l4Q++zrT-D2QjW&}navmk>#!v`*nMGf}<Zvp`MvCWwP

literal 0
HcmV?d00001

diff --git a/tests/unit/test_image_dir_format.py b/tests/unit/test_image_dir_format.py
index 7389ebab36..b3d72766c8 100644
--- a/tests/unit/test_image_dir_format.py
+++ b/tests/unit/test_image_dir_format.py
@@ -1,7 +1,7 @@
-from unittest import TestCase
-
 import numpy as np
+import pytest
 
+from datumaro.components.dataset import Dataset, StreamDataset
 from datumaro.components.dataset_base import DatasetItem
 from datumaro.components.media import Image
 from datumaro.components.project import Dataset
@@ -9,12 +9,16 @@
 
 from ..requirements import Requirements, mark_requirement
 
-from tests.utils.test_utils import TestDir, check_save_and_load
+from tests.utils.assets import get_test_asset_path
+from tests.utils.test_utils import TestDir, check_save_and_load, compare_datasets
+
+DUMMY_DATASET_DIR = get_test_asset_path("image_dir_dataset")
+FORMAT_NAME = "image_dir"
 
 
-class ImageDirFormatTest(TestCase):
+class ImageDirFormatTest:
     @mark_requirement(Requirements.DATUM_GENERAL_REQ)
-    def test_can_load(self):
+    def test_can_load(self, helper_tc):
         dataset = Dataset.from_iterable(
             [
                 DatasetItem(id=1, media=Image.from_numpy(data=np.ones((10, 6, 3)))),
@@ -24,16 +28,31 @@ def test_can_load(self):
 
         with TestDir() as test_dir:
             check_save_and_load(
-                self,
+                helper_tc,
                 dataset,
                 ImageDirExporter.convert,
                 test_dir,
-                importer="image_dir",
+                importer=FORMAT_NAME,
                 require_media=True,
             )
 
     @mark_requirement(Requirements.DATUM_GENERAL_REQ)
-    def test_can_save_dataset_with_cyrillic_and_spaces_in_filename(self):
+    @pytest.mark.parametrize("dataset_cls, is_stream", [(Dataset, False), (StreamDataset, True)])
+    def test_can_import(self, dataset_cls, is_stream, helper_tc):
+        expected_dataset = Dataset.from_iterable(
+            [
+                DatasetItem(id="1", media=Image.from_numpy(data=np.zeros((4, 3, 3)), ext=".JPEG")),
+                DatasetItem(id="2", media=Image.from_numpy(data=np.zeros((3, 4, 3)), ext=".bmp")),
+            ]
+        )
+
+        actual_dataset = dataset_cls.import_from(DUMMY_DATASET_DIR, FORMAT_NAME)
+
+        assert actual_dataset.is_stream == is_stream
+        compare_datasets(helper_tc, expected_dataset, actual_dataset)
+
+    @mark_requirement(Requirements.DATUM_GENERAL_REQ)
+    def test_can_save_dataset_with_cyrillic_and_spaces_in_filename(self, helper_tc):
         dataset = Dataset.from_iterable(
             [
                 DatasetItem(
@@ -44,11 +63,11 @@ def test_can_save_dataset_with_cyrillic_and_spaces_in_filename(self):
 
         with TestDir() as test_dir:
             check_save_and_load(
-                self, dataset, ImageDirExporter.convert, test_dir, importer="image_dir"
+                helper_tc, dataset, ImageDirExporter.convert, test_dir, importer=FORMAT_NAME
             )
 
     @mark_requirement(Requirements.DATUM_GENERAL_REQ)
-    def test_can_save_and_load_image_with_arbitrary_extension(self):
+    def test_can_save_and_load_image_with_arbitrary_extension(self, helper_tc):
         dataset = Dataset.from_iterable(
             [
                 DatasetItem(id="1", media=Image.from_numpy(data=np.zeros((4, 3, 3)), ext=".JPEG")),
@@ -58,10 +77,10 @@ def test_can_save_and_load_image_with_arbitrary_extension(self):
 
         with TestDir() as test_dir:
             check_save_and_load(
-                self,
+                helper_tc,
                 dataset,
                 ImageDirExporter.convert,
                 test_dir,
-                importer="image_dir",
+                importer=FORMAT_NAME,
                 require_media=True,
             )