From 1b8aece535fb080df1f88c8a0a17782dd821fc56 Mon Sep 17 00:00:00 2001 From: camillebrianceau Date: Thu, 30 May 2024 16:02:53 +0200 Subject: [PATCH] reorganize architecture tests --- tests/test_tsvtools.py | 2 +- .../train/tasks/classification/test_classification_config.py | 2 +- tests/unittests/train/trainer/test_training_config.py | 2 +- tests/unittests/utils/test_config_utils.py | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/test_tsvtools.py b/tests/test_tsvtools.py index 40c3deb83..f77a333ac 100644 --- a/tests/test_tsvtools.py +++ b/tests/test_tsvtools.py @@ -5,7 +5,7 @@ import pandas as pd import pytest -from clinicadl.utils.tsvtools_utils import extract_baseline +from clinicadl.tsvtools.tsvtools_utils import extract_baseline from tests.testing_tools import compare_folders """ diff --git a/tests/unittests/train/tasks/classification/test_classification_config.py b/tests/unittests/train/tasks/classification/test_classification_config.py index 8f38b4825..e5fd4d55e 100644 --- a/tests/unittests/train/tasks/classification/test_classification_config.py +++ b/tests/unittests/train/tasks/classification/test_classification_config.py @@ -9,7 +9,7 @@ # Tests for customed validators # def test_model_config(): with pytest.raises(ValidationError): - classification.ModelConfig( + classification.NetworkConfig( **{ "architecture": "", "loss": "", diff --git a/tests/unittests/train/trainer/test_training_config.py b/tests/unittests/train/trainer/test_training_config.py index 5f9e0acca..23aa0f0a2 100644 --- a/tests/unittests/train/trainer/test_training_config.py +++ b/tests/unittests/train/trainer/test_training_config.py @@ -55,7 +55,7 @@ def test_data_config(caps_example): def test_model_config(): with pytest.raises(ValidationError): - config.ModelConfig( + config.NetworkConfig( **{ "architecture": "", "loss": "", diff --git a/tests/unittests/utils/test_config_utils.py b/tests/unittests/utils/test_config_utils.py index e69ffbfcb..5fe1497ef 100644 --- a/tests/unittests/utils/test_config_utils.py +++ b/tests/unittests/utils/test_config_utils.py @@ -29,7 +29,7 @@ class ConfigTest(BaseModel): def test_get_default_from_config_class(): - from clinicadl.utils.config_utils import get_default_from_config_class + from clinicadl.config.config_utils import get_default_from_config_class test_config = ConfigTest() assert get_default_from_config_class("parameter_str", test_config) == "a string" @@ -62,7 +62,7 @@ def test_get_default_from_config_class(): def test_get_type_from_config_class(): - from clinicadl.utils.config_utils import get_type_from_config_class + from clinicadl.config.config_utils import get_type_from_config_class test_config = ConfigTest() assert get_type_from_config_class("parameter_str", test_config) == str