From f8c823e093b9fa3919842b4241de12a80fa0795b Mon Sep 17 00:00:00 2001 From: Viktor Bozhinov Date: Mon, 14 Feb 2022 14:41:47 +0000 Subject: [PATCH] test: remove `test_valid_where_filter` tests added in bugfix/filters-on-ispublic-panosc-field-#308 #329 --- .../test_search_api_query_filter_factory.py | 49 +------------------ 1 file changed, 1 insertion(+), 48 deletions(-) diff --git a/test/search_api/test_search_api_query_filter_factory.py b/test/search_api/test_search_api_query_filter_factory.py index 9744c1c5..06262fc8 100644 --- a/test/search_api/test_search_api_query_filter_factory.py +++ b/test/search_api/test_search_api_query_filter_factory.py @@ -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 @@ -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( @@ -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", @@ -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, )