Refactor test cases

Signed-off-by: Songki Choi <songki.choi@intel.com>

tests/integration/cli/anomaly/test_anomaly_classification.py

@@ -7,7 +7,7 @@
 
 import pytest
 
-from otx.api.entities.model_template import parse_model_template, ModelCategory, ModelStatus
+from otx.api.entities.model_template import parse_model_template
 from otx.cli.registry import Registry
 from tests.test_suite.e2e_test_system import e2e_pytest_component
 from tests.test_suite.run_test_command import (
@@ -18,6 +18,7 @@
     otx_eval_testing,
     otx_export_testing,
     otx_train_testing,
+    BaseTestModelTemplates,
 )
 
 args = {
@@ -34,36 +35,18 @@
 templates_ids = [template.model_template_id for template in templates]
 
 
-class TestAnomalyClassificationModelTemplates:
+class TestAnomalyClassificationModelTemplates(BaseTestModelTemplates):
     @e2e_pytest_component
     def test_model_category(self):
-        stat = {
-            ModelCategory.SPEED: 0,
-            ModelCategory.BALANCE: 0,
-            ModelCategory.ACCURACY: 0,
-            ModelCategory.OTHER: 0,
-        }
-        for template in templates:
-            stat[template.model_category] += 1
-        assert stat[ModelCategory.SPEED] == 1
-        assert stat[ModelCategory.BALANCE] <= 1
-        assert stat[ModelCategory.ACCURACY] == 1
+        self.check_model_category(templates)
 
     @e2e_pytest_component
     def test_model_status(self):
-        for template in templates:
-            if template.model_status == ModelStatus.DEPRECATED:
-                assert template.model_category == ModelCategory.OTHER
+        self.check_model_status(templates)
 
     @e2e_pytest_component
     def test_default_for_task(self):
-        num_default_model = 0
-        for template in templates:
-            if template.is_default_for_task:
-                num_default_model += 1
-                assert template.model_category != ModelCategory.OTHER
-                assert template.model_status == ModelStatus.ACTIVE
-        assert num_default_model == 1
+        self.check_default_for_task(templates)
 
 
 class TestToolsAnomalyClassification:

tests/integration/cli/anomaly/test_anomaly_detection.py

@@ -7,7 +7,7 @@
 
 import pytest
 
-from otx.api.entities.model_template import parse_model_template, ModelCategory, ModelStatus
+from otx.api.entities.model_template import parse_model_template
 from otx.cli.registry import Registry
 from tests.test_suite.e2e_test_system import e2e_pytest_component
 from tests.test_suite.run_test_command import (
@@ -18,6 +18,7 @@
     otx_eval_testing,
     otx_export_testing,
     otx_train_testing,
+    BaseTestModelTemplates
 )
 
 args = {
@@ -34,36 +35,18 @@
 templates_ids = [template.model_template_id for template in templates]
 
 
-class TestAnomalyDetectionModelTemplates:
+class TestAnomalyDetectionModelTemplates(BaseTestModelTemplates):
     @e2e_pytest_component
     def test_model_category(self):
-        stat = {
-            ModelCategory.SPEED: 0,
-            ModelCategory.BALANCE: 0,
-            ModelCategory.ACCURACY: 0,
-            ModelCategory.OTHER: 0,
-        }
-        for template in templates:
-            stat[template.model_category] += 1
-        assert stat[ModelCategory.SPEED] == 1
-        assert stat[ModelCategory.BALANCE] <= 1
-        assert stat[ModelCategory.ACCURACY] == 1
+        self.check_model_category(templates)
 
     @e2e_pytest_component
     def test_model_status(self):
-        for template in templates:
-            if template.model_status == ModelStatus.DEPRECATED:
-                assert template.model_category == ModelCategory.OTHER
+        self.check_model_status(templates)
 
     @e2e_pytest_component
     def test_default_for_task(self):
-        num_default_model = 0
-        for template in templates:
-            if template.is_default_for_task:
-                num_default_model += 1
-                assert template.model_category != ModelCategory.OTHER
-                assert template.model_status == ModelStatus.ACTIVE
-        assert num_default_model == 1
+        self.check_default_for_task(templates)
 
 
 class TestToolsAnomalyDetection:

tests/integration/cli/anomaly/test_anomaly_segmentation.py

@@ -7,7 +7,7 @@
 
 import pytest
 
-from otx.api.entities.model_template import parse_model_template, ModelCategory, ModelStatus
+from otx.api.entities.model_template import parse_model_template
 from otx.cli.registry import Registry
 from tests.test_suite.e2e_test_system import e2e_pytest_component
 from tests.test_suite.run_test_command import (
@@ -18,6 +18,7 @@
     otx_eval_testing,
     otx_export_testing,
     otx_train_testing,
+    BaseTestModelTemplates,
 )
 
 args = {
@@ -34,36 +35,18 @@
 templates_ids = [template.model_template_id for template in templates]
 
 
-class TestAnomalySegmentationModelTemplates:
+class TestAnomalySegmentationModelTemplates(BaseTestModelTemplates):
     @e2e_pytest_component
     def test_model_category(self):
-        stat = {
-            ModelCategory.SPEED: 0,
-            ModelCategory.BALANCE: 0,
-            ModelCategory.ACCURACY: 0,
-            ModelCategory.OTHER: 0,
-        }
-        for template in templates:
-            stat[template.model_category] += 1
-        assert stat[ModelCategory.SPEED] == 1
-        assert stat[ModelCategory.BALANCE] <= 1
-        assert stat[ModelCategory.ACCURACY] == 1
+        self.check_model_category(templates)
 
     @e2e_pytest_component
     def test_model_status(self):
-        for template in templates:
-            if template.model_status == ModelStatus.DEPRECATED:
-                assert template.model_category == ModelCategory.OTHER
+        self.check_model_status(templates)
 
     @e2e_pytest_component
     def test_default_for_task(self):
-        num_default_model = 0
-        for template in templates:
-            if template.is_default_for_task:
-                num_default_model += 1
-                assert template.model_category != ModelCategory.OTHER
-                assert template.model_status == ModelStatus.ACTIVE
-        assert num_default_model == 1
+        self.check_default_for_task(templates)
 
 
 class TestToolsAnomalySegmentation:

tests/integration/cli/classification/test_classification.py

@@ -10,7 +10,7 @@
 import pytest
 import torch
 
-from otx.api.entities.model_template import parse_model_template, ModelCategory, ModelStatus
+from otx.api.entities.model_template import parse_model_template
 from otx.cli.registry import Registry
 from tests.test_suite.e2e_test_system import e2e_pytest_component
 from tests.test_suite.run_test_command import (
@@ -30,6 +30,7 @@
     otx_hpo_testing,
     otx_resume_testing,
     otx_train_testing,
+    BaseTestModelTemplates,
 )
 
 # Pre-train w/ 'label_0', 'label_1', 'label_2' classes
@@ -82,36 +83,18 @@
 templates_ids = [template.model_template_id for template in templates]
 
 
-class TestClassificationModelTemplates:
+class TestClassificationModelTemplates(BaseTestModelTemplates):
     @e2e_pytest_component
     def test_model_category(self):
-        stat = {
-            ModelCategory.SPEED: 0,
-            ModelCategory.BALANCE: 0,
-            ModelCategory.ACCURACY: 0,
-            ModelCategory.OTHER: 0,
-        }
-        for template in templates:
-            stat[template.model_category] += 1
-        assert stat[ModelCategory.SPEED] == 1
-        assert stat[ModelCategory.BALANCE] <= 1
-        assert stat[ModelCategory.ACCURACY] == 1
+        self.check_model_category(templates)
 
     @e2e_pytest_component
     def test_model_status(self):
-        for template in templates:
-            if template.model_status == ModelStatus.DEPRECATED:
-                assert template.model_category == ModelCategory.OTHER
+        self.check_model_status(templates)
 
     @e2e_pytest_component
     def test_default_for_task(self):
-        num_default_model = 0
-        for template in templates:
-            if template.is_default_for_task:
-                num_default_model += 1
-                assert template.model_category != ModelCategory.OTHER
-                assert template.model_status == ModelStatus.ACTIVE
-        assert num_default_model == 1
+        self.check_default_for_task(templates)
 
 
 class TestMultiClassClassificationCLI:

tests/integration/cli/detection/test_detection.py

@@ -8,7 +8,7 @@
 import pytest
 import torch
 
-from otx.api.entities.model_template import parse_model_template, ModelCategory, ModelStatus
+from otx.api.entities.model_template import parse_model_template
 from otx.cli.registry import Registry
 from tests.test_suite.e2e_test_system import e2e_pytest_component
 from tests.test_suite.run_test_command import (
@@ -28,6 +28,7 @@
     otx_hpo_testing,
     otx_resume_testing,
     otx_train_testing,
+    BaseTestModelTemplates,
 )
 
 args = {
@@ -81,36 +82,18 @@
 templates_ids_w_experimental = templates_ids + experimental_template_ids
 
 
-class TestDetectionModelTemplates:
+class TestDetectionModelTemplates(BaseTestModelTemplates):
     @e2e_pytest_component
     def test_model_category(self):
-        stat = {
-            ModelCategory.SPEED: 0,
-            ModelCategory.BALANCE: 0,
-            ModelCategory.ACCURACY: 0,
-            ModelCategory.OTHER: 0,
-        }
-        for template in templates:
-            stat[template.model_category] += 1
-        assert stat[ModelCategory.SPEED] == 1
-        assert stat[ModelCategory.BALANCE] <= 1
-        assert stat[ModelCategory.ACCURACY] == 1
+        self.check_model_category(templates)
 
     @e2e_pytest_component
     def test_model_status(self):
-        for template in templates:
-            if template.model_status == ModelStatus.DEPRECATED:
-                assert template.model_category == ModelCategory.OTHER
+        self.check_model_status(templates)
 
     @e2e_pytest_component
     def test_default_for_task(self):
-        num_default_model = 0
-        for template in templates:
-            if template.is_default_for_task:
-                num_default_model += 1
-                assert template.model_category != ModelCategory.OTHER
-                assert template.model_status == ModelStatus.ACTIVE
-        assert num_default_model == 1
+        self.check_default_for_task(templates)
 
 
 class TestDetectionCLI:

tests/integration/cli/instance_segmentation/test_instance_segmentation.py

@@ -8,7 +8,7 @@
 import pytest
 import torch
 
-from otx.api.entities.model_template import parse_model_template, ModelCategory, ModelStatus
+from otx.api.entities.model_template import parse_model_template
 from otx.cli.registry import Registry
 from tests.test_suite.e2e_test_system import e2e_pytest_component
 from tests.test_suite.run_test_command import (
@@ -24,6 +24,7 @@
     otx_hpo_testing,
     otx_resume_testing,
     otx_train_testing,
+    BaseTestModelTemplates,
 )
 
 args = {
@@ -67,36 +68,18 @@
 templates_ids_inc_convnext.extend([template_experimental.model_template_id])
 
 
-class TestInstanceSegmentationModelTemplates:
+class TestInstanceSegmentationModelTemplates(BaseTestModelTemplates):
     @e2e_pytest_component
     def test_model_category(self):
-        stat = {
-            ModelCategory.SPEED: 0,
-            ModelCategory.BALANCE: 0,
-            ModelCategory.ACCURACY: 0,
-            ModelCategory.OTHER: 0,
-        }
-        for template in templates:
-            stat[template.model_category] += 1
-        assert stat[ModelCategory.SPEED] == 1
-        assert stat[ModelCategory.BALANCE] <= 1
-        assert stat[ModelCategory.ACCURACY] == 1
+        self.check_model_category(templates)
 
     @e2e_pytest_component
     def test_model_status(self):
-        for template in templates:
-            if template.model_status == ModelStatus.DEPRECATED:
-                assert template.model_category == ModelCategory.OTHER
+        self.check_model_status(templates)
 
     @e2e_pytest_component
     def test_default_for_task(self):
-        num_default_model = 0
-        for template in templates:
-            if template.is_default_for_task:
-                num_default_model += 1
-                assert template.model_category != ModelCategory.OTHER
-                assert template.model_status == ModelStatus.ACTIVE
-        assert num_default_model == 1
+        self.check_default_for_task(templates)
 
 
 class TestInstanceSegmentationCLI:

tests/integration/cli/instance_segmentation/test_rotated_detection.py

@@ -8,9 +8,10 @@
 import pytest
 import torch
 
-from otx.api.entities.model_template import parse_model_template, ModelCategory, ModelStatus
+from otx.api.entities.model_template import parse_model_template
 from otx.cli.registry import Registry
 from tests.test_suite.e2e_test_system import e2e_pytest_component
+from tests.test_suite.run_test_command import BaseTestModelTemplates
 
 
 otx_dir = os.getcwd()
@@ -21,33 +22,15 @@
 templates_ids = [template.model_template_id for template in templates]
 
 
-class TestRotatedDetectionModelTemplates:
+class TestRotatedDetectionModelTemplates(BaseTestModelTemplates):
     @e2e_pytest_component
     def test_model_category(self):
-        stat = {
-            ModelCategory.SPEED: 0,
-            ModelCategory.BALANCE: 0,
-            ModelCategory.ACCURACY: 0,
-            ModelCategory.OTHER: 0,
-        }
-        for template in templates:
-            stat[template.model_category] += 1
-        assert stat[ModelCategory.SPEED] == 1
-        assert stat[ModelCategory.BALANCE] <= 1
-        assert stat[ModelCategory.ACCURACY] == 1
+        self.check_model_category(templates)
 
     @e2e_pytest_component
     def test_model_status(self):
-        for template in templates:
-            if template.model_status == ModelStatus.DEPRECATED:
-                assert template.model_category == ModelCategory.OTHER
+        self.check_model_status(templates)
 
     @e2e_pytest_component
     def test_default_for_task(self):
-        num_default_model = 0
-        for template in templates:
-            if template.is_default_for_task:
-                num_default_model += 1
-                assert template.model_category != ModelCategory.OTHER
-                assert template.model_status == ModelStatus.ACTIVE
-        assert num_default_model == 1
+        self.check_default_for_task(templates)