Skip to content

Commit

Permalink
test: remove test_valid_where_filter tests added in bugfix/filters-…
Browse files Browse the repository at this point in the history
…on-ispublic-panosc-field-#308 #329
  • Loading branch information
VKTB committed Feb 14, 2022
1 parent df5bfce commit f8c823e
Showing 1 changed file with 1 addition and 48 deletions.
49 changes: 1 addition & 48 deletions test/search_api/test_search_api_query_filter_factory.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
from datetime import datetime, timezone
from unittest.mock import patch

from dateutil.relativedelta import relativedelta
import pytest

from datagateway_api.src.common.exceptions import FilterError
Expand All @@ -17,13 +13,6 @@
SearchAPIQueryFilterFactory,
)

DATETIME_NOW = datetime.now(timezone.utc)


def get_three_years_ago_datetime_as_string():
three_years_ago = DATETIME_NOW - relativedelta(years=3)
return str(three_years_ago).replace("+", " ")


class TestSearchAPIQueryFilterFactory:
@pytest.mark.parametrize(
Expand All @@ -35,46 +24,12 @@ class TestSearchAPIQueryFilterFactory:
SearchAPIWhereFilter("title", "My Title", "eq"),
id="Property value with no operator",
),
pytest.param(
{"filter": {"where": {"isPublic": False}}},
"Document",
SearchAPIWhereFilter(
"isPublic", get_three_years_ago_datetime_as_string(), "gt",
),
id="Property value with no operator (isPublic field - False value)",
),
pytest.param(
{"filter": {"where": {"isPublic": True}}},
"Document",
SearchAPIWhereFilter(
"isPublic", get_three_years_ago_datetime_as_string(), "lt",
),
id="Property value with no operator (isPublic field - True value)",
),
pytest.param(
{"filter": {"where": {"summary": {"like": "My Test Summary"}}}},
"Document",
SearchAPIWhereFilter("summary", "My Test Summary", "like"),
id="Property value with operator",
),
pytest.param(
{"filter": {"where": {"isPublic": {"neq": False}}}},
"Document",
SearchAPIWhereFilter(
"isPublic", get_three_years_ago_datetime_as_string(), "lt",
),
id="Property value with operator (isPublic field - False value - neq "
"operator)",
),
pytest.param(
{"filter": {"where": {"isPublic": {"neq": True}}}},
"Document",
SearchAPIWhereFilter(
"isPublic", get_three_years_ago_datetime_as_string(), "gt",
),
id="Property value with operator (isPublic field - True value - neq "
"operator)",
),
pytest.param(
{"where": {"summary": {"like": "My Test Summary"}}},
"Document",
Expand All @@ -83,11 +38,9 @@ class TestSearchAPIQueryFilterFactory:
),
],
)
@patch("datagateway_api.src.search_api.query_filter_factory.datetime")
def test_valid_where_filter(
self, datetime_mock, test_request_filter, test_entity_name, expected_where,
self, test_request_filter, test_entity_name, expected_where,
):
datetime_mock.now.return_value = DATETIME_NOW
filters = SearchAPIQueryFilterFactory.get_query_filter(
test_request_filter, test_entity_name,
)
Expand Down

0 comments on commit f8c823e

Please sign in to comment.