Tests

Author: AlexanderWatzinger

install/4_data_type.sql

@@ -422,13 +422,13 @@ INSERT INTO web.hierarchy_openatlas_class (hierarchy_id, openatlas_class_name) V
 INSERT INTO model.entity (name, cidoc_class_code, description, openatlas_class_name) VALUES
   ('GeoNames', 'E32', 'Geographical database covering all countries and many places.', 'reference_system'),
   ('Wikidata', 'E32', 'A free and open knowledge base and common source of open data providing persistent identifier and links to other sources.', 'reference_system'),
-  ('GND', 'E32', 'A collection of cultural and research authority data in the German-speaking countries.', 'reference_system');
+  ('GND',      'E32', 'A collection of cultural and research authority data in the German-speaking countries.', 'reference_system');
 
 INSERT INTO web.reference_system (system, name, entity_id, resolver_url, website_url, identifier_example)
 VALUES
   (true, 'GeoNames', (SELECT id FROM model.entity WHERE name = 'GeoNames' AND cidoc_class_code = 'E32'), 'https://www.geonames.org/', 'https://www.geonames.org/', '1234567'),
   (true, 'Wikidata', (SELECT id FROM model.entity WHERE name = 'Wikidata' AND cidoc_class_code = 'E32'), 'https://www.wikidata.org/entity/', 'https://www.wikidata.org', 'Q123'),
-  (true, 'GND',      (SELECT id FROM model.entity WHERE name = 'GND'      AND cidoc_class_code = 'E32'), 'https://gnd.network/', 'https://lobid.org/gnd/', '119338467');
+  (true, 'GND',      (SELECT id FROM model.entity WHERE name = 'GND'      AND cidoc_class_code = 'E32'), 'https://lobid.org/gnd/', 'https://d-nb.info/gnd/','119338467');
 
 INSERT INTO web.reference_system_openatlas_class (reference_system_id, openatlas_class_name) VALUES
   ((SELECT entity_id FROM web.reference_system WHERE name='GeoNames'), 'place'),

install/upgrade/8.6.0.sql

@@ -20,8 +20,8 @@ SELECT
     true,
     'GND',
     (SELECT id FROM model.entity WHERE name = 'GND' AND cidoc_class_code = 'E32'),
-    'https://gnd.network/',
     'https://lobid.org/gnd/',
+    'https://d-nb.info/gnd/',
     '119338467'
 WHERE NOT EXISTS (
     SELECT 1 FROM web.reference_system WHERE name='GND'

openatlas/api/external/wikidata.py

@@ -7,10 +7,7 @@
 
 
 def add_resolver_url(id_: str) -> str:
-    return link(
-        f'Q{id_}',
-        f'{g.reference_systems[g.wikidata.id].resolver_url}Q{id_}',
-        external=True)
+    return link(f'Q{id_}', f'{g.wikidata.resolver_url}Q{id_}', external=True)
 
 
 def fetch_wikidata(id_: str) -> dict[str, Any]:

tests/test_index.py

@@ -40,16 +40,6 @@ def test_index(self) -> None:
             assert b'Database version error is needed but current' in rv.data
             assert b'directory not writable' in rv.data
 
-            rv = self.app.post(
-                url_for('ajax_wikidata_info'),
-                data={'id_': 'Q304037'})
-            assert b'National Library of Austria' in rv.data
-
-            rv = self.app.post(
-                url_for('ajax_geonames_info'),
-                data={'id_': '747712'})
-            assert b'Edirne' in rv.data
-
             rv = self.app.get('/static/non_existing_file.js')
             assert b'The site does not exist.' in rv.data
 

tests/test_reference_system.py

@@ -11,6 +11,21 @@ class ReferenceSystemTest(TestBaseCase):
     def test_reference_system(self) -> None:
         with app.app_context():
 
+            rv = self.app.post(
+                url_for('ajax_wikidata_info'),
+                data={'id_': 'Q304037'})
+            assert b'National Library of Austria' in rv.data
+
+            rv = self.app.post(
+                url_for('ajax_geonames_info'),
+                data={'id_': '747712'})
+            assert b'Edirne' in rv.data
+
+            rv = self.app.post(
+                url_for('ajax_gnd_info'),
+                data={'id_': '1158433263'})
+            assert b'Abasgulijev' in rv.data
+
             rv: Any = self.app.get(
                 url_for('insert', class_='reference_system'))
             assert b'resolver URL' in rv.data
@@ -75,7 +90,9 @@ def test_reference_system(self) -> None:
                 data={
                     'name': 'Actor test',
                     f'reference_system_id_{g.wikidata.id}':
-                        ['Q123', self.precision_type.subs[0]]})
+                        ['Q123', self.precision_type.subs[0]],
+                    f'reference_system_id_{g.gnd.id}':
+                        ['1158433263', self.precision_type.subs[0]]})
             person_id = rv.location.split('/')[-1]
 
             rv = self.app.get(url_for('view', id_=g.wikidata.id))