Skip to content

[DOP-23867] Implement model -> json converter for tests #163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dolfinus merged 1 commit into from
Feb 13, 2025
Merged

[DOP-23867] Implement model -> json converter for tests #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 2 additions & 13 deletions tests/test_server/test_datasets/test_get_datasets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

from data_rentgen.db.models import Dataset
from tests.fixtures.mocks import MockedUser
from tests.test_server.utils.convert_to_json import dataset_to_json
from tests.test_server.utils.enrich import enrich_datasets

pytestmark = [pytest.mark.server, pytest.mark.asyncio]
Expand Down Expand Up @@ -37,19 +38,7 @@ async def test_get_datasets_no_filters(
},
"items": [
{
"data": {
"kind": "DATASET",
"id": dataset.id,
"format": dataset.format,
"name": dataset.name,
"location": {
"id": dataset.location.id,
"name": dataset.location.name,
"type": dataset.location.type,
"addresses": [{"url": address.url} for address in dataset.location.addresses],
"external_id": dataset.location.external_id,
},
},
"data": dataset_to_json(dataset),
}
for dataset in sorted(datasets, key=lambda x: x.name)
],
Expand Down
29 changes: 3 additions & 26 deletions tests/test_server/test_datasets/test_get_datasets_by_id.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

from data_rentgen.db.models import Dataset
from tests.fixtures.mocks import MockedUser
from tests.test_server.utils.convert_to_json import dataset_to_json
from tests.test_server.utils.enrich import enrich_datasets

pytestmark = [pytest.mark.server, pytest.mark.asyncio]
Expand Down Expand Up @@ -67,19 +68,7 @@ async def test_get_datasets_by_one_id(
},
"items": [
{
"data": {
"kind": "DATASET",
"id": dataset.id,
"format": dataset.format,
"name": dataset.name,
"location": {
"id": dataset.location.id,
"name": dataset.location.name,
"type": dataset.location.type,
"addresses": [{"url": address.url} for address in dataset.location.addresses],
"external_id": dataset.location.external_id,
},
},
"data": dataset_to_json(dataset),
},
],
}
Expand Down Expand Up @@ -114,19 +103,7 @@ async def test_get_datasets_by_multiple_ids(
},
"items": [
{
"data": {
"kind": "DATASET",
"id": dataset.id,
"format": dataset.format,
"name": dataset.name,
"location": {
"id": dataset.location.id,
"name": dataset.location.name,
"type": dataset.location.type,
"addresses": [{"url": address.url} for address in dataset.location.addresses],
"external_id": dataset.location.external_id,
},
},
"data": dataset_to_json(dataset),
}
for dataset in sorted(selected_datasets, key=lambda x: x.name)
],
Expand Down
57 changes: 5 additions & 52 deletions tests/test_server/test_datasets/test_search_datasets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

from data_rentgen.db.models import Dataset
from tests.fixtures.mocks import MockedUser
from tests.test_server.utils.convert_to_json import dataset_to_json
from tests.test_server.utils.enrich import enrich_datasets

pytestmark = [pytest.mark.server, pytest.mark.asyncio]
Expand Down Expand Up @@ -42,19 +43,7 @@ async def test_search_datasets_by_address_url(
},
"items": [
{
"data": {
"kind": "DATASET",
"id": dataset.id,
"format": dataset.format,
"name": dataset.name,
"location": {
"id": dataset.location.id,
"name": dataset.location.name,
"type": dataset.location.type,
"addresses": [{"url": address.url} for address in dataset.location.addresses],
"external_id": dataset.location.external_id,
},
},
"data": dataset_to_json(dataset),
}
for dataset in datasets
],
Expand Down Expand Up @@ -102,19 +91,7 @@ async def test_search_datasets_by_location_name(
},
"items": [
{
"data": {
"kind": "DATASET",
"id": dataset.id,
"format": dataset.format,
"name": dataset.name,
"location": {
"id": dataset.location.id,
"name": dataset.location.name,
"type": dataset.location.type,
"addresses": [{"url": address.url} for address in dataset.location.addresses],
"external_id": dataset.location.external_id,
},
},
"data": dataset_to_json(dataset),
}
for dataset in datasets
],
Expand Down Expand Up @@ -151,19 +128,7 @@ async def test_search_datasets_by_dataset_name(
},
"items": [
{
"data": {
"kind": "DATASET",
"id": dataset.id,
"format": dataset.format,
"name": dataset.name,
"location": {
"id": dataset.location.id,
"name": dataset.location.name,
"type": dataset.location.type,
"addresses": [{"url": address.url} for address in dataset.location.addresses],
"external_id": dataset.location.external_id,
},
},
"data": dataset_to_json(dataset),
}
for dataset in datasets
],
Expand Down Expand Up @@ -207,19 +172,7 @@ async def test_search_datasets_by_location_name_and_address_url(
},
"items": [
{
"data": {
"kind": "DATASET",
"id": dataset.id,
"format": dataset.format,
"name": dataset.name,
"location": {
"id": dataset.location.id,
"name": dataset.location.name,
"type": dataset.location.type,
"addresses": [{"url": address.url} for address in dataset.location.addresses],
"external_id": dataset.location.external_id,
},
},
"data": dataset_to_json(dataset),
}
for dataset in datasets
],
Expand Down
15 changes: 2 additions & 13 deletions tests/test_server/test_jobs/test_get_jobs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

from data_rentgen.db.models import Job
from tests.fixtures.mocks import MockedUser
from tests.test_server.utils.convert_to_json import job_to_json
from tests.test_server.utils.enrich import enrich_jobs

pytestmark = [pytest.mark.server, pytest.mark.asyncio]
Expand Down Expand Up @@ -37,19 +38,7 @@ async def test_get_jobs_no_filters(
},
"items": [
{
"data": {
"kind": "JOB",
"id": job.id,
"name": job.name,
"type": job.type,
"location": {
"id": job.location.id,
"type": job.location.type,
"name": job.location.name,
"addresses": [{"url": address.url} for address in job.location.addresses],
"external_id": job.location.external_id,
},
},
"data": job_to_json(job),
}
for job in sorted(jobs, key=lambda x: x.name)
],
Expand Down
29 changes: 3 additions & 26 deletions tests/test_server/test_jobs/test_get_jobs_by_id.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

from data_rentgen.db.models import Job
from tests.fixtures.mocks import MockedUser
from tests.test_server.utils.convert_to_json import job_to_json
from tests.test_server.utils.enrich import enrich_jobs

pytestmark = [pytest.mark.server, pytest.mark.asyncio]
Expand Down Expand Up @@ -67,19 +68,7 @@ async def test_get_jobs_by_one_id(
},
"items": [
{
"data": {
"kind": "JOB",
"id": job.id,
"name": job.name,
"type": job.type,
"location": {
"id": job.location.id,
"type": job.location.type,
"name": job.location.name,
"addresses": [{"url": address.url} for address in job.location.addresses],
"external_id": job.location.external_id,
},
},
"data": job_to_json(job),
},
],
}
Expand Down Expand Up @@ -114,19 +103,7 @@ async def test_get_jobs_by_multiple_ids(
},
"items": [
{
"data": {
"kind": "JOB",
"id": job.id,
"name": job.name,
"type": job.type,
"location": {
"id": job.location.id,
"type": job.location.type,
"name": job.location.name,
"addresses": [{"url": address.url} for address in job.location.addresses],
"external_id": job.location.external_id,
},
},
"data": job_to_json(job),
}
for job in sorted(selected_jobs, key=lambda x: x.name)
],
Expand Down
57 changes: 5 additions & 52 deletions tests/test_server/test_jobs/test_search_jobs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

from data_rentgen.db.models import Job
from tests.fixtures.mocks import MockedUser
from tests.test_server.utils.convert_to_json import job_to_json
from tests.test_server.utils.enrich import enrich_jobs

pytestmark = [pytest.mark.server, pytest.mark.asyncio]
Expand Down Expand Up @@ -41,19 +42,7 @@ async def test_search_jobs_by_address_url(
},
"items": [
{
"data": {
"kind": "JOB",
"id": job.id,
"name": job.name,
"type": job.type,
"location": {
"id": job.location.id,
"type": job.location.type,
"name": job.location.name,
"addresses": [{"url": address.url} for address in job.location.addresses],
"external_id": job.location.external_id,
},
},
"data": job_to_json(job),
}
for job in jobs
],
Expand Down Expand Up @@ -90,19 +79,7 @@ async def test_search_jobs_by_location_name(
},
"items": [
{
"data": {
"kind": "JOB",
"id": job.id,
"name": job.name,
"type": job.type,
"location": {
"id": job.location.id,
"type": job.location.type,
"name": job.location.name,
"addresses": [{"url": address.url} for address in job.location.addresses],
"external_id": job.location.external_id,
},
},
"data": job_to_json(job),
}
for job in jobs
],
Expand Down Expand Up @@ -150,19 +127,7 @@ async def test_search_jobs_by_job_name(
},
"items": [
{
"data": {
"kind": "JOB",
"id": job.id,
"name": job.name,
"type": job.type,
"location": {
"id": job.location.id,
"type": job.location.type,
"name": job.location.name,
"addresses": [{"url": address.url} for address in job.location.addresses],
"external_id": job.location.external_id,
},
},
"data": job_to_json(job),
}
for job in jobs
],
Expand Down Expand Up @@ -200,19 +165,7 @@ async def test_search_jobs_by_location_name_and_address_url(
},
"items": [
{
"data": {
"kind": "JOB",
"id": job.id,
"name": job.name,
"type": job.type,
"location": {
"id": job.location.id,
"type": job.location.type,
"name": job.location.name,
"addresses": [{"url": address.url} for address in job.location.addresses],
"external_id": job.location.external_id,
},
},
"data": job_to_json(job),
}
for job in jobs
],
Expand Down
Loading
Loading