From 1c8320efa0a5aebd2dcea2a42ba159eb2b1560c3 Mon Sep 17 00:00:00 2001 From: kouralex <1723419+kouralex@users.noreply.github.com> Date: Tue, 11 Feb 2020 12:36:14 +0200 Subject: [PATCH] do not use relative IRIs in assembler file; upgrade to TDB2; rename /ds to /skosmos-test; fixes #932 --- tests/GenericSparqlTest.php | 30 ++++----- tests/GlobalConfigTest.php | 2 +- tests/JenaTextSparqlTest.php | 6 +- tests/ModelTest.php | 2 +- tests/VocabularyTest.php | 2 +- tests/fuseki-assembler.ttl | 108 ++++++++++++++++--------------- tests/init_fuseki.sh | 2 +- tests/jenatestconfig.ttl | 38 +++++------ tests/testconfig-fordefaults.ttl | 2 +- tests/testconfig.ttl | 46 ++++++------- 10 files changed, 120 insertions(+), 118 deletions(-) mode change 100644 => 100755 tests/fuseki-assembler.ttl diff --git a/tests/GenericSparqlTest.php b/tests/GenericSparqlTest.php index 5604bbf70..801129dfa 100644 --- a/tests/GenericSparqlTest.php +++ b/tests/GenericSparqlTest.php @@ -16,14 +16,14 @@ protected function setUp() { $this->vocab = $this->model->getVocabulary('test'); $this->graph = $this->vocab->getGraph(); $this->params = $this->getMockBuilder('ConceptSearchParameters')->disableOriginalConstructor()->getMock(); - $this->sparql = new GenericSparql('http://localhost:13030/ds/sparql', $this->graph, $this->model); + $this->sparql = new GenericSparql('http://localhost:13030/skosmos-test/sparql', $this->graph, $this->model); } /** * @covers GenericSparql::__construct */ public function testConstructor() { - $gs = new GenericSparql('http://localhost:13030/ds/sparql', $this->graph, $this->model); + $gs = new GenericSparql('http://localhost:13030/skosmos-test/sparql', $this->graph, $this->model); $this->assertInstanceOf('GenericSparql', $gs); } @@ -31,7 +31,7 @@ public function testConstructor() { * @covers GenericSparql::getGraph */ public function testGetGraph() { - $gs = new GenericSparql('http://localhost:13030/ds/sparql', $this->graph, $this->model); + $gs = new GenericSparql('http://localhost:13030/skosmos-test/sparql', $this->graph, $this->model); $this->assertEquals($this->graph, $gs->getGraph()); } @@ -236,7 +236,7 @@ public function testQueryConceptsAlphabeticalFull() { */ public function testQueryConceptInfoWithMultipleVocabs() { - $this->sparql = new GenericSparql('http://localhost:13030/ds/sparql', '?graph', $this->model); + $this->sparql = new GenericSparql('http://localhost:13030/skosmos-test/sparql', '?graph', $this->model); $voc2 = $this->model->getVocabulary('test'); $voc3 = $this->model->getVocabulary('dates'); $voc4 = $this->model->getVocabulary('groups'); @@ -258,7 +258,7 @@ public function testQueryConceptInfoWithMultipleVocabs() */ public function testQueryConceptInfoWithAllVocabs() { - $this->sparql = new GenericSparql('http://localhost:13030/ds/sparql', '?graph', $this->model); + $this->sparql = new GenericSparql('http://localhost:13030/skosmos-test/sparql', '?graph', $this->model); $actual = $this->sparql->queryConceptInfo(array('http://www.skosmos.skos/test/ta121', 'http://www.skosmos.skos/groups/ta111'), null, null, 'en'); $this->assertInstanceOf('Concept', $actual[0]); $this->assertEquals('http://www.skosmos.skos/test/ta121', $actual[0]->getUri()); @@ -335,7 +335,7 @@ public function testQueryConceptScheme() { $actual = $this->sparql->queryConceptScheme('http://www.skosmos.skos/test/conceptscheme'); $this->assertInstanceOf('EasyRdf\Graph', $actual); - $this->assertEquals('http://localhost:13030/ds/sparql', $actual->getUri()); + $this->assertEquals('http://localhost:13030/skosmos-test/sparql', $actual->getUri()); } /** @@ -359,7 +359,7 @@ public function testQueryConceptSchemes() */ public function testQueryConceptSchemesSubject() { - $sparql = new GenericSparql('http://localhost:13030/ds/sparql', 'http://www.skosmos.skos/test-concept-schemes/', $this->model); + $sparql = new GenericSparql('http://localhost:13030/skosmos-test/sparql', 'http://www.skosmos.skos/test-concept-schemes/', $this->model); $actual = $sparql->queryConceptSchemes('en'); $expected = array( @@ -411,7 +411,7 @@ public function testQueryConceptsMultipleVocabs() $voc2 = $this->model->getVocabulary('groups'); $this->params->method('getSearchTerm')->will($this->returnValue('Carp')); $this->params->method('getVocabs')->will($this->returnValue(array($voc, $voc2))); - $sparql = new GenericSparql('http://localhost:13030/ds/sparql', '?graph', $this->model); + $sparql = new GenericSparql('http://localhost:13030/skosmos-test/sparql', '?graph', $this->model); $actual = $sparql->queryConcepts(array($voc, $voc2), null, null, $this->params); $this->assertEquals(2, sizeof($actual)); $this->assertEquals('http://www.skosmos.skos/groups/ta112', $actual[0]['uri']); @@ -434,7 +434,7 @@ public function testQueryConceptsMultipleSchemes() // returns 3 concepts without the scheme limit, and only 2 with the scheme limit below $this->params->method('getSearchTerm')->will($this->returnValue('concept*')); $this->params->method('getSchemeLimit')->will($this->returnValue(array('http://www.skosmos.skos/multiple-schemes/cs1', 'http://www.skosmos.skos/multiple-schemes/cs2'))); - $sparql = new GenericSparql('http://localhost:13030/ds/sparql', 'http://www.skosmos.skos/multiple-schemes/', $this->model); + $sparql = new GenericSparql('http://localhost:13030/skosmos-test/sparql', 'http://www.skosmos.skos/multiple-schemes/', $this->model); $actual = $sparql->queryConcepts(array($voc), null, null, $this->params); $this->assertEquals(2, sizeof($actual)); $this->assertEquals('http://www.skosmos.skos/multiple-schemes/c1-in-cs1', $actual[0]['uri']); @@ -894,7 +894,7 @@ public function testListConceptGroups() { $voc = $this->model->getVocabulary('groups'); $graph = $voc->getGraph(); - $sparql = new GenericSparql('http://localhost:13030/ds/sparql', $graph, $this->model); + $sparql = new GenericSparql('http://localhost:13030/skosmos-test/sparql', $graph, $this->model); $actual = $sparql->ListConceptGroups('http://www.w3.org/2004/02/skos/core#Collection', 'en', false); $expected = array (0 => array ('prefLabel' => 'Fish', 'uri' => 'http://www.skosmos.skos/groups/fish', 'hasMembers' => true, 'childGroups' => array('http://www.skosmos.skos/groups/sub')), 1 => array ('prefLabel' => 'Freshwater fish', 'uri' => 'http://www.skosmos.skos/groups/fresh', 'hasMembers' => true), 2 => array ('prefLabel' => 'Saltwater fish', 'uri' => 'http://www.skosmos.skos/groups/salt', 'hasMembers' => true),3 => array ('prefLabel' => 'Submarine-like fish', 'uri' => 'http://www.skosmos.skos/groups/sub', 'hasMembers' => true)); $this->assertEquals($expected, $actual); @@ -909,7 +909,7 @@ public function testListConceptGroupContentsExcludingDeprecatedConcept() { $voc = $this->model->getVocabulary('groups'); $graph = $voc->getGraph(); - $sparql = new GenericSparql('http://localhost:13030/ds/sparql', $graph, $this->model); + $sparql = new GenericSparql('http://localhost:13030/skosmos-test/sparql', $graph, $this->model); $actual = $sparql->ListConceptGroupContents('http://www.w3.org/2004/02/skos/core#Collection', 'http://www.skosmos.skos/groups/salt', 'en'); $this->assertEquals('http://www.skosmos.skos/groups/ta113', $actual[0]['uri']); $this->assertEquals(1, sizeof($actual)); @@ -924,7 +924,7 @@ public function testListConceptGroupContentsIncludingDeprecatedConcept() { $voc = $this->model->getVocabulary('showDeprecated'); $graph = $voc->getGraph(); - $sparql = new GenericSparql('http://localhost:13030/ds/sparql', $graph, $this->model); + $sparql = new GenericSparql('http://localhost:13030/skosmos-test/sparql', $graph, $this->model); $actual = $sparql->ListConceptGroupContents('http://www.w3.org/2004/02/skos/core#Collection', 'http://www.skosmos.skos/groups/salt', 'en', $voc->getConfig()->getShowDeprecated()); $expected = array ( 0 => array ( @@ -955,7 +955,7 @@ public function testQueryChangeList() { $voc = $this->model->getVocabulary('changes'); $graph = $voc->getGraph(); - $sparql = new GenericSparql('http://localhost:13030/ds/sparql', $graph, $this->model); + $sparql = new GenericSparql('http://localhost:13030/skosmos-test/sparql', $graph, $this->model); $actual = $sparql->queryChangeList('en', 0, 'dc11:created'); $order = array(); foreach($actual as $concept) { @@ -973,7 +973,7 @@ public function testLimitSearchToType() { $voc = $this->model->getVocabulary('test'); $graph = $voc->getGraph(); - $sparql = new GenericSparql('http://localhost:13030/ds/sparql', $graph, $this->model); + $sparql = new GenericSparql('http://localhost:13030/skosmos-test/sparql', $graph, $this->model); $this->params->method('getSearchTerm')->will($this->returnValue('*')); $this->params->method('getTypeLimit')->will($this->returnValue(array('mads:Topic'))); $actual = $this->sparql->queryConcepts(array($voc), null, true, $this->params); @@ -1013,7 +1013,7 @@ public function testQueryConceptsWithExtraFields() */ public function testQuerySuperProperties() { - $this->sparql = new GenericSparql('http://localhost:13030/ds/sparql', '?graph', $this->model); + $this->sparql = new GenericSparql('http://localhost:13030/skosmos-test/sparql', '?graph', $this->model); $actual = $this->sparql->querySuperProperties('http://example.com/myns#property'); $this->assertEquals(1, sizeof($actual)); $expected = array('http://example.com/myns#superProperty'); diff --git a/tests/GlobalConfigTest.php b/tests/GlobalConfigTest.php index 86598e4a4..53f7313a4 100644 --- a/tests/GlobalConfigTest.php +++ b/tests/GlobalConfigTest.php @@ -23,7 +23,7 @@ protected function setUp() public function testGetDefaultEndpoint() { - $this->assertEquals("http://localhost:13030/ds/sparql", $this->config->getDefaultEndpoint()); + $this->assertEquals("http://localhost:13030/skosmos-test/sparql", $this->config->getDefaultEndpoint()); } public function testGetDefaultSparqlDialect() diff --git a/tests/JenaTextSparqlTest.php b/tests/JenaTextSparqlTest.php index 9189fd809..f8384bcdd 100644 --- a/tests/JenaTextSparqlTest.php +++ b/tests/JenaTextSparqlTest.php @@ -16,14 +16,14 @@ protected function setUp() { $this->vocab = $this->model->getVocabulary('test'); $this->graph = $this->vocab->getGraph(); $this->params = $this->getMockBuilder('ConceptSearchParameters')->disableOriginalConstructor()->getMock(); - $this->sparql = new JenaTextSparql('http://localhost:13030/ds/sparql', $this->graph, $this->model); + $this->sparql = new JenaTextSparql('http://localhost:13030/skosmos-test/sparql', $this->graph, $this->model); } /** * @covers JenaTextSparql::__construct */ public function testConstructor() { - $gs = new JenaTextSparql('http://localhost:13030/ds/sparql', $this->graph, $this->model); + $gs = new JenaTextSparql('http://localhost:13030/skosmos-test/sparql', $this->graph, $this->model); $this->assertInstanceOf('JenaTextSparql', $gs); } @@ -181,7 +181,7 @@ public function testQueryConceptsDefaultGraph() public function testQueryConceptsAlphabeticalOrderBy() { $vocab = $this->model->getVocabulary('collation'); $graph = $vocab->getGraph(); - $sparql = new JenaTextSparql('http://localhost:13030/ds/sparql', $graph, $this->model); + $sparql = new JenaTextSparql('http://localhost:13030/skosmos-test/sparql', $graph, $this->model); $actual = $sparql->queryConceptsAlphabetical('t', 'fi'); $expected = array ( 0 => array ( diff --git a/tests/ModelTest.php b/tests/ModelTest.php index e2cbc8689..ba4da5fb0 100644 --- a/tests/ModelTest.php +++ b/tests/ModelTest.php @@ -93,7 +93,7 @@ public function testGetVocabularyByGraphUri() { /** * @covers Model::getVocabularyByGraph * @expectedException \Exception - * @expectedExceptionMessage no vocabulary found for graph http://no/address and endpoint http://localhost:13030/ds/sparql + * @expectedExceptionMessage no vocabulary found for graph http://no/address and endpoint http://localhost:13030/skosmos-test/sparql */ public function testGetVocabularyByInvalidGraphUri() { $vocab = $this->model->getVocabularyByGraph('http://no/address'); diff --git a/tests/VocabularyTest.php b/tests/VocabularyTest.php index b01bca6dc..163710ce8 100644 --- a/tests/VocabularyTest.php +++ b/tests/VocabularyTest.php @@ -38,7 +38,7 @@ public function testGetTitle() { public function testGetEndpoint() { $vocab = $this->model->getVocabulary('testdiff'); $endpoint = $vocab->getEndpoint(); - $this->assertEquals('http://localhost:13030/ds/sparql', $endpoint); + $this->assertEquals('http://localhost:13030/skosmos-test/sparql', $endpoint); } /** diff --git a/tests/fuseki-assembler.ttl b/tests/fuseki-assembler.ttl old mode 100644 new mode 100755 index 2600cb9fb..d3026c8b2 --- a/tests/fuseki-assembler.ttl +++ b/tests/fuseki-assembler.ttl @@ -1,79 +1,81 @@ -## Example of a TDB dataset and text index published using Fuseki +@prefix : . +@prefix rdf: . +@prefix tdb2: . +@prefix ja: . +@prefix rdfs: . +@prefix fuseki: . +@prefix text: . +@prefix skos: . -@prefix : <#> . -@prefix fuseki: . -@prefix rdf: . -@prefix rdfs: . -@prefix tdb: . -@prefix ja: . -@prefix text: . -@prefix skos: . +ja:DatasetTxnMem rdfs:subClassOf ja:RDFDataset . +ja:MemoryDataset rdfs:subClassOf ja:RDFDataset . +ja:RDFDatasetOne rdfs:subClassOf ja:RDFDataset . +ja:RDFDatasetSink rdfs:subClassOf ja:RDFDataset . +ja:RDFDatasetZero rdfs:subClassOf ja:RDFDataset . +tdb2:DatasetTDB rdfs:subClassOf ja:RDFDataset . +tdb2:DatasetTDB2 rdfs:subClassOf ja:RDFDataset . -[] rdf:type fuseki:Server ; - fuseki:services ( - <#service_text_tdb> - ) . +tdb2:GraphTDB rdfs:subClassOf ja:Model . +tdb2:GraphTDB2 rdfs:subClassOf ja:Model . -# TDB -[] ja:loadClass "com.hp.hpl.jena.tdb.TDB" . -tdb:DatasetTDB rdfs:subClassOf ja:RDFDataset . -tdb:GraphTDB rdfs:subClassOf ja:Model . + + rdfs:subClassOf ja:RDFDataset . -# Text -[] ja:loadClass "org.apache.jena.query.text.TextQuery" . -text:TextDataset rdfs:subClassOf ja:RDFDataset . -#text:TextIndexSolr rdfs:subClassOf text:TextIndex . -text:TextIndexLucene rdfs:subClassOf text:TextIndex . + + rdfs:subClassOf ja:Model . -## --------------------------------------------------------------- +text:TextDataset + rdfs:subClassOf ja:RDFDataset . -<#service_text_tdb> rdf:type fuseki:Service ; - rdfs:label "TDB/text service" ; - fuseki:name "ds" ; - fuseki:serviceQuery "query" ; - fuseki:serviceQuery "sparql" ; - fuseki:serviceUpdate "update" ; - fuseki:serviceUpload "upload" ; - fuseki:serviceReadGraphStore "get" ; - fuseki:serviceReadWriteGraphStore "data" ; - fuseki:dataset <#text_dataset> ; - . +:service_tdb_all a fuseki:Service ; + rdfs:label "TDB2+text skosmos" ; + fuseki:dataset :text_dataset ; + fuseki:name "skosmos-test" ; + fuseki:serviceQuery "query" , "" , "sparql" ; + fuseki:serviceReadGraphStore "get" ; + fuseki:serviceReadQuads "" ; + fuseki:serviceReadWriteGraphStore "data" ; + fuseki:serviceReadWriteQuads "" ; + fuseki:serviceUpdate "" , "update" ; + fuseki:serviceUpload "upload" . -<#text_dataset> rdf:type text:TextDataset ; - text:dataset <#dataset> ; - text:index <#indexLucene> ; - . +:text_dataset a text:TextDataset ; + text:dataset :tdb_dataset_readwrite ; + text:index :index_lucene . -<#dataset> rdf:type tdb:DatasetTDB ; - tdb:location "--mem--" ; - tdb:unionDefaultGraph true ; - . +:tdb_dataset_readwrite + a tdb2:DatasetTDB2 ; + tdb2:unionDefaultGraph true ; + tdb2:location "--mem--" . -<#indexLucene> a text:TextIndexLucene ; +:index_lucene a text:TextIndexLucene ; ##text:directory ; text:directory "mem" ; - text:entityMap <#entMap> ; - text:storeValues true ; - . + text:entityMap :entity_map ; + text:storeValues true . -<#entMap> a text:EntityMap ; +# Text index configuration +:entity_map a text:EntityMap ; text:entityField "uri" ; - text:graphField "graph" ; ## enable graph-specific indexing - text:defaultField "pref" ; ## Must be defined in the text:map + text:graphField "graph" ; + text:defaultField "pref" ; text:uidField "uid" ; text:langField "lang" ; text:map ( # skos:prefLabel [ text:field "pref" ; text:predicate skos:prefLabel ; - text:analyzer [ a text:LowerCaseKeywordAnalyzer ] ] + text:analyzer [ a text:LowerCaseKeywordAnalyzer ] + ] # skos:altLabel [ text:field "alt" ; text:predicate skos:altLabel ; - text:analyzer [ a text:LowerCaseKeywordAnalyzer ] ] + text:analyzer [ a text:LowerCaseKeywordAnalyzer ] + ] # skos:hiddenLabel [ text:field "hidden" ; text:predicate skos:hiddenLabel ; - text:analyzer [ a text:LowerCaseKeywordAnalyzer ] ] - ) . + text:analyzer [ a text:LowerCaseKeywordAnalyzer ] + ] + ) . diff --git a/tests/init_fuseki.sh b/tests/init_fuseki.sh index 44ac29bb6..0d68541ad 100755 --- a/tests/init_fuseki.sh +++ b/tests/init_fuseki.sh @@ -29,7 +29,7 @@ done for fn in ../test-vocab-data/*.ttl; do name=$(basename "${fn}" .ttl) - $(./bin/s-put http://localhost:13030/ds/data "http://www.skosmos.skos/$name/" "$fn") + $(./bin/s-put http://localhost:13030/skosmos-test/data "http://www.skosmos.skos/$name/" "$fn") done cd .. diff --git a/tests/jenatestconfig.ttl b/tests/jenatestconfig.ttl index e83ed034a..ae43fb5f1 100644 --- a/tests/jenatestconfig.ttl +++ b/tests/jenatestconfig.ttl @@ -21,7 +21,7 @@ :config a skosmos:Configuration ; # SPARQL endpoint # a local Fuseki server is usually on localhost:3030 - skosmos:sparqlEndpoint "http://localhost:3030/ds/sparql" ; + skosmos:sparqlEndpoint "http://localhost:13030/skosmos-test/sparql" ; # sparql-query extension, or "Generic" for plain SPARQL 1.1 # set to "JenaText" instead if you use Fuseki with jena-text index skosmos:sparqlDialect "JenaText" ; @@ -70,7 +70,7 @@ dc:subject :cat_science ; dc:type mdrtype:ONTOLOGY ; void:dataDump ; - void:sparqlEndpoint ; + void:sparqlEndpoint ; void:uriSpace "http://www.skosmos.skos/test/"; skos:prefLabel "Test ontology"@en ; skosmos:arrayClass isothes:ThesaurusArray ; @@ -87,7 +87,7 @@ skos:prefLabel "Mutiple Schemes vocabulary"@en ; dc:title "Mutiple Schemes vocabulary"@en ; dc:type mdrtype:ONTOLOGY ; - void:sparqlEndpoint ; + void:sparqlEndpoint ; void:uriSpace "http://www.skosmos.skos/multiple-schemes/"; skosmos:defaultLanguage "en"; skosmos:language "en"; @@ -98,7 +98,7 @@ dc11:title "Test ontology 2"@en ; dc:subject :cat_general ; void:uriSpace "http://www.skosmos.skos/onto/testdiff#"; - void:sparqlEndpoint ; + void:sparqlEndpoint ; skosmos:language "fi", "en"; skosmos:sparqlDialect "JenaText"; skosmos:fullAlphabeticalIndex "true"; @@ -117,7 +117,7 @@ void:uriSpace "http://www.skosmos.skos/onto/groups/"; skosmos:arrayClass isothes:ThesaurusArray ; skosmos:groupClass skos:Collection ; - void:sparqlEndpoint ; + void:sparqlEndpoint ; skosmos:language "fi", "en"; skosmos:defaultLanguage "fi"; skosmos:indexShowClass meta:TestClass, meta:TestClass2; @@ -132,7 +132,7 @@ void:uriSpace "http://www.exemple.fr/"; skosmos:arrayClass isothes:ThesaurusArray ; skosmos:groupClass skos:Collection ; - void:sparqlEndpoint ; + void:sparqlEndpoint ; skosmos:language "en"; skosmos:defaultLanguage "en"; skosmos:sparqlGraph . @@ -145,7 +145,7 @@ void:uriSpace "http://www.skosmos.skos/onto/groups/"; skosmos:arrayClass isothes:ThesaurusArray ; skosmos:groupClass skos:Collection ; - void:sparqlEndpoint ; + void:sparqlEndpoint ; skosmos:language "fi", "en"; skosmos:defaultLanguage "fi"; skosmos:showDeprecated "true"; @@ -155,7 +155,7 @@ dc11:title "Cycle test vocabulary"@en ; dc:subject :cat_general ; void:uriSpace "http://www.skosmos.skos/onto/cycle/"; - void:sparqlEndpoint ; + void:sparqlEndpoint ; skosmos:language "en"; skosmos:sparqlGraph . @@ -163,7 +163,7 @@ dc11:title "Duplicate labels test vocabulary"@en ; dc:subject :cat_general ; void:uriSpace "http://www.skosmos.skos/onto/dup/"; - void:sparqlEndpoint ; + void:sparqlEndpoint ; skosmos:language "en"; skosmos:sparqlGraph . @@ -174,7 +174,7 @@ rdfs:label "Date information vocabulary"@en ; dc:subject :cat_general ; void:uriSpace "http://www.skosmos.skos/onto/date/"; - void:sparqlEndpoint ; + void:sparqlEndpoint ; skosmos:language "en"; skosmos:showPropertyInSearch skos:exactMatch; skosmos:hasMultiLingualProperty skos:altLabel ; @@ -185,7 +185,7 @@ dc11:title "Vocabulary with mappings"@en ; dc:subject :cat_general ; void:uriSpace "http://www.skosmos.skos/onto/mapping/"; - void:sparqlEndpoint ; + void:sparqlEndpoint ; skosmos:language "en"; skosmos:sparqlGraph . @@ -193,7 +193,7 @@ dc11:title "A vocabulary for testing the change list creation"@en ; dc:subject :cat_general ; void:uriSpace "http://www.skosmos.skos/changes/"; - void:sparqlEndpoint ; + void:sparqlEndpoint ; skosmos:language "en"; skosmos:sparqlGraph . @@ -201,7 +201,7 @@ dc11:title "A vocabulary for testing custom prefixes"@en ; dc:subject :cat_general ; void:uriSpace "http://www.skosmos.skos/prefix/"; - void:sparqlEndpoint ; + void:sparqlEndpoint ; skosmos:language "en"; skosmos:sparqlGraph . @@ -209,7 +209,7 @@ dc11:title "Subproperties of hiddenLabel"@en ; dc:subject :cat_general ; void:uriSpace "http://www.skosmos.skos/sub/"; - void:sparqlEndpoint ; + void:sparqlEndpoint ; skosmos:language "en"; skosmos:sparqlGraph . @@ -217,7 +217,7 @@ dc11:title "SuperGroup and member relationship double trouble"@en ; dc:subject :cat_general ; void:uriSpace "http://www.skosmos.skos/onto/dupgroup/"; - void:sparqlEndpoint ; + void:sparqlEndpoint ; skosmos:language "en"; skosmos:sparqlGraph . @@ -225,7 +225,7 @@ dc11:title "A vocabulary for testing language subtags"@en ; dc:subject :cat_general ; void:uriSpace "http://www.skosmos.skos/subtag/"; - void:sparqlEndpoint ; + void:sparqlEndpoint ; skosmos:language "en"; skosmos:fallbackLanguages ( "fr" "de" "sv" ) ; skosmos:sparqlGraph ; @@ -235,7 +235,7 @@ dc11:title "A vocabulary for test SPARQL with collation"@en ; dc:subject :cat_general ; void:uriSpace "http://www.skosmos.skos/collation/"; - void:sparqlEndpoint ; + void:sparqlEndpoint ; skosmos:language "fi"; skosmos:sparqlGraph . @@ -247,7 +247,7 @@ skosmos:externalProperty dc11:creator ; skosmos:externalProperty dc11:relation ; skosmos:externalProperty rdfs:comment ; - void:sparqlEndpoint ; + void:sparqlEndpoint ; skosmos:language "en"; skosmos:sparqlGraph . @@ -255,7 +255,7 @@ dc11:title "A vocabulary for testing SKOS XL"@en ; dc:subject :cat_general ; void:uriSpace "http://www.skosmos.skos/xl/"; - void:sparqlEndpoint ; + void:sparqlEndpoint ; skosmos:language "en"; skosmos:sparqlGraph . diff --git a/tests/testconfig-fordefaults.ttl b/tests/testconfig-fordefaults.ttl index 972c4f0b1..429cde549 100644 --- a/tests/testconfig-fordefaults.ttl +++ b/tests/testconfig-fordefaults.ttl @@ -23,7 +23,7 @@ dc:subject :cat_science ; dc:type mdrtype:ONTOLOGY ; void:dataDump ; - void:sparqlEndpoint ; + void:sparqlEndpoint ; void:uriSpace "http://www.skosmos.skos/test/"; skos:prefLabel "Test ontology"@en ; skosmos:arrayClass isothes:ThesaurusArray ; diff --git a/tests/testconfig.ttl b/tests/testconfig.ttl index 211c6f7c0..ba53976a5 100644 --- a/tests/testconfig.ttl +++ b/tests/testconfig.ttl @@ -22,7 +22,7 @@ :config a skosmos:Configuration ; # SPARQL endpoint # a local Fuseki server is usually on localhost:3030 - skosmos:sparqlEndpoint ; + skosmos:sparqlEndpoint ; # sparql-query extension, or "Generic" for plain SPARQL 1.1 # set to "JenaText" instead if you use Fuseki with jena-text index skosmos:sparqlDialect "JenaText" ; @@ -73,7 +73,7 @@ dc:subject :cat_science ; dc:type mdrtype:ONTOLOGY ; void:dataDump ; - void:sparqlEndpoint ; + void:sparqlEndpoint ; void:uriSpace "http://www.skosmos.skos/test/"; skos:prefLabel "Test ontology"@en ; skosmos:arrayClass isothes:ThesaurusArray ; @@ -93,7 +93,7 @@ dc:type mdrtype:ONTOLOGY ; void:dataDump ; void:dataDump ; - void:sparqlEndpoint ; + void:sparqlEndpoint ; void:uriSpace "http://www.skosmos.skos/test-marc/"; skosmos:defaultLanguage "fi" ; skosmos:marcSourceCode "test/fin"@fi, "test/swe"@sv ; @@ -106,7 +106,7 @@ dc:title "Test undefined marc source"@en ; dc:type mdrtype:ONTOLOGY ; void:dataDump ; - void:sparqlEndpoint ; + void:sparqlEndpoint ; void:uriSpace "http://www.skosmos.skos/test-marc/" ; skosmos:defaultLanguage "fi" ; skosmos:marcSourceCode "test/fin"@fi, "test/swe"@sv ; @@ -126,7 +126,7 @@ skos:prefLabel "Mutiple Schemes vocabulary"@en ; dc:title "Mutiple Schemes vocabulary"@en ; dc:type mdrtype:ONTOLOGY ; - void:sparqlEndpoint ; + void:sparqlEndpoint ; void:uriSpace "http://www.skosmos.skos/multiple-schemes/"; skosmos:defaultLanguage "en"; skosmos:marcSourceCode "ysa/gen"; @@ -138,7 +138,7 @@ dc11:title "Test ontology 2"@en ; dc:subject :cat_general ; void:uriSpace "http://www.skosmos.skos/onto/testdiff#"; - void:sparqlEndpoint ; + void:sparqlEndpoint ; skosmos:language "fi", "en"; skosmos:sparqlDialect "JenaText"; skosmos:fullAlphabeticalIndex "true"; @@ -157,7 +157,7 @@ void:uriSpace "http://www.skosmos.skos/onto/groups/"; skosmos:arrayClass isothes:ThesaurusArray ; skosmos:groupClass skos:Collection ; - void:sparqlEndpoint ; + void:sparqlEndpoint ; skosmos:language "fi", "en"; skosmos:defaultLanguage "fi"; skosmos:indexShowClass meta:TestClass, meta:TestClass2; @@ -172,7 +172,7 @@ void:uriSpace "http://www.exemple.fr/"; skosmos:arrayClass isothes:ThesaurusArray ; skosmos:groupClass skos:Collection ; - void:sparqlEndpoint ; + void:sparqlEndpoint ; skosmos:language "en"; skosmos:defaultLanguage "en"; skosmos:sparqlGraph . @@ -185,7 +185,7 @@ void:uriSpace "http://www.skosmos.skos/onto/groups/"; skosmos:arrayClass isothes:ThesaurusArray ; skosmos:groupClass skos:Collection ; - void:sparqlEndpoint ; + void:sparqlEndpoint ; skosmos:language "fi", "en"; skosmos:defaultLanguage "fi"; skosmos:showDeprecated "true"; @@ -195,7 +195,7 @@ dc11:title "Cycle test vocabulary"@en ; dc:subject :cat_general ; void:uriSpace "http://www.skosmos.skos/onto/cycle/"; - void:sparqlEndpoint ; + void:sparqlEndpoint ; skosmos:language "en"; skosmos:sparqlGraph . @@ -203,7 +203,7 @@ dc11:title "Duplicate labels test vocabulary"@en ; dc:subject :cat_general ; void:uriSpace "http://www.skosmos.skos/onto/dup/"; - void:sparqlEndpoint ; + void:sparqlEndpoint ; skosmos:language "en"; skosmos:sparqlGraph . @@ -214,7 +214,7 @@ rdfs:label "Date information vocabulary"@en ; dc:subject :cat_general ; void:uriSpace "http://www.skosmos.skos/onto/date/"; - void:sparqlEndpoint ; + void:sparqlEndpoint ; skosmos:language "en"; skosmos:showPropertyInSearch skos:exactMatch; skosmos:hasMultiLingualProperty skos:altLabel ; @@ -225,7 +225,7 @@ dc11:title "Vocabulary with mappings"@en ; dc:subject :cat_general ; void:uriSpace "http://www.skosmos.skos/onto/mapping/"; - void:sparqlEndpoint ; + void:sparqlEndpoint ; skosmos:language "en"; skosmos:sparqlGraph . @@ -233,7 +233,7 @@ dc11:title "A vocabulary for testing the change list creation"@en ; dc:subject :cat_general ; void:uriSpace "http://www.skosmos.skos/changes/"; - void:sparqlEndpoint ; + void:sparqlEndpoint ; skosmos:language "en"; skosmos:sparqlGraph . @@ -241,7 +241,7 @@ dc11:title "A vocabulary for testing custom prefixes"@en ; dc:subject :cat_general ; void:uriSpace "http://www.skosmos.skos/prefix/"; - void:sparqlEndpoint ; + void:sparqlEndpoint ; skosmos:language "en"; skosmos:sparqlGraph . @@ -249,7 +249,7 @@ dc11:title "Subproperties of hiddenLabel"@en ; dc:subject :cat_general ; void:uriSpace "http://www.skosmos.skos/sub/"; - void:sparqlEndpoint ; + void:sparqlEndpoint ; skosmos:language "en"; skosmos:sparqlGraph . @@ -257,7 +257,7 @@ dc11:title "SuperGroup and member relationship double trouble"@en ; dc:subject :cat_general ; void:uriSpace "http://www.skosmos.skos/onto/dupgroup/"; - void:sparqlEndpoint ; + void:sparqlEndpoint ; skosmos:language "en"; skosmos:sparqlGraph . @@ -265,7 +265,7 @@ dc11:title "A vocabulary for testing language subtags"@en ; dc:subject :cat_general ; void:uriSpace "http://www.skosmos.skos/subtag/"; - void:sparqlEndpoint ; + void:sparqlEndpoint ; skosmos:language "en"; skosmos:fallbackLanguages ( "fr" "de" "sv" ) ; skosmos:sparqlGraph ; @@ -275,7 +275,7 @@ dc11:title "A vocabulary for test SPARQL with collation"@en ; dc:subject :cat_general ; void:uriSpace "http://www.skosmos.skos/collation/"; - void:sparqlEndpoint ; + void:sparqlEndpoint ; skosmos:language "fi"; skosmos:sparqlGraph . @@ -287,7 +287,7 @@ skosmos:externalProperty dc11:creator ; skosmos:externalProperty dc11:relation ; skosmos:externalProperty rdfs:comment ; - void:sparqlEndpoint ; + void:sparqlEndpoint ; skosmos:language "en"; skosmos:sparqlGraph . @@ -295,7 +295,7 @@ dc11:title "A vocabulary for testing SKOS XL"@en ; dc:subject :cat_general ; void:uriSpace "http://www.skosmos.skos/xl/"; - void:sparqlEndpoint ; + void:sparqlEndpoint ; skosmos:language "en"; skosmos:sparqlGraph . @@ -303,7 +303,7 @@ dc11:title "A vocabulary for testing HTTP 304 new settings"@en ; dc:subject :cat_general ; void:uriSpace "http://www.skosmos.skos/http304disabled/"; - void:sparqlEndpoint ; + void:sparqlEndpoint ; skosmos:language "fi"; skosmos:useModifiedDate "false"; skosmos:sparqlGraph ; @@ -313,7 +313,7 @@ dc11:title "A vocabulary for testing HTTP 304 new settings"@en ; dc:subject :cat_general ; void:uriSpace "http://www.skosmos.skos/http304enabled/"; - void:sparqlEndpoint ; + void:sparqlEndpoint ; skosmos:language "fi"; skosmos:useModifiedDate "true"; skosmos:sparqlGraph ;