diff --git a/backend/api/tests/api/utils.py b/backend/api/tests/api/utils.py index afc04016..60a32234 100644 --- a/backend/api/tests/api/utils.py +++ b/backend/api/tests/api/utils.py @@ -109,22 +109,6 @@ def make_label(project, **kwargs): return mommy.make('SpanType', project=project, **kwargs) -def make_doc(project): - return mommy.make('Example', text='example', project=project) - - -def make_image(project, filepath): - return mommy.make('Example', filename=filepath, project=project) - - -def make_comment(doc, user): - return mommy.make('Comment', example=doc, user=user) - - -def make_example_state(example, user): - return mommy.make('ExampleState', example=example, confirmed_by=user) - - def make_auto_labeling_config(project): return mommy.make('AutoLabelingConfig', project=project) diff --git a/backend/auto_labeling/tests/test_views.py b/backend/auto_labeling/tests/test_views.py index 48078342..a03f0f5f 100644 --- a/backend/auto_labeling/tests/test_views.py +++ b/backend/auto_labeling/tests/test_views.py @@ -9,7 +9,8 @@ from rest_framework.reverse import reverse from projects.models import DOCUMENT_CLASSIFICATION, SEQUENCE_LABELING, SEQ2SEQ from labels.models import Category, Span, TextLabel -from api.tests.api.utils import CRUDMixin, make_doc, prepare_project +from api.tests.api.utils import CRUDMixin, prepare_project +from examples.tests.utils import make_doc from auto_labeling.pipeline.labels import Categories, Spans, Texts data_dir = pathlib.Path(__file__).parent / 'data' diff --git a/backend/examples/tests/test_comment.py b/backend/examples/tests/test_comment.py index 4fde4a32..093102f1 100644 --- a/backend/examples/tests/test_comment.py +++ b/backend/examples/tests/test_comment.py @@ -1,7 +1,8 @@ from rest_framework import status from rest_framework.reverse import reverse -from api.tests.api.utils import (CRUDMixin, make_comment, make_doc, make_user, prepare_project) +from api.tests.api.utils import (CRUDMixin, make_user, prepare_project) +from .utils import make_comment, make_doc class TestCommentListDocAPI(CRUDMixin): diff --git a/backend/examples/tests/test_document.py b/backend/examples/tests/test_document.py index c5b9553e..737dd4e5 100644 --- a/backend/examples/tests/test_document.py +++ b/backend/examples/tests/test_document.py @@ -4,8 +4,8 @@ from rest_framework import status from rest_framework.reverse import reverse from projects.models import DOCUMENT_CLASSIFICATION -from api.tests.api.utils import (CRUDMixin, assign_user_to_role, make_doc, - make_example_state, make_user, prepare_project) +from api.tests.api.utils import (CRUDMixin, assign_user_to_role, make_user, prepare_project) +from .utils import make_doc, make_example_state class TestExampleListAPI(CRUDMixin): diff --git a/backend/examples/tests/test_example_state.py b/backend/examples/tests/test_example_state.py index dab3da5f..a2d93afe 100644 --- a/backend/examples/tests/test_example_state.py +++ b/backend/examples/tests/test_example_state.py @@ -1,7 +1,8 @@ from rest_framework import status from rest_framework.reverse import reverse -from api.tests.api.utils import (CRUDMixin, make_doc, make_example_state, make_user, prepare_project) +from api.tests.api.utils import (CRUDMixin, make_user, prepare_project) +from .utils import make_doc, make_example_state class TestExampleStateList(CRUDMixin): diff --git a/backend/examples/tests/test_filters.py b/backend/examples/tests/test_filters.py index ef26954f..60506432 100644 --- a/backend/examples/tests/test_filters.py +++ b/backend/examples/tests/test_filters.py @@ -2,9 +2,10 @@ from unittest.mock import MagicMock from django.test import TestCase -from api.tests.api.utils import make_doc, make_example_state, prepare_project +from api.tests.api.utils import prepare_project from examples.models import Example from examples.filters import ExampleFilter +from .utils import make_doc, make_example_state class TestFilterMixin(TestCase): diff --git a/backend/examples/tests/utils.py b/backend/examples/tests/utils.py new file mode 100644 index 00000000..47d0426a --- /dev/null +++ b/backend/examples/tests/utils.py @@ -0,0 +1,17 @@ +from model_mommy import mommy + + +def make_comment(doc, user): + return mommy.make('Comment', example=doc, user=user) + + +def make_doc(project): + return mommy.make('Example', text='example', project=project) + + +def make_image(project, filepath): + return mommy.make('Example', filename=filepath, project=project) + + +def make_example_state(example, user): + return mommy.make('ExampleState', example=example, confirmed_by=user) diff --git a/backend/labels/tests/test_views.py b/backend/labels/tests/test_views.py index c36df40d..7d912b93 100644 --- a/backend/labels/tests/test_views.py +++ b/backend/labels/tests/test_views.py @@ -3,8 +3,9 @@ from rest_framework.reverse import reverse from projects.models import DOCUMENT_CLASSIFICATION, SEQUENCE_LABELING, SEQ2SEQ from labels.models import Category, Span, TextLabel -from api.tests.api.utils import (CRUDMixin, make_doc, make_label, +from api.tests.api.utils import (CRUDMixin, make_label, make_user, prepare_project) +from examples.tests.utils import make_doc from .utils import make_annotation diff --git a/backend/metrics/tests.py b/backend/metrics/tests.py index 47358e38..da1d75da 100644 --- a/backend/metrics/tests.py +++ b/backend/metrics/tests.py @@ -2,7 +2,8 @@ from model_mommy import mommy from rest_framework import status from rest_framework.reverse import reverse -from api.tests.api.utils import CRUDMixin, prepare_project, make_doc, make_label +from api.tests.api.utils import CRUDMixin, prepare_project, make_label +from examples.tests.utils import make_doc from projects.models import DOCUMENT_CLASSIFICATION