udata 12.0.2.dev15__py3-none-any.whl → 13.0.1.dev21__py3-none-any.whl

udata/tests/cli/test_db_cli.py

@@ -2,13 +2,15 @@ from datetime import datetime
 
 import pytest
 from bson import ObjectId
+from mongoengine.connection import get_db
 
 from udata.models import Reuse
+from udata.tests.api import PytestOnlyDBTestCase
 
 
 @pytest.fixture
-def migrations(db):
-    db.migrations.insert_one(
+def migrations():
+    get_db().migrations.insert_one(
         {
             "plugin": "udata",
             "filename": "test.py",
@@ -17,55 +19,50 @@ def migrations(db):
             "output": "ok",
         }
     )
-    return db.migrations
-
-
-def test_unrecord_with_complete_filename(cli, migrations):
-    """Should display help without errors"""
-    result = cli("db unrecord udata test.py")
-    assert result.exit_code == 0
-    assert migrations.count_documents({}) == 0
-
-
-def test_unrecord_with_filename_without_extension(cli, migrations):
-    """Should display help without errors"""
-    result = cli("db unrecord udata test")
-    assert result.exit_code == 0
-    assert migrations.count_documents({}) == 0
-
-
-def test_unrecord_with_single_parameter(cli, migrations):
-    """Should display help without errors"""
-    result = cli("db unrecord udata:test.py")
-    assert result.exit_code == 0
-    assert migrations.count_documents({}) == 0
-
-
-def test_unrecord_with_single_parameter_without_extension(cli, migrations):
-    """Should display help without errors"""
-    result = cli("db unrecord udata:test")
-    assert result.exit_code == 0
-    assert migrations.count_documents({}) == 0
-
-
-def test_unrecord_without_parameters(cli, migrations):
-    """Should display help without errors"""
-    result = cli("db unrecord", check=False)
-    assert result.exit_code != 0
-    assert migrations.count_documents({}) == 1
-
-
-def test_unrecord_with_too_many_parameters(cli, migrations):
-    """Should display help without errors"""
-    result = cli("db unrecord udata test.py too many", check=False)
-    assert result.exit_code != 0
-    assert migrations.count_documents({}) == 1
-
-
-def test_check_references_report_listfield_missing(cli, clean_db):
-    # The cli command `udata db check-integrity` should catch reuse object missing datasets field
-    Reuse._get_collection().insert_one({"_id": ObjectId()})
-
-    result = cli("db check-integrity --models Reuse", check=False)
-    assert "Reuse.datasets(Dataset) — list…: 1" in result.output
-    assert result.exit_code != 0
+    return get_db().migrations
+
+
+class DBCliTest(PytestOnlyDBTestCase):
+    def test_unrecord_with_complete_filename(self, cli, migrations):
+        """Should display help without errors"""
+        result = cli("db unrecord udata test.py")
+        assert result.exit_code == 0
+        assert migrations.count_documents({}) == 0
+
+    def test_unrecord_with_filename_without_extension(self, cli, migrations):
+        """Should display help without errors"""
+        result = cli("db unrecord udata test")
+        assert result.exit_code == 0
+        assert migrations.count_documents({}) == 0
+
+    def test_unrecord_with_single_parameter(self, cli, migrations):
+        """Should display help without errors"""
+        result = cli("db unrecord udata:test.py")
+        assert result.exit_code == 0
+        assert migrations.count_documents({}) == 0
+
+    def test_unrecord_with_single_parameter_without_extension(self, cli, migrations):
+        """Should display help without errors"""
+        result = cli("db unrecord udata:test")
+        assert result.exit_code == 0
+        assert migrations.count_documents({}) == 0
+
+    def test_unrecord_without_parameters(self, cli, migrations):
+        """Should display help without errors"""
+        result = cli("db unrecord", check=False)
+        assert result.exit_code != 0
+        assert migrations.count_documents({}) == 1
+
+    def test_unrecord_with_too_many_parameters(self, cli, migrations):
+        """Should display help without errors"""
+        result = cli("db unrecord udata test.py too many", check=False)
+        assert result.exit_code != 0
+        assert migrations.count_documents({}) == 1
+
+    def test_check_references_report_listfield_missing(self, cli):
+        # The cli command `udata db check-integrity` should catch reuse object missing datasets field
+        Reuse._get_collection().insert_one({"_id": ObjectId()})
+
+        result = cli("db check-integrity --models Reuse", check=False)
+        assert "Reuse.datasets(Dataset) — list…: 1" in result.output
+        assert result.exit_code != 0

udata/tests/contact_point/test_contact_point_models.py

@@ -2,10 +2,10 @@ import pytest
 
 from udata.core.contact_point.factories import ContactPointFactory
 from udata.models import db
+from udata.tests.api import PytestOnlyDBTestCase
 
 
-@pytest.mark.usefixtures("clean_db")
-class ContactPointTest:
+class ContactPointTest(PytestOnlyDBTestCase):
     def test_validate_contact_role_needs_email_or_contact_form(self):
         with pytest.raises(db.ValidationError):
             ContactPointFactory(role="contact", email=None, contact_form=None)

udata/tests/dataservice/test_csv_adapter.py

@@ -1,17 +1,14 @@
 from datetime import datetime
 
-import pytest
-
 from udata.core.dataservices.csv import DataserviceCsvAdapter
 from udata.core.dataservices.factories import DataserviceFactory
 from udata.core.dataservices.models import Dataservice
 from udata.core.dataset.factories import DatasetFactory
 from udata.core.organization.factories import OrganizationFactory
+from udata.tests.api import PytestOnlyDBTestCase
 
 
-@pytest.mark.frontend
-@pytest.mark.usefixtures("clean_db")
-class DataserviceCSVAdapterTest:
+class DataserviceCSVAdapterTest(PytestOnlyDBTestCase):
     def test_dataservices_csv_adapter(self):
         dataservice = DataserviceFactory(
             created_at=datetime(2022, 12, 31),

udata/tests/dataservice/test_dataservice_rdf.py

@@ -6,6 +6,7 @@ from rdflib import BNode, Literal, URIRef
 from rdflib.namespace import RDF
 from rdflib.resource import Resource as RdfResource
 
+from udata.core.constants import HVD
 from udata.core.dataservices.factories import DataserviceFactory, HarvestMetadataFactory
 from udata.core.dataservices.rdf import dataservice_to_rdf
 from udata.core.dataset.factories import DatasetFactory
@@ -16,13 +17,11 @@ from udata.rdf import (
     HVD_LEGISLATION,
     TAG_TO_EU_HVD_CATEGORIES,
 )
+from udata.tests.api import PytestOnlyAPITestCase
 from udata.tests.helpers import assert200, assert_redirects
 
-pytestmark = pytest.mark.usefixtures("app")
 
-
-@pytest.mark.frontend
-class DataserviceToRdfTest:
+class DataserviceToRdfTest(PytestOnlyAPITestCase):
     def test_minimal(self):
         dataservice = DataserviceFactory.build()  # Does not have an URL
         d = dataservice_to_rdf(dataservice)
@@ -51,6 +50,7 @@ class DataserviceToRdfTest:
     def test_hvd_dataservice(self):
         """Test that a dataservice tagged hvd has appropriate DCAT-AP HVD properties"""
         dataservice = DataserviceFactory(tags=["hvd", "mobilite", "test"])
+        dataservice.add_badge(HVD)
         d = dataservice_to_rdf(dataservice)
 
         assert d.value(DCATAP.applicableLegislation).identifier == URIRef(HVD_LEGISLATION)
@@ -67,9 +67,12 @@ class DataserviceToRdfTest:
         dataset_hvd_2 = DatasetFactory(
             tags=["hvd", "statistiques", "mobilite", "geospatiales", "not-a-hvd-category"]
         )
+        dataset_hvd_1.add_badge(HVD)
+        dataset_hvd_2.add_badge(HVD)
         dataservice = DataserviceFactory(
             datasets=[dataset, dataset_hvd_1, dataset_hvd_2], tags=["hvd", "mobilite", "test"]
         )
+        dataservice.add_badge(HVD)
         d = dataservice_to_rdf(dataservice)
 
         assert d.value(DCATAP.applicableLegislation).identifier == URIRef(HVD_LEGISLATION)
@@ -83,8 +86,7 @@ class DataserviceToRdfTest:
             assert distrib.value(DCATAP.applicableLegislation).identifier == URIRef(HVD_LEGISLATION)
 
 
-@pytest.mark.frontend
-class DataserviceRdfViewsTest:
+class DataserviceRdfViewsTest(PytestOnlyAPITestCase):
     def test_rdf_default_to_jsonld(self, client):
         dataservice = DataserviceFactory()
         expected = url_for("api.dataservice_rdf_format", dataservice=dataservice.id, _format="json")

udata/tests/dataservice/test_dataservice_tasks.py

@@ -1,47 +1,45 @@
-import pytest
-
 from udata.core.dataservices import tasks
 from udata.core.dataservices.models import Dataservice
 from udata.core.user.factories import UserFactory
 from udata.harvest.models import HarvestItem, HarvestJob
 from udata.harvest.tests.factories import HarvestJobFactory
 from udata.models import Discussion, Follow, Message, Transfer
+from udata.tests.api import PytestOnlyDBTestCase
 from udata.utils import faker
 
-pytestmark = pytest.mark.usefixtures("clean_db")
-
-
-def test_purge_dataservices():
-    dataservices = [
-        Dataservice.objects.create(
-            title="delete me", base_api_url="https://example.com/api", deleted_at="2016-01-01"
-        ),
-        Dataservice.objects.create(title="keep me", base_api_url="https://example.com/api"),
-    ]
-
-    user = UserFactory()
-    transfer = Transfer.objects.create(
-        owner=user,
-        recipient=user,
-        subject=dataservices[0],
-        comment="comment",
-    )
-
-    discussion = Discussion.objects.create(
-        subject=dataservices[0],
-        user=user,
-        title="test discussion",
-        discussion=[Message(content=faker.sentence(), posted_by=user)],
-    )
-
-    follower = Follow.objects.create(follower=user, following=dataservices[0])
-
-    HarvestJobFactory(items=[HarvestItem(dataservice=dataservices[0])])
-
-    tasks.purge_dataservices()
 
-    assert Dataservice.objects.count() == 1
-    assert Transfer.objects.filter(id=transfer.id).count() == 0
-    assert Discussion.objects.filter(id=discussion.id).count() == 0
-    assert Follow.objects.filter(id=follower.id).count() == 0
-    assert HarvestJob.objects.filter(items__dataservice=dataservices[0].id).count() == 0
+class DataserviceTasksTest(PytestOnlyDBTestCase):
+    def test_purge_dataservices(self):
+        dataservices = [
+            Dataservice.objects.create(
+                title="delete me", base_api_url="https://example.com/api", deleted_at="2016-01-01"
+            ),
+            Dataservice.objects.create(title="keep me", base_api_url="https://example.com/api"),
+        ]
+
+        user = UserFactory()
+        transfer = Transfer.objects.create(
+            owner=user,
+            recipient=user,
+            subject=dataservices[0],
+            comment="comment",
+        )
+
+        discussion = Discussion.objects.create(
+            subject=dataservices[0],
+            user=user,
+            title="test discussion",
+            discussion=[Message(content=faker.sentence(), posted_by=user)],
+        )
+
+        follower = Follow.objects.create(follower=user, following=dataservices[0])
+
+        HarvestJobFactory(items=[HarvestItem(dataservice=dataservices[0])])
+
+        tasks.purge_dataservices()
+
+        assert Dataservice.objects.count() == 1
+        assert Transfer.objects.filter(id=transfer.id).count() == 0
+        assert Discussion.objects.filter(id=discussion.id).count() == 0
+        assert Follow.objects.filter(id=follower.id).count() == 0
+        assert HarvestJob.objects.filter(items__dataservice=dataservices[0].id).count() == 0

udata/tests/dataset/test_csv_adapter.py

@@ -1,15 +1,12 @@
 from datetime import datetime, timedelta
 
-import pytest
-
 from udata.core.dataset.csv import DatasetCsvAdapter, ResourcesCsvAdapter
 from udata.core.dataset.factories import DatasetFactory, ResourceFactory
 from udata.core.dataset.models import Dataset
+from udata.tests.api import PytestOnlyDBTestCase
 
 
-@pytest.mark.frontend
-@pytest.mark.usefixtures("clean_db")
-class DatasetCSVAdapterTest:
+class DatasetCSVAdapterTest(PytestOnlyDBTestCase):
     def test_resources_csv_adapter(self):
         date_created = datetime(2022, 12, 31)
         date_modified = date_created + timedelta(days=1)

udata/tests/dataset/test_dataset_actions.py

@@ -1,13 +1,11 @@
-import pytest
-
 from udata.core.dataset.actions import archive
 from udata.core.dataset.factories import DatasetFactory
 from udata.core.discussions.models import Discussion
 from udata.core.user.factories import UserFactory
+from udata.tests.api import PytestOnlyDBTestCase
 
 
-@pytest.mark.usefixtures("clean_db")
-class DatasetActionsTest:
+class DatasetActionsTest(PytestOnlyDBTestCase):
     def test_dataset_archive(self, app):
         user = UserFactory()
         app.config["ARCHIVE_COMMENT_USER_ID"] = user.id

udata/tests/dataset/test_dataset_commands.py

@@ -1,12 +1,10 @@
 from tempfile import NamedTemporaryFile
 
-import pytest
-
 from udata.core.dataset.factories import DatasetFactory
+from udata.tests.api import PytestOnlyDBTestCase
 
 
-@pytest.mark.usefixtures("clean_db")
-class DatasetCommandTest:
+class DatasetCommandTest(PytestOnlyDBTestCase):
     def test_dataset_archive_one(self, cli):
         dataset = DatasetFactory()
 

udata/tests/dataset/test_dataset_events.py

@@ -7,12 +7,12 @@ from udata.core.dataset.events import serialize_resource_for_event
 from udata.core.dataset.factories import DatasetFactory, ResourceFactory
 from udata.core.dataset.models import Schema
 from udata.models import Dataset
+from udata.tests.api import PytestOnlyDBTestCase
 from udata.tests.helpers import assert_emit
 
 
-@pytest.mark.usefixtures("clean_db")
-@pytest.mark.usefixtures("enable_resource_event")
-class DatasetEventsTest:
+@pytest.mark.options(PUBLISH_ON_RESOURCE_EVENTS=True, RESOURCES_ANALYSER_URI="http://local.dev")
+class DatasetEventsTest(PytestOnlyDBTestCase):
     @patch("requests.post")
     @pytest.mark.options(RESOURCES_ANALYSER_API_KEY=None)
     def test_publish_message_resource_created_no_api_key(self, mock_req):

udata/tests/dataset/test_dataset_model.py

@@ -37,13 +37,12 @@ from udata.core.followers.signals import on_follow, on_unfollow
 from udata.core.reuse.factories import ReuseFactory, VisibleReuseFactory
 from udata.core.user.factories import UserFactory
 from udata.models import Dataset, Follow, License, ResourceSchema, Reuse, Schema, db
+from udata.tests.api import PytestOnlyDBTestCase
 from udata.tests.helpers import assert_emit, assert_equal_dates, assert_not_emit
 from udata.utils import faker
 
-pytestmark = pytest.mark.usefixtures("clean_db")
 
-
-class DatasetModelTest:
+class DatasetModelTest(PytestOnlyDBTestCase):
     def test_add_resource(self):
         user = UserFactory()
         dataset = DatasetFactory(owner=user)
@@ -426,7 +425,7 @@ class DatasetModelTest:
         assert dataset.get_metrics()["dataservices"] == 0
 
 
-class ResourceModelTest:
+class ResourceModelTest(PytestOnlyDBTestCase):
     def test_url_is_required(self):
         with pytest.raises(db.ValidationError):
             DatasetFactory(resources=[ResourceFactory(url=None)])
@@ -451,7 +450,7 @@ class ResourceModelTest:
             resource.save(signal_kwargs={"ignores": ["post_save"]})
 
 
-class LicenseModelTest:
+class LicenseModelTest(PytestOnlyDBTestCase):
     @pytest.fixture(autouse=True)
     def setUp(self):
         # Feed the DB with random data to ensure true matching
@@ -672,7 +671,7 @@ class LicenseModelTest:
         assert license.id == found.id
 
 
-class ResourceSchemaTest:
+class ResourceSchemaTest(PytestOnlyDBTestCase):
     @pytest.mark.options(SCHEMA_CATALOG_URL="https://example.com/notfound")
     def test_resource_schema_objects_404_endpoint(self, rmock):
         rmock.get("https://example.com/notfound", status_code=404)
@@ -787,7 +786,7 @@ class ResourceSchemaTest:
             resource.schema.clean(check_schema_in_catalog=True)
 
 
-class HarvestMetadataTest:
+class HarvestMetadataTest(PytestOnlyDBTestCase):
     def test_harvest_dataset_metadata_validate_success(self):
         dataset = DatasetFactory()