[DAGE-20] updated test names

Author: nicolo-rinaldi

rre-dataset-generator/src/search_engine/elasticsearch_search_engine.py

@@ -51,10 +51,7 @@ def fetch_for_query_generation(self,
                 for field, values in dict_field.items():
                     if not values:
                         continue
-                    if len(values) == 1:
-                        filter_clauses.append({"term": {field: values[0]}})
-                    else:
-                        filter_clauses.append({"terms": {field: values}})
+                    filter_clauses.append({"terms": {field: values}})
 
         # Wrap in a bool query if there are any filters
         if filter_clauses:

rre-dataset-generator/tests/unit/test_elasticsearch_search_engine.py

@@ -38,7 +38,7 @@ def mock_dict(mock_doc):
         'fields': mock_doc["_source"]
     }
 
-def test_elasticsearch_search_engine_fetch_for_query_generation(monkeypatch, elasticsearch_config, mock_doc, mock_dict):
+def test_elasticsearch_search_engine_fetch_for_query_generation__expect__result_returned(monkeypatch, elasticsearch_config, mock_doc, mock_dict):
     url = "https://fakeurl"
     search_engine = ElasticsearchSearchEngine(url)
 
@@ -54,7 +54,7 @@ def test_elasticsearch_search_engine_fetch_for_query_generation(monkeypatch, ela
                                                       doc_fields=elasticsearch_config.doc_fields)
     assert result[0] == Document(**mock_dict)
 
-def test_elasticsearch_search_engine_fetch_for_evaluation(monkeypatch, elasticsearch_config, mock_doc, mock_dict):
+def test_elasticsearch_search_engine_fetch_for_evaluation__expect__result_returned(monkeypatch, elasticsearch_config, mock_doc, mock_dict):
     url = "https://fakeurl"
     search_engine = ElasticsearchSearchEngine(url)
 
@@ -70,7 +70,7 @@ def test_elasticsearch_search_engine_fetch_for_evaluation(monkeypatch, elasticse
                                                 doc_fields=elasticsearch_config.doc_fields)
     assert result[0] == Document(**mock_dict)
 
-def test_elasticsearch_search_engine_negative_post_fetch_for_query_generation_EXPECTED_HttpError(monkeypatch, elasticsearch_config):
+def test_elasticsearch_search_engine_negative_post_fetch_for_query_generation__expect__HttpError(monkeypatch, elasticsearch_config):
     for status_code in [400, 401, 402, 403, 500]:
         monkeypatch.setattr(requests, "post", lambda *args, **kwargs: MockResponseElasticsearchEngine([],
                                                                                                     status_code=status_code))
@@ -85,7 +85,7 @@ def test_elasticsearch_search_engine_negative_post_fetch_for_query_generation_EX
             )
 
 
-def test_elasticsearch_search_engine_negative_post_fetch_for_evaluation_EXPECTED_HttpError(monkeypatch, elasticsearch_config):
+def test_elasticsearch_search_engine_negative_post_fetch_for_evaluation__expect__HttpError(monkeypatch, elasticsearch_config):
     for status_code in [400, 401, 402, 403, 500]:
         monkeypatch.setattr(requests, "post", lambda *args, **kwargs: MockResponseElasticsearchEngine([],
                                                                                                     status_code=status_code))
@@ -99,6 +99,6 @@ def test_elasticsearch_search_engine_negative_post_fetch_for_evaluation_EXPECTED
                 doc_fields=elasticsearch_config.doc_fields
             )
 
-def test_elasticsearch_search_engine_bad_url_EXPECTED_ValidationError():
+def test_elasticsearch_search_engine_bad_url__expect__ValidationError():
     with pytest.raises(ValidationError):
         _ = ElasticsearchSearchEngine("fake-NONurl")

rre-dataset-generator/tests/unit/test_solr_search_engine.py

@@ -34,7 +34,7 @@ def mock_dict(mock_doc):
         'fields': {k: v for k, v in mock_doc.items() if k != 'mock_id'}
     }
 
-def test_solr_search_engine_fetch_for_query_generation(monkeypatch, solr_config, mock_doc, mock_dict):
+def test_solr_search_engine_fetch_for_query_generation__expect__result_returned(monkeypatch, solr_config, mock_doc, mock_dict):
     monkeypatch.setattr(requests, "get", lambda *args, **kwargs: MockResponseUniqueKey(ident="mock_id"))
     search_engine = SolrSearchEngine("https://fakeurl")
 
@@ -49,7 +49,7 @@ def test_solr_search_engine_fetch_for_query_generation(monkeypatch, solr_config,
                                                       doc_fields=solr_config.doc_fields)
     assert result[0] == Document(**mock_dict)
 
-def test_solr_search_engine_fetch_for_evaluation(monkeypatch, solr_config, mock_doc, mock_dict):
+def test_solr_search_engine_fetch_for_evaluation__expect__result_returned(monkeypatch, solr_config, mock_doc, mock_dict):
     monkeypatch.setattr(requests, "get", lambda *args, **kwargs: MockResponseUniqueKey(ident="mock_id"))
     search_engine = SolrSearchEngine("https://fakeurl")
 
@@ -64,7 +64,7 @@ def test_solr_search_engine_fetch_for_evaluation(monkeypatch, solr_config, mock_
                                                 doc_fields=solr_config.doc_fields)
     assert result[0] == Document(**mock_dict)
 
-def test_solr_search_engine_negative_post_fetch_for_query_generation_EXPECTED_HttpError(monkeypatch, solr_config):
+def test_solr_search_engine_negative_post_fetch_for_query_generation__expect__HttpError(monkeypatch, solr_config):
     for status_code in [400, 401, 402, 403, 500]:
         monkeypatch.setattr(requests, "get", lambda *args, **kwargs: MockResponseUniqueKey(ident="identifier"))
         monkeypatch.setattr(requests, "post", lambda *args, **kwargs: MockResponseSolrEngine([], status_code=status_code))
@@ -79,7 +79,7 @@ def test_solr_search_engine_negative_post_fetch_for_query_generation_EXPECTED_Ht
             )
 
 
-def test_solr_search_engine_negative_post_fetch_for_evaluation_EXPECTED_HttpError(monkeypatch, solr_config):
+def test_solr_search_engine_negative_post_fetch_for_evaluation__expect__HttpError(monkeypatch, solr_config):
     for status_code in [400, 401, 402, 403, 500]:
         monkeypatch.setattr(requests, "get", lambda *args, **kwargs: MockResponseUniqueKey(ident="identifier"))
         monkeypatch.setattr(requests, "post", lambda *args, **kwargs: MockResponseSolrEngine([], status_code=status_code))
@@ -137,6 +137,6 @@ def test_template_to_json_payload(monkeypatch):
     }
     assert solr_engine._template_to_json_payload(template) == expected_payload
 
-def test_solr_search_engine_bad_url_EXPECTED_ValidationError():
+def test_solr_search_engine_bad_url__expect__ValidationError():
     with pytest.raises(ValidationError):
         _ = SolrSearchEngine("fake-NONurl")