From 35569fbce0d94e6b92b2480011cd5b9362af6453 Mon Sep 17 00:00:00 2001 From: Viktor Bozhinov Date: Thu, 10 Feb 2022 16:37:18 +0000 Subject: [PATCH] test: fix failing tests #314 --- test/search_api/endpoints/test_get_entity_by_pid.py | 4 ++-- test/search_api/endpoints/test_search_endpoint.py | 6 +++--- test/search_api/test_nested_where_filters.py | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/test/search_api/endpoints/test_get_entity_by_pid.py b/test/search_api/endpoints/test_get_entity_by_pid.py index 485a593c..f85ffbb6 100644 --- a/test/search_api/endpoints/test_get_entity_by_pid.py +++ b/test/search_api/endpoints/test_get_entity_by_pid.py @@ -130,10 +130,10 @@ class TestSearchAPIGetByPIDEndpoint: ), pytest.param( "instruments", - "2", + "pid:2", "{}", { - "pid": "2", + "pid": "pid:2", "name": "INSTRUMENT 2", "facility": "LILS", "datasets": [], diff --git a/test/search_api/endpoints/test_search_endpoint.py b/test/search_api/endpoints/test_search_endpoint.py index 2ee84167..676b5294 100644 --- a/test/search_api/endpoints/test_search_endpoint.py +++ b/test/search_api/endpoints/test_search_endpoint.py @@ -151,13 +151,13 @@ class TestSearchAPISearchEndpoint: "datasets": [], "facility": "LILS", "name": "INSTRUMENT 1", - "pid": "1", + "pid": "pid:1", }, { "datasets": [], "facility": "LILS", "name": "INSTRUMENT 2", - "pid": "2", + "pid": "pid:2", }, ], id="Basic /instruments request", @@ -190,7 +190,7 @@ class TestSearchAPISearchEndpoint: "datasets": [], "facility": "LILS", "name": "INSTRUMENT 10", - "pid": "10", + "pid": "pid:10", }, ], id="Search instruments with name condition", diff --git a/test/search_api/test_nested_where_filters.py b/test/search_api/test_nested_where_filters.py index e308027b..ec925923 100644 --- a/test/search_api/test_nested_where_filters.py +++ b/test/search_api/test_nested_where_filters.py @@ -114,16 +114,16 @@ def test_str_filters(self, lhs, rhs, joining_operator, expected_where_clause): pytest.param( [ SearchAPIWhereFilter("title", "test name", "eq"), - SearchAPIWhereFilter("pid", 10, "lt"), + SearchAPIWhereFilter("pid", "test doi", "like"), ], [ - SearchAPIWhereFilter("pid", 3, "gt"), + SearchAPIWhereFilter("doi", "doi test", "neq"), SearchAPIWhereFilter("summary", "Test Summary", "like"), ], "AND", SearchAPIQuery("Document"), - "(o.name = 'test name' AND o.doi < '10' AND o.doi > '3' AND o.summary" - " like '%Test Summary%')", + "(o.name = 'test name' AND o.doi like '%test doi%' AND o.doi != " + "'doi test' AND o.summary like '%Test Summary%')", id="Multiple filters on LHS and RHS", ), ],