Skip to content

Commit

Permalink
More tests. Refs #392
Browse files Browse the repository at this point in the history
  • Loading branch information
Koen Van Daele committed Aug 31, 2017
1 parent ef9a731 commit 5d6832d
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 5 deletions.
8 changes: 4 additions & 4 deletions atramhasis/rdf.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def void_dumper(request, registry):
'''
Creates a void file with information about all void Datasets in this Atramhasis instance.
:param pyramid.request.Request request:
:param pyramid.request.Request request:
:param skosprovider.registry.Registry:
'''
providers = [
Expand Down Expand Up @@ -54,7 +54,7 @@ def void_dumper(request, registry):
)
if ldf_enabled and ldf_baseurl:
ldfurl = ldf_baseurl + '/composite{?s,p,o}'
_add_ldf_server(graph, dataset, ldfurl, request)
_add_ldf_server(graph, dataset, ldfurl)
for p in providers:
_add_provider(graph, p, dataset, request)
return graph
Expand Down Expand Up @@ -102,7 +102,7 @@ def _add_provider(graph, provider, dataseturi, request):
if ldf_enabled and ldf_baseurl:
pid = provider.get_vocabulary_id()
ldfurl = ldf_baseurl + '/' + pid + '{?s,p,o}'
_add_ldf_server(graph, pd, ldfurl, request)
_add_ldf_server(graph, pd, ldfurl)
return graph


Expand Down Expand Up @@ -156,7 +156,7 @@ def _add_metadataset(graph, subject, metadataset):
return graph


def _add_ldf_server(graph, dataseturi, ldfurl, request):
def _add_ldf_server(graph, dataseturi, ldfurl):
'''
:param rdflib.graph.Graph graph: Graph that contains the Dataset.
:param rdflib.term.URIRef subject: Uri of the Dataset.
Expand Down
22 changes: 21 additions & 1 deletion tests/test_rdf.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
from rdflib.term import URIRef, Literal
from rdflib.namespace import RDF, VOID, DCTERMS, XSD, FOAF

from atramhasis.rdf import _add_metadataset, _add_provider
from atramhasis.rdf import _add_metadataset, _add_provider, _add_ldf_server, HYDRA

from datetime import date

Expand Down Expand Up @@ -72,6 +72,7 @@ def testEmptyProvider(self):
self.assertIn((sd, FOAF.homepage, URIRef(homepage)), g)
self.assertIn((sd, VOID.dataDump, URIRef(rdfdump)), g)
self.assertIn((sd, VOID.dataDump, URIRef(ttldump)), g)
self.assertIn((sd, HYDRA.search, None), g)


class MetadatasetTests(unittest.TestCase):
Expand Down Expand Up @@ -115,3 +116,22 @@ def test_add_metadataset(self):
self.assertIn((uri, DCTERMS.license, URIRef('https://id.erfgoed.net/vocab/licences#GODL')), g)
self.assertIn((uri, DCTERMS.created, Literal(date(2016,9,14))), g)

class LdfServerTests(unittest.TestCase):
def setUp(self):
pass

def tearDown(self):
pass

def _get_graph(self):
return Graph()

def test_add_ldf_server(self):
url = Literal('http://demo.atramhasis.org/ldf{?s,p,o}')
g = self._get_graph()
uri = URIRef('http://test.atramhasis.org/void.ttl#emptyset')
g.add((uri, RDF.type, VOID.Dataset))
g = _add_ldf_server(g, uri, url)
self.assertIn((uri, HYDRA.search, None), g)
self.assertIn((None, HYDRA.template, url), g)
self.assertIn((None, HYDRA.mapping, None), g)

0 comments on commit 5d6832d

Please sign in to comment.