Skip to content

Commit 7ee2a7c

Browse files
committed
fixes prefix configuration test
1 parent 3e87b5e commit 7ee2a7c

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed

lodstorage/prefix_config.py

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,8 @@ def __post_init__(self):
2828
"""
2929
Set default values after initialization
3030
"""
31-
if self.prefix_prefix is None:
32-
self.prefix_prefix = self.name
33-
31+
# nothing to do yet
32+
pass
3433

3534
def as_text(self) -> str:
3635
"""
@@ -56,10 +55,14 @@ def ofYaml(cls, yaml_path: str) -> "PrefixConfigs":
5655
return prefix_configs
5756

5857
def __post_init__(self):
59-
""" """
58+
"""
59+
initialize all prefixes and test prefix prefix for all prefix configs
60+
"""
6061
self.all_prefixes = {}
61-
for prefix_config in self.prefix_sets.values():
62-
self.all_prefixes.update(prefix_config.prefixes)
62+
for key, prefix_config in self.prefix_sets.items():
63+
if prefix_config.prefix_prefix is None:
64+
prefix_config.prefix_prefix = key
65+
self.all_prefixes.update(prefix_config.prefixes)
6366
pass
6467

6568
def get_selected_declarations(self, prefix_set: List[str]) -> str:

sampledata/prefixes.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ prefix_sets:
194194
freebase:
195195
name: "Freebase"
196196
wikidata_id: "Q1453477"
197-
url: "http://www.freebase.com/"
197+
url: "https://en.wikipedia.org/wiki/Freebase_(database)"
198198
description: "Freebase online knowledge base (2007–2016)"
199199
prefixes:
200200
fb: "http://rdf.freebase.com/ns/"

tests/test_prefix_config.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,13 +101,13 @@ def test_issue_150_url_and_prefix_prefix(self):
101101

102102
# Check defaults
103103
rdf = pfix_configs.prefix_sets["rdf"]
104-
self.assertEqual("rdf", rdf.name)
104+
self.assertEqual("RDF", rdf.name)
105105
self.assertEqual("rdf", rdf.prefix_prefix)
106106
self.assertEqual("https://www.w3.org/rdf/", rdf.url)
107107

108108
# Check override
109109
wikidata = pfix_configs.prefix_sets["wikidata"]
110-
self.assertEqual("wikidata", wikidata.name)
110+
self.assertEqual("Wikidata", wikidata.name)
111111
self.assertEqual("wiki", wikidata.prefix_prefix)
112112
debug=self.debug
113113
debug=True

0 commit comments

Comments
 (0)