Skip to content

Commit d3b84aa

Browse files
committed
updated tests
1 parent 501b2b0 commit d3b84aa

5 files changed

Lines changed: 18 additions & 7 deletions

File tree

ted_sws/data_manager/adapters/sparql_endpoint.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,9 @@ def fetch_rdf(self) -> rdflib.Graph:
104104
:return:
105105
"""
106106

107+
def add_data_to_repository(self, file_content, repository_name, mime_type):
108+
pass
109+
107110

108111
class SPARQLTripleStoreEndpoint(TripleStoreEndpointABC):
109112

ted_sws/data_manager/adapters/triple_store.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,16 +116,17 @@ def list_repositories(self):
116116
"""
117117
return self.allegro.openCatalog(name=self.catalog_name).listRepositories()
118118

119-
def add_data_to_repository(self, file_content: str, mime_type: str, repository_name: str = None):
119+
def add_data_to_repository(self, file_content: Union[str, bytes, bytearray], mime_type: str, repository_name: str = None):
120120
"""
121121
Method to add triples from a string
122122
:param file_content:
123123
:param repository_name:
124124
:param mime_type:
125125
:return:
126126
"""
127+
127128
repository = self._get_repository(repository_name=repository_name)
128-
repository.getConnection().addData(data=file_content, rdf_format=mime_type)
129+
repository.getConnection().addData(data=file_content)
129130

130131
def add_file_to_repository(self, file_path, repository_name: str = None):
131132
"""

ted_sws/notice_publisher_triple_store/services/load_transformed_notice_into_triple_store.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
This module implements functionality to load a given notice into a triple store.
33
"""
44
from ted_sws.data_manager.adapters.repository_abc import NoticeRepositoryABC
5-
from ted_sws.data_manager.adapters.triple_store import TripleStoreEndpointABC
5+
from ted_sws.data_manager.adapters.triple_store import TripleStoreEndpointABC, RDF_MIME_TYPES
66

77
DEFAULT_NOTICE_REPOSITORY_NAME = "notices"
88

@@ -16,6 +16,6 @@ def load_notice_into_triple_store(notice_id: str, notice_repository: NoticeRepos
1616
notice = notice_repository.get(reference=notice_id)
1717
if notice is None:
1818
raise ValueError('Notice, with "%s" notice_id, was not found' % notice_id)
19-
19+
mime_type = RDF_MIME_TYPES
2020
rdf_manifestation_string = notice.rdf_manifestation.object_data
21-
triple_store_repository.add_data_to_repository(file_content=rdf_manifestation_string, repository_name=repository_name)
21+
triple_store_repository.add_data_to_repository(file_content=rdf_manifestation_string, repository_name=repository_name, mime_type=mime_type)

tests/e2e/mapping_suite_processor/conftest.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22
import pymongo
33
import pytest
44

5+
from ted_sws.data_manager.adapters.triple_store import RDF_MIME_TYPES
56
from tests import TEST_DATA_PATH
67

8+
79
@pytest.fixture
810
@mongomock.patch(servers=(('server.example.com', 27017),))
911
def fake_mongodb_client():
@@ -14,6 +16,7 @@ def fake_mongodb_client():
1416
def file_system_repository_path():
1517
return TEST_DATA_PATH / "notice_transformer" / "mapping_suite_processor_repository"
1618

19+
1720
@pytest.fixture
1821
def yarrrml_file_content():
1922
return """prefixes:
@@ -29,6 +32,7 @@ def yarrrml_file_content():
2932
- [ex:name, $(firstname)]
3033
"""
3134

35+
3236
@pytest.fixture
3337
def rml_file_result():
3438
return """@prefix rr: <http://www.w3.org/ns/r2rml#>.
@@ -84,3 +88,6 @@ def package_folder_path():
8488
return TEST_DATA_PATH / "notice_validator" / "test_repository" / "test_package"
8589

8690

91+
@pytest.fixture
92+
def mime_type():
93+
return RDF_MIME_TYPES

tests/e2e/mapping_suite_processor/test_allegro_triple_store.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11

22

3-
def test_allegro_allegro_triple_store(ttl_file, path_ttl_file, allegro_triple_store):
3+
def test_allegro_triple_store(ttl_file, path_ttl_file, allegro_triple_store, mime_type):
44
allegro_triple_store.create_repository(repository_name="testing")
55
assert isinstance(allegro_triple_store.list_repositories(), list)
66
assert "testing" in allegro_triple_store.list_repositories()
7-
allegro_triple_store.add_data_to_repository(file_content=ttl_file, repository_name="testing")
7+
allegro_triple_store.add_data_to_repository(file_content=ttl_file,mime_type=mime_type,repository_name="testing")
88
allegro_triple_store.add_file_to_repository(file_path=path_ttl_file, repository_name="testing")
99
assert allegro_triple_store._get_repository(repository_name="testing").getConnection().size() == 484
1010
allegro_triple_store.delete_repository(repository_name="testing")

0 commit comments

Comments
 (0)