From 5f06a10b58b01bff33267dfdb15b2985dd821a92 Mon Sep 17 00:00:00 2001 From: Balduin Landolt <33053745+BalduinLandolt@users.noreply.github.com> Date: Thu, 22 Apr 2021 15:39:27 +0200 Subject: [PATCH] fix(test-data): change webern shortcode in test data (DSP-1520) (#1843) * test: change webern shortcode in test data * fix(test-data): increase TCP connection time out * fix(test-data): increase TCP connection time out * fix(test-data): increase TCP connection time out * fix(test-data): increase TCP connection time out * fix(test-data): increase TCP connection time out * fix(test-data): increase test timeouts * chore(deps): bump testcontainers * chore(deps): bump scala patch version * chore(deps): undo bump testcontainers * chore(deps): undo bump scala patch version * fix(test-data): undo increase test timeouts * fix(test-data): increase test timeout Co-authored-by: Sepideh Alassi Co-authored-by: Ivan Subotic <400790+subotic@users.noreply.github.com> --- test_data/all_data/admin-data.ttl | 10 +-- test_data/all_data/permissions-data.ttl | 12 +-- test_data/all_data/webern-data.ttl | 82 +++++++++---------- test_data/ontologies/webern-onto.ttl | 8 +- .../ontologyR2RV2/allOntologyMetadata.jsonld | 4 +- .../ontologyR2RV2/allOntologyMetadata.rdf | 4 +- .../ontologyR2RV2/allOntologyMetadata.ttl | 4 +- test_data/project_shortcodes.md | 2 +- .../queries/webern/find_webern_person.rql | 2 +- .../webern/relation_via_schoenberg.rql | 2 +- webapi/scripts/fuseki-init-knora-test-unit.sh | 4 +- webapi/scripts/fuseki-init-knora-test.sh | 4 +- webapi/scripts/graphdb-knora-prod-data.expect | 4 +- webapi/scripts/graphdb-knora-test-data.expect | 4 +- .../scripts/win-graphdb-knora-test-data.ttl | 4 +- webapi/src/main/resources/application.conf | 4 +- .../scala/org/knora/webapi/CoreSpec.scala | 53 +++++++----- .../test/scala/org/knora/webapi/E2ESpec.scala | 32 +++++--- .../scala/org/knora/webapi/e2e/BUILD.bazel | 6 +- .../org/knora/webapi/e2e/admin/BUILD.bazel | 10 +-- .../knora/webapi/e2e/admin/lists/BUILD.bazel | 8 +- .../scala/org/knora/webapi/e2e/v1/BUILD.bazel | 4 +- .../scala/org/knora/webapi/e2e/v2/BUILD.bazel | 2 +- .../scala/org/knora/webapi/it/BUILD.bazel | 2 +- .../scala/org/knora/webapi/it/v1/BUILD.bazel | 8 +- .../org/knora/webapi/other/v1/BUILD.bazel | 2 +- .../org/knora/webapi/other/v2/BUILD.bazel | 2 +- .../SharedOntologyTestDataADM.scala | 6 +- .../sharedtestdata/SharedTestDataV1.scala | 6 +- 29 files changed, 158 insertions(+), 137 deletions(-) diff --git a/test_data/all_data/admin-data.ttl b/test_data/all_data/admin-data.ttl index 9341e57857..b439a1c8ac 100644 --- a/test_data/all_data/admin-data.ttl +++ b/test_data/all_data/admin-data.ttl @@ -492,9 +492,9 @@ Die Internetpublikation macht das digitalisierte Korpus dieser Frühdrucke durc # WEBERN # ################################### - a knora-admin:knoraProject ; + a knora-admin:knoraProject ; knora-admin:projectShortname "webern"^^xsd:string ; - knora-admin:projectShortcode "08AE"^^xsd:string ; + knora-admin:projectShortcode "0806"^^xsd:string ; knora-admin:projectLongname "Anton Webern Gesamtausgabe"^^xsd:string ; knora-admin:projectDescription "Historisch-kritische Edition des Gesamtschaffens von Anton Webern."^^xsd:string ; knora-admin:status "true"^^xsd:boolean ; @@ -509,7 +509,7 @@ Die Internetpublikation macht das digitalisierte Korpus dieser Frühdrucke durc knora-admin:email "webern-nutzer@example.ch"^^xsd:string ; knora-admin:preferredLanguage "de"^^xsd:string ; knora-admin:status "true"^^xsd:boolean ; - knora-admin:isInProject ; + knora-admin:isInProject ; knora-admin:isInSystemAdminGroup "false"^^xsd:boolean . ## Project Admin @@ -521,7 +521,7 @@ Die Internetpublikation macht das digitalisierte Korpus dieser Frühdrucke durc knora-admin:email "webern-admin@example.ch"^^xsd:string ; knora-admin:preferredLanguage "de"^^xsd:string ; knora-admin:status "true"^^xsd:boolean ; - knora-admin:isInProject ; + knora-admin:isInProject ; knora-admin:isInSystemAdminGroup "false"^^xsd:boolean ; - knora-admin:isInProjectAdminGroup . + knora-admin:isInProjectAdminGroup . diff --git a/test_data/all_data/permissions-data.ttl b/test_data/all_data/permissions-data.ttl index 4a73b4093f..0dc0390042 100644 --- a/test_data/all_data/permissions-data.ttl +++ b/test_data/all_data/permissions-data.ttl @@ -361,11 +361,11 @@ ########################################################## ### Administrative Permissions on ProjectMember - + rdf:type knora-admin:AdministrativePermission ; - knora-admin:forProject ; + knora-admin:forProject ; knora-admin:forGroup knora-admin:ProjectMember ; @@ -373,11 +373,11 @@ ### Administrative Permissions on ProjectAdmin - + rdf:type knora-admin:AdministrativePermission ; - knora-admin:forProject ; + knora-admin:forProject ; knora-admin:forGroup knora-admin:ProjectAdmin ; @@ -385,11 +385,11 @@ ### Default Object Access Permissions on ProjectMember Group - + rdf:type knora-admin:DefaultObjectAccessPermission ; - knora-admin:forProject ; + knora-admin:forProject ; knora-admin:forGroup knora-admin:ProjectMember ; diff --git a/test_data/all_data/webern-data.ttl b/test_data/all_data/webern-data.ttl index ecb1f7b417..428af83ae4 100644 --- a/test_data/all_data/webern-data.ttl +++ b/test_data/all_data/webern-data.ttl @@ -1,4 +1,4 @@ -@prefix : . +@prefix : . @prefix owl: . @prefix rdf: . @prefix xml: . @@ -7,7 +7,7 @@ @prefix rdfs: . @prefix knora-base: . @prefix salsah-gui: . -@prefix webern: . +@prefix webern: . # # @@ -19,23 +19,23 @@ # ################################################################# # # -# http://rdfh.ch/08AE/testperson1 +# http://rdfh.ch/0806/testperson1 # webern:testperson1 - a webern:Person ; - webern:comment ; - webern:hasAlternativeName ; - webern:hasBiography ; - webern:hasBiographySource ; - webern:hasBirthDate ; - webern:hasBirthPlace ; - webern:hasDeathDate ; - webern:hasDeathPlace ; - webern:hasFamilyName ; - webern:hasGivenName ; - webern:hasIAFIdentifier ; - webern:hasRelation ; - knora-base:attachedToProject ; + a webern:Person ; + webern:comment ; + webern:hasAlternativeName ; + webern:hasBiography ; + webern:hasBiographySource ; + webern:hasBirthDate ; + webern:hasBirthPlace ; + webern:hasDeathDate ; + webern:hasDeathPlace ; + webern:hasFamilyName ; + webern:hasGivenName ; + webern:hasIAFIdentifier ; + webern:hasRelation ; + knora-base:attachedToProject ; knora-base:attachedToUser ; knora-base:creationDate "2017-12-01T17:00:00Z"^^xsd:dateTime ; knora-base:hasPermissions "CR knora-admin:ProjectMember,knora-admin:Creator|V knora-admin:KnownUser|RV knora-admin:UnknownUser" ; @@ -44,10 +44,10 @@ # -# http://rdfh.ch/08AE/testperson1/values/576dede4-8cc9-4e72-ac8c-8ea5dff9c668 +# http://rdfh.ch/0806/testperson1/values/576dede4-8cc9-4e72-ac8c-8ea5dff9c668 # hasFamilyName - a knora-base:TextValue ; + a knora-base:TextValue ; knora-base:valueHasUUID "576dede4-8cc9-4e72-ac8c-8ea5dff9c668"^^xsd:string; knora-base:attachedToUser ; knora-base:hasPermissions "CR knora-admin:Creator|D knora-admin:ProjectMember" ; @@ -57,10 +57,10 @@ knora-base:valueHasString "Polnauer" . # -# http://rdfh.ch/08AE/testperson1/values/20526fec-6106-4b9d-a41b-faccbe028340 +# http://rdfh.ch/0806/testperson1/values/20526fec-6106-4b9d-a41b-faccbe028340 # hasGivenName - a knora-base:TextValue ; + a knora-base:TextValue ; knora-base:valueHasUUID "20526fec-6106-4b9d-a41b-faccbe028340"^^xsd:string; knora-base:attachedToUser ; knora-base:hasPermissions "CR knora-admin:Creator|D knora-admin:ProjectMember" ; @@ -70,10 +70,10 @@ knora-base:valueHasString "Josef" . # -# http://rdfh.ch/08AE/testperson1/values/88c91a1d-23bc-413d-b966-78b525715575 +# http://rdfh.ch/0806/testperson1/values/88c91a1d-23bc-413d-b966-78b525715575 # hasAlternativeName - a knora-base:TextValue ; + a knora-base:TextValue ; knora-base:valueHasUUID "88c91a1d-23bc-413d-b966-78b525715575"^^xsd:string; knora-base:attachedToUser ; knora-base:hasPermissions "CR knora-admin:Creator|D knora-admin:ProjectMember" ; @@ -83,10 +83,10 @@ knora-base:valueHasString "Josef Maximilian Polnauer" . # -# http://rdfh.ch/08AE/testperson1/values/50e58896-fd0f-49c7-9786-f9cdd4c9ce56 +# http://rdfh.ch/0806/testperson1/values/50e58896-fd0f-49c7-9786-f9cdd4c9ce56 # hasIAFIdentifier - a knora-base:TextValue ; + a knora-base:TextValue ; knora-base:valueHasUUID "50e58896-fd0f-49c7-9786-f9cdd4c9ce56"^^xsd:string; knora-base:attachedToUser ; knora-base:hasPermissions "CR knora-admin:Creator|D knora-admin:ProjectMember" ; @@ -96,10 +96,10 @@ knora-base:valueHasString "1017673659" . # -# http://rdfh.ch/08AE/testperson1/values/6f3e4026-18bd-4039-9805-7d0d4e317690 +# http://rdfh.ch/0806/testperson1/values/6f3e4026-18bd-4039-9805-7d0d4e317690 # hasBirthDate - a knora-base:DateValue ; + a knora-base:DateValue ; knora-base:valueHasUUID "6f3e4026-18bd-4039-9805-7d0d4e317690"^^xsd:string; knora-base:attachedToUser ; knora-base:hasPermissions "CR knora-admin:Creator|D knora-admin:ProjectMember" ; @@ -114,10 +114,10 @@ knora-base:valueHasEndPrecision "DAY" . # -# http://rdfh.ch/08AE/testperson1/values/b5349bdd-6f5d-4538-ad0f-7b9440760f55 +# http://rdfh.ch/0806/testperson1/values/b5349bdd-6f5d-4538-ad0f-7b9440760f55 # webern:hasDeathDate - a knora-base:DateValue ; + a knora-base:DateValue ; knora-base:valueHasUUID "b5349bdd-6f5d-4538-ad0f-7b9440760f55"^^xsd:string; knora-base:attachedToUser ; knora-base:hasPermissions "CR knora-admin:Creator|D knora-admin:ProjectMember" ; @@ -132,10 +132,10 @@ knora-base:valueHasEndPrecision "DAY" . # -# http://rdfh.ch/08AE/testperson1/values/a588947a-44e6-45fb-aec3-3d57887f038c +# http://rdfh.ch/0806/testperson1/values/a588947a-44e6-45fb-aec3-3d57887f038c # webern:hasBirthPlace - a knora-base:TextValue ; + a knora-base:TextValue ; knora-base:valueHasUUID "a588947a-44e6-45fb-aec3-3d57887f038c"^^xsd:string; knora-base:attachedToUser ; knora-base:hasPermissions "CR knora-admin:Creator|D knora-admin:ProjectMember" ; @@ -145,10 +145,10 @@ knora-base:valueHasString "Wien" . # -# http://rdfh.ch/08AE/testperson1/values/47b2992554d5 +# http://rdfh.ch/0806/testperson1/values/47b2992554d5 # webern:hasDeathPlace - a knora-base:TextValue ; + a knora-base:TextValue ; knora-base:valueHasUUID "47b2992554d5"^^xsd:string; knora-base:attachedToUser ; knora-base:hasPermissions "CR knora-admin:Creator|D knora-admin:ProjectMember" ; @@ -158,10 +158,10 @@ knora-base:valueHasString "Wien" . # -# http://rdfh.ch/08AE/testperson1/values/3855051b-c47c-4e61-8cd7-76404efdc67b +# http://rdfh.ch/0806/testperson1/values/3855051b-c47c-4e61-8cd7-76404efdc67b # webern:hasBiography - a knora-base:TextValue ; + a knora-base:TextValue ; knora-base:valueHasUUID "3855051b-c47c-4e61-8cd7-76404efdc67b"^^xsd:string; knora-base:attachedToUser ; knora-base:hasPermissions "CR knora-admin:Creator|D knora-admin:ProjectMember" ; @@ -171,10 +171,10 @@ knora-base:valueHasString "Musikstudien bei Arnold Schönberg (1909 bis 1911), Alban Berg (1911 bis 1913). Studien bei Guido Adler (1927 Promotion in Innsbruck). Beamter (bei den österreichischen Bundesbahnen, nach dem Zweiten Weltkrieg beim Finanzministerium), Musikwissenschaftler, Bibliothekar, nach seiner Pensionierung auch Kompositionslehrer. Herausgeber des Briefwechsels Anton Webern und Hildegard Jone (stark gekürzt)." . # -# http://rdfh.ch/08AE/testperson1/values/4ab0cfaa-479a-4cd6-946e-2b51c4b9d016 +# http://rdfh.ch/0806/testperson1/values/4ab0cfaa-479a-4cd6-946e-2b51c4b9d016 # webern:hasBiographySource - a knora-base:TextValue ; + a knora-base:TextValue ; knora-base:valueHasUUID "4ab0cfaa-479a-4cd6-946e-2b51c4b9d016"^^xsd:string; knora-base:attachedToUser ; knora-base:hasPermissions "CR knora-admin:Creator|D knora-admin:ProjectMember" ; @@ -185,10 +185,10 @@ # -# http://rdfh.ch/08AE/testperson1/values/f7675f26-4b01-4432-be74-9ae3aa24d2af +# http://rdfh.ch/0806/testperson1/values/f7675f26-4b01-4432-be74-9ae3aa24d2af # webern:hasRelation - a knora-base:TextValue ; + a knora-base:TextValue ; knora-base:valueHasUUID "f7675f26-4b01-4432-be74-9ae3aa24d2af"^^xsd:string; knora-base:attachedToUser ; knora-base:hasPermissions "CR knora-admin:Creator|D knora-admin:ProjectMember" ; @@ -198,10 +198,10 @@ knora-base:valueHasString "Angehöriger des Schönberg-Kreises. Freund." . # -# http://rdfh.ch/08AE/testperson1/values/df1260ad43d5 +# http://rdfh.ch/0806/testperson1/values/df1260ad43d5 # webern:comment - a knora-base:TextValue ; + a knora-base:TextValue ; knora-base:valueHasUUID "df1260ad43d5"^^xsd:string; knora-base:attachedToUser ; knora-base:hasPermissions "CR knora-admin:Creator|D knora-admin:ProjectMember" ; diff --git a/test_data/ontologies/webern-onto.ttl b/test_data/ontologies/webern-onto.ttl index 6789902d44..b3dbefb20f 100644 --- a/test_data/ontologies/webern-onto.ttl +++ b/test_data/ontologies/webern-onto.ttl @@ -6,13 +6,13 @@ @prefix foaf: . @prefix knora-base: . @prefix salsah-gui: . -@base . +@base . -@prefix : . +@prefix : . - rdf:type owl:Ontology ; + rdf:type owl:Ontology ; rdfs:label "The Anton Webern project ontology" ; - knora-base:attachedToProject . + knora-base:attachedToProject . ########################################################## # diff --git a/test_data/ontologyR2RV2/allOntologyMetadata.jsonld b/test_data/ontologyR2RV2/allOntologyMetadata.jsonld index 1b36204bb1..86a9b4337c 100644 --- a/test_data/ontologyR2RV2/allOntologyMetadata.jsonld +++ b/test_data/ontologyR2RV2/allOntologyMetadata.jsonld @@ -74,10 +74,10 @@ "rdfs:label": "The dokubib ontology" }, { - "@id": "http://0.0.0.0:3333/ontology/08AE/webern/v2", + "@id": "http://0.0.0.0:3333/ontology/0806/webern/v2", "@type": "owl:Ontology", "knora-api:attachedToProject": { - "@id": "http://rdfh.ch/projects/08AE" + "@id": "http://rdfh.ch/projects/0806" }, "rdfs:label": "The Anton Webern project ontology" }, diff --git a/test_data/ontologyR2RV2/allOntologyMetadata.rdf b/test_data/ontologyR2RV2/allOntologyMetadata.rdf index df3f897d2f..480c62a2ce 100644 --- a/test_data/ontologyR2RV2/allOntologyMetadata.rdf +++ b/test_data/ontologyR2RV2/allOntologyMetadata.rdf @@ -39,8 +39,8 @@ The dokubib ontology - - + + The Anton Webern project ontology diff --git a/test_data/ontologyR2RV2/allOntologyMetadata.ttl b/test_data/ontologyR2RV2/allOntologyMetadata.ttl index f6659fe7c7..0fdb85d116 100644 --- a/test_data/ontologyR2RV2/allOntologyMetadata.ttl +++ b/test_data/ontologyR2RV2/allOntologyMetadata.ttl @@ -37,8 +37,8 @@ knora-api:attachedToProject ; rdfs:label "The dokubib ontology" . - a owl:Ontology; - knora-api:attachedToProject ; + a owl:Ontology; + knora-api:attachedToProject ; rdfs:label "The Anton Webern project ontology" . a owl:Ontology; diff --git a/test_data/project_shortcodes.md b/test_data/project_shortcodes.md index 39864280b9..bfbe173b46 100644 --- a/test_data/project_shortcodes.md +++ b/test_data/project_shortcodes.md @@ -30,4 +30,4 @@ - lhtt: `0806` // Living Histories of Theban Tombs - mls: `0807` // Musikalisches Lexikon der Schweiz - terlag: `0808`// Lager des Territorialdienstes 1942-1945 - - webern: `08AE` + - webern: `0806` diff --git a/test_data/queries/webern/find_webern_person.rql b/test_data/queries/webern/find_webern_person.rql index ddb9ac7184..29d22ecfb5 100644 --- a/test_data/queries/webern/find_webern_person.rql +++ b/test_data/queries/webern/find_webern_person.rql @@ -1,7 +1,7 @@ PREFIX foaf: PREFIX knora-base: PREFIX knora-admin: -PREFIX webern: +PREFIX webern: SELECT * WHERE { diff --git a/test_data/queries/webern/relation_via_schoenberg.rql b/test_data/queries/webern/relation_via_schoenberg.rql index a33ae6e9d2..4b6650f523 100644 --- a/test_data/queries/webern/relation_via_schoenberg.rql +++ b/test_data/queries/webern/relation_via_schoenberg.rql @@ -1,7 +1,7 @@ PREFIX foaf: PREFIX knora-base: PREFIX knora-admin: -PREFIX webern: +PREFIX webern: SELECT (CONCAT(?first, ' ', ?last) AS ?fullname) ?string WHERE { diff --git a/webapi/scripts/fuseki-init-knora-test-unit.sh b/webapi/scripts/fuseki-init-knora-test-unit.sh index 87596360b3..af89d3c69e 100755 --- a/webapi/scripts/fuseki-init-knora-test-unit.sh +++ b/webapi/scripts/fuseki-init-knora-test-unit.sh @@ -31,5 +31,5 @@ upload-graph ../../test_data/ontologies/newton-onto.ttl http://www.knora.org/ont upload-graph ../../test_data/ontologies/leibniz-onto.ttl http://www.knora.org/ontology/0801/leibniz upload-graph ../../test_data/all_data/biblio-data.ttl http://www.knora.org/data/0801/biblio upload-graph ../../test_data/all_data/beol-data.ttl http://www.knora.org/data/0801/beol -upload-graph ../../test_data/ontologies/webern-onto.ttl http://www.knora.org/ontology/08AE/webern -upload-graph ../../test_data/all_data/webern-data.ttl http://www.knora.org/data/08AE/webern +upload-graph ../../test_data/ontologies/webern-onto.ttl http://www.knora.org/ontology/0806/webern +upload-graph ../../test_data/all_data/webern-data.ttl http://www.knora.org/data/0806/webern diff --git a/webapi/scripts/fuseki-init-knora-test.sh b/webapi/scripts/fuseki-init-knora-test.sh index 56439bf952..184f9e865e 100755 --- a/webapi/scripts/fuseki-init-knora-test.sh +++ b/webapi/scripts/fuseki-init-knora-test.sh @@ -31,5 +31,5 @@ upload-graph ../../test_data/ontologies/newton-onto.ttl http://www.knora.org/ont upload-graph ../../test_data/ontologies/leibniz-onto.ttl http://www.knora.org/ontology/0801/leibniz upload-graph ../../test_data/all_data/biblio-data.ttl http://www.knora.org/data/0801/biblio upload-graph ../../test_data/all_data/beol-data.ttl http://www.knora.org/data/0801/beol -upload-graph ../../test_data/ontologies/webern-onto.ttl http://www.knora.org/ontology/08AE/webern -upload-graph ../../test_data/all_data/webern-data.ttl http://www.knora.org/data/08AE/webern +upload-graph ../../test_data/ontologies/webern-onto.ttl http://www.knora.org/ontology/0806/webern +upload-graph ../../test_data/all_data/webern-data.ttl http://www.knora.org/data/0806/webern diff --git a/webapi/scripts/graphdb-knora-prod-data.expect b/webapi/scripts/graphdb-knora-prod-data.expect index af2d813daf..f85ae493d6 100755 --- a/webapi/scripts/graphdb-knora-prod-data.expect +++ b/webapi/scripts/graphdb-knora-prod-data.expect @@ -48,9 +48,9 @@ send "load ../../test_data/all_data/biblio-data.ttl into http://www.knora.org/da expect $prompt send "load ../../test_data/all_data/beol-data.ttl into http://www.knora.org/data/0801/beol .\r" expect $prompt -send "load ../../test_data/ontologies/webern-onto.ttl into http://www.knora.org/ontology/08AE/webern .\r" +send "load ../../test_data/ontologies/webern-onto.ttl into http://www.knora.org/ontology/0806/webern .\r" expect $prompt -send "load ../../test_data/all_data/webern-data.ttl into http://www.knora.org/data/08AE/webern .\r" +send "load ../../test_data/all_data/webern-data.ttl into http://www.knora.org/data/0806/webern .\r" expect $prompt send "close .\r" diff --git a/webapi/scripts/graphdb-knora-test-data.expect b/webapi/scripts/graphdb-knora-test-data.expect index ecb673165f..87d7d6f13e 100755 --- a/webapi/scripts/graphdb-knora-test-data.expect +++ b/webapi/scripts/graphdb-knora-test-data.expect @@ -52,9 +52,9 @@ send "load ../../test_data/all_data/biblio-data.ttl into http://www.knora.org/da expect $prompt send "load ../../test_data/all_data/beol-data.ttl into http://www.knora.org/data/0801/beol .\r" expect $prompt -send "load ../../test_data/ontologies/webern-onto.ttl into http://www.knora.org/ontology/08AE/webern .\r" +send "load ../../test_data/ontologies/webern-onto.ttl into http://www.knora.org/ontology/0806/webern .\r" expect $prompt -send "load ../../test_data/all_data/webern-data.ttl into http://www.knora.org/data/08AE/webern .\r" +send "load ../../test_data/all_data/webern-data.ttl into http://www.knora.org/data/0806/webern .\r" expect $prompt send "close .\r" diff --git a/webapi/scripts/win-graphdb-knora-test-data.ttl b/webapi/scripts/win-graphdb-knora-test-data.ttl index db2ccad5cb..e3ad193d4b 100644 --- a/webapi/scripts/win-graphdb-knora-test-data.ttl +++ b/webapi/scripts/win-graphdb-knora-test-data.ttl @@ -19,7 +19,7 @@ load ../../test-data/ontologies/beol-onto.ttl into http://www.knora.org/ontology load ../../test-data/all_data/beol-data.ttl into http://www.knora.org/data/0801/beol . load ../../test-data/ontologies/biblio-onto.ttl into http://www.knora.org/ontology/0801/biblio . load ../../test-data/all_data/biblio-data.ttl into http://www.knora.org/data/biblio . -load ../../test-data/ontologies/webern-onto.ttl into http://www.knora.org/ontology/08AE/webern . -load ../../test-data/all_data/webern-data.ttl into http://www.knora.org/data/08AE/webern . +load ../../test-data/ontologies/webern-onto.ttl into http://www.knora.org/ontology/0806/webern . +load ../../test-data/all_data/webern-data.ttl into http://www.knora.org/data/0806/webern . close . exit . diff --git a/webapi/src/main/resources/application.conf b/webapi/src/main/resources/application.conf index aca986c94a..5f1440ba76 100644 --- a/webapi/src/main/resources/application.conf +++ b/webapi/src/main/resources/application.conf @@ -78,7 +78,7 @@ akka { client { # The time period within which the TCP connecting process must be completed. - connecting-timeout = 9999 ms // 10 s + connecting-timeout = 479999 ms // 480 s # The time after which an idle connection will be automatically closed. # Set to `infinite` to completely disable idle timeouts. @@ -660,7 +660,7 @@ app { } { path = "test_data/ontologies/webern-onto.ttl" - name = "http://www.knora.org/ontology/08AE/webern" + name = "http://www.knora.org/ontology/0806/webern" } ] diff --git a/webapi/src/test/scala/org/knora/webapi/CoreSpec.scala b/webapi/src/test/scala/org/knora/webapi/CoreSpec.scala index c980c387dc..c550c60d4f 100644 --- a/webapi/src/test/scala/org/knora/webapi/CoreSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/CoreSpec.scala @@ -19,6 +19,19 @@ package org.knora.webapi +import app.{ApplicationActor, LiveManagers} +import core.Core +import feature.{FeatureFactoryConfig, KnoraSettingsFeatureFactoryConfig, TestFeatureFactoryConfig} +import messages.StringFormatter +import messages.app.appmessages.{AppStart, AppStop, SetAllowReloadOverHTTPState} +import messages.store.cacheservicemessages.CacheServiceFlushDB +import messages.store.triplestoremessages.{RdfDataObject, ResetRepositoryContent} +import messages.util.rdf.RdfFeatureFactory +import messages.util.{KnoraSystemInstances, ResponderData} +import messages.v2.responder.ontologymessages.LoadOntologiesRequestV2 +import settings.{KnoraDispatchers, KnoraSettings, KnoraSettingsImpl, _} +import util.StartupUtils + import akka.actor.{ActorRef, ActorSystem, Props} import akka.event.LoggingAdapter import akka.pattern.ask @@ -26,18 +39,6 @@ import akka.stream.Materializer import akka.testkit.{ImplicitSender, TestKit} import akka.util.Timeout import com.typesafe.config.{Config, ConfigFactory} -import org.knora.webapi.app.{ApplicationActor, LiveManagers} -import org.knora.webapi.core.Core -import org.knora.webapi.feature.{FeatureFactoryConfig, KnoraSettingsFeatureFactoryConfig, TestFeatureFactoryConfig} -import org.knora.webapi.messages.StringFormatter -import org.knora.webapi.messages.app.appmessages.{AppStart, AppStop, SetAllowReloadOverHTTPState} -import org.knora.webapi.messages.store.cacheservicemessages.CacheServiceFlushDB -import org.knora.webapi.messages.store.triplestoremessages.{RdfDataObject, ResetRepositoryContent} -import org.knora.webapi.messages.util.rdf.RdfFeatureFactory -import org.knora.webapi.messages.util.{KnoraSystemInstances, ResponderData} -import org.knora.webapi.messages.v2.responder.ontologymessages.LoadOntologiesRequestV2 -import org.knora.webapi.settings.{KnoraDispatchers, KnoraSettings, KnoraSettingsImpl, _} -import org.knora.webapi.util.StartupUtils import org.scalatest.BeforeAndAfterAll import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpecLike @@ -45,6 +46,7 @@ import org.scalatest.wordspec.AnyWordSpecLike import scala.concurrent.duration._ import scala.concurrent.{Await, ExecutionContext} import scala.language.postfixOps +import scala.util.{Failure, Success, Try} object CoreSpec { @@ -149,16 +151,27 @@ abstract class CoreSpec(_system: ActorSystem) protected def loadTestData(rdfDataObjects: Seq[RdfDataObject]): Unit = { logger.info("Loading test data started ...") implicit val timeout: Timeout = Timeout(settings.defaultTimeout) - Await.result(appActor ? ResetRepositoryContent(rdfDataObjects), 479999.milliseconds) + Try(Await.result(appActor ? ResetRepositoryContent(rdfDataObjects), 479999.milliseconds)) match { + case Success(res) => logger.info("... loading test data done.") + case Failure(e) => logger.error(s"Loading test data failed: ${e.getMessage}") + } - Await.result(appActor ? LoadOntologiesRequestV2( - featureFactoryConfig = defaultFeatureFactoryConfig, - requestingUser = KnoraSystemInstances.Users.SystemUser - ), - 1 minute) + logger.info("Loading load ontologies into cache started ...") + Try( + Await.result(appActor ? LoadOntologiesRequestV2( + featureFactoryConfig = defaultFeatureFactoryConfig, + requestingUser = KnoraSystemInstances.Users.SystemUser + ), + 1 minute)) match { + case Success(res) => logger.info("... loading ontologies into cache done.") + case Failure(e) => logger.error(s"Loading ontologies into cache failed: ${e.getMessage}") + } - Await.result(appActor ? CacheServiceFlushDB(KnoraSystemInstances.Users.SystemUser), 5 seconds) - logger.info("... loading test data done.") + logger.info("Flush Redis cache started ...") + Try(Await.result(appActor ? CacheServiceFlushDB(KnoraSystemInstances.Users.SystemUser), 5 seconds)) match { + case Success(res) => logger.info("... flushing Redis cache done.") + case Failure(e) => logger.error(s"Flushing Redis cache failed: ${e.getMessage}") + } } def memusage(): Unit = { diff --git a/webapi/src/test/scala/org/knora/webapi/E2ESpec.scala b/webapi/src/test/scala/org/knora/webapi/E2ESpec.scala index 56e6c256ce..4665d742ad 100644 --- a/webapi/src/test/scala/org/knora/webapi/E2ESpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/E2ESpec.scala @@ -19,7 +19,15 @@ package org.knora.webapi -import java.nio.file.{Files, Path, Paths} +import app.{ApplicationActor, LiveManagers} +import core.Core +import feature.{FeatureFactoryConfig, KnoraSettingsFeatureFactoryConfig, TestFeatureFactoryConfig} +import messages.StringFormatter +import messages.app.appmessages.{AppStart, AppStop, SetAllowReloadOverHTTPState} +import messages.store.triplestoremessages.{RdfDataObject, TriplestoreJsonProtocol} +import messages.util.rdf._ +import settings._ +import util.{FileUtil, StartupUtils} import akka.actor.{ActorRef, ActorSystem, Props} import akka.event.LoggingAdapter @@ -29,23 +37,17 @@ import akka.http.scaladsl.model._ import akka.stream.Materializer import com.typesafe.config.{Config, ConfigFactory} import com.typesafe.scalalogging.LazyLogging -import org.knora.webapi.app.{ApplicationActor, LiveManagers} -import org.knora.webapi.core.Core -import org.knora.webapi.feature.{FeatureFactoryConfig, KnoraSettingsFeatureFactoryConfig, TestFeatureFactoryConfig} -import org.knora.webapi.messages.StringFormatter -import org.knora.webapi.messages.app.appmessages.{AppStart, AppStop, SetAllowReloadOverHTTPState} -import org.knora.webapi.messages.store.triplestoremessages.{RdfDataObject, TriplestoreJsonProtocol} -import org.knora.webapi.messages.util.rdf._ -import org.knora.webapi.settings._ -import org.knora.webapi.util.{FileUtil, StartupUtils} +import org.scalatest.concurrent.ScalaFutures import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpecLike import org.scalatest.{BeforeAndAfterAll, Suite} import spray.json._ +import java.nio.file.{Files, Path, Paths} import scala.concurrent.duration._ import scala.concurrent.{Await, ExecutionContext, Future} import scala.languageFeature.postfixOps +import scala.util.{Failure, Success, Try} object E2ESpec { val defaultConfig: Config = ConfigFactory.load() @@ -62,6 +64,7 @@ class E2ESpec(_system: ActorSystem) with Suite with AnyWordSpecLike with Matchers + with ScalaFutures with BeforeAndAfterAll with RequestBuilding with LazyLogging { @@ -116,6 +119,7 @@ class E2ESpec(_system: ActorSystem) // loadTestData loadTestData(rdfDataObjects) + } override def afterAll: Unit = { @@ -127,8 +131,12 @@ class E2ESpec(_system: ActorSystem) logger.info("Loading test data started ...") val request = Post(baseApiUrl + "/admin/store/ResetTriplestoreContent", HttpEntity(ContentTypes.`application/json`, rdfDataObjects.toJson.compactPrint)) - singleAwaitingRequest(request, 479999.milliseconds) - logger.info("... loading test data done.") + val response = Http().singleRequest(request) + + Try(Await.result(response, 479999.milliseconds)) match { + case Success(res) => logger.info("... loading test data done.") + case Failure(e) => logger.error(s"Loading test data failed: ${e.getMessage}") + } } // duration is intentionally like this, so that it could be found with search if seen in a stack trace diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/e2e/BUILD.bazel index cacb8638ad..9f035182f6 100644 --- a/webapi/src/test/scala/org/knora/webapi/e2e/BUILD.bazel +++ b/webapi/src/test/scala/org/knora/webapi/e2e/BUILD.bazel @@ -14,7 +14,7 @@ filegroup( scala_test( name = "CORSSupportE2ESpec", - size = "small", # 60s + size = "small", srcs = [ "CORSSupportE2ESpec.scala", ], @@ -68,7 +68,7 @@ scala_test( scala_test( name = "InstanceCheckerSpec", - size = "small", # 60s + size = "small", srcs = [ "InstanceChecker.scala", "InstanceCheckerSpec.scala", @@ -87,7 +87,7 @@ scala_test( scala_test( name = "RejectingRouteE2ESpec", - size = "small", # 60s + size = "small", srcs = [ "RejectingRouteE2ESpec.scala", ], diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/admin/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/e2e/admin/BUILD.bazel index df666fe2c1..8b4809112d 100644 --- a/webapi/src/test/scala/org/knora/webapi/e2e/admin/BUILD.bazel +++ b/webapi/src/test/scala/org/knora/webapi/e2e/admin/BUILD.bazel @@ -24,7 +24,7 @@ scala_test( scala_test( name = "PermissionsADME2ESpec", - size = "small", # 60s + size = "small", srcs = [ "PermissionsADME2ESpec.scala", ], @@ -42,7 +42,7 @@ scala_test( scala_test( name = "ProjectsADME2ESpec", - size = "small", # 60s + size = "small", srcs = [ "ProjectsADME2ESpec.scala", "//webapi/src/test/scala/org/knora/webapi/messages:SessionMessagesV1", @@ -62,7 +62,7 @@ scala_test( scala_test( name = "SipiADME2ESpec", - size = "small", # 60s + size = "small", srcs = [ "SipiADME2ESpec.scala", "//webapi/src/test/scala/org/knora/webapi/messages:SessionMessagesV1", @@ -81,7 +81,7 @@ scala_test( scala_test( name = "StoreADME2ESpec", - size = "small", # 60s + size = "small", srcs = [ "StoreADME2ESpec.scala", ], @@ -99,7 +99,7 @@ scala_test( scala_test( name = "UsersADME2ESpec", - size = "small", # 60s + size = "small", srcs = [ "UsersADME2ESpec.scala", "//webapi/src/test/scala/org/knora/webapi/messages:SessionMessagesV1", diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/admin/lists/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/e2e/admin/lists/BUILD.bazel index 64a4bc26f9..a630043c3b 100644 --- a/webapi/src/test/scala/org/knora/webapi/e2e/admin/lists/BUILD.bazel +++ b/webapi/src/test/scala/org/knora/webapi/e2e/admin/lists/BUILD.bazel @@ -5,7 +5,7 @@ load("//third_party:dependencies.bzl", "ALL_WEBAPI_MAIN_DEPENDENCIES", "BASE_TES scala_test( name = "OldListsRouteADMFeatureE2ESpec", - size = "small", # 60s + size = "small", srcs = [ "OldListsRouteADMFeatureE2ESpec.scala", "//webapi/src/test/scala/org/knora/webapi/messages:SessionMessagesV1", @@ -24,7 +24,7 @@ scala_test( scala_test( name = "NewListsRoutesADMFeatureE2ESpec", - size = "small", # 60s + size = "small", srcs = [ "NewListsRoutesADMFeatureE2ESpec.scala", "//webapi/src/test/scala/org/knora/webapi/messages:SessionMessagesV1", @@ -43,7 +43,7 @@ scala_test( scala_test( name = "DeleteListItemsRouteADME2ESpec", - size = "small", # 60s + size = "small", srcs = [ "DeleteListItemsRouteADME2ESpec.scala", "//webapi/src/test/scala/org/knora/webapi/messages:SessionMessagesV1", @@ -62,7 +62,7 @@ scala_test( scala_test( name = "UpdateListItemsRouteADME2ESpec", - size = "small", # 60s + size = "small", srcs = [ "UpdateListItemsRouteADME2ESpec.scala", "//webapi/src/test/scala/org/knora/webapi/messages:SessionMessagesV1", diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/v1/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/e2e/v1/BUILD.bazel index 58ff781493..8eeb1ed597 100644 --- a/webapi/src/test/scala/org/knora/webapi/e2e/v1/BUILD.bazel +++ b/webapi/src/test/scala/org/knora/webapi/e2e/v1/BUILD.bazel @@ -61,7 +61,7 @@ scala_test( scala_test( name = "PermissionsHandlingV1E2ESpec", - size = "medium", # 900s + size = "medium", srcs = [ "PermissionsHandlingV1E2ESpec.scala", ], @@ -79,7 +79,7 @@ scala_test( scala_test( name = "ProjectsV1E2ESpec", - size = "small", # 60s + size = "small", srcs = [ "ProjectsV1E2ESpec.scala", "//webapi/src/test/scala/org/knora/webapi/messages:SessionMessagesV1", diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/v2/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/e2e/v2/BUILD.bazel index 18b9199b03..a41f063ec8 100644 --- a/webapi/src/test/scala/org/knora/webapi/e2e/v2/BUILD.bazel +++ b/webapi/src/test/scala/org/knora/webapi/e2e/v2/BUILD.bazel @@ -92,7 +92,7 @@ scala_test( ## //webapi/src/test/scala/org/knora/webapi/e2e/v2:ResourcesRouteV2E2ESpec scala_test( name = "ResourcesRouteV2E2ESpec", - size = "medium", # 300s + size = "medium", srcs = [ "ResourcesRouteV2E2ESpec.scala", ], diff --git a/webapi/src/test/scala/org/knora/webapi/it/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/it/BUILD.bazel index f17a675d9e..38bce49cc7 100644 --- a/webapi/src/test/scala/org/knora/webapi/it/BUILD.bazel +++ b/webapi/src/test/scala/org/knora/webapi/it/BUILD.bazel @@ -5,7 +5,7 @@ load("//third_party:dependencies.bzl", "ALL_WEBAPI_MAIN_DEPENDENCIES", "BASE_TES scala_test( name = "VersionRouteITSpec", - size = "small", # 60s + size = "small", srcs = [ "VersionRouteITSpec.scala", ], diff --git a/webapi/src/test/scala/org/knora/webapi/it/v1/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/it/v1/BUILD.bazel index 0758feb322..143c9ca2d7 100644 --- a/webapi/src/test/scala/org/knora/webapi/it/v1/BUILD.bazel +++ b/webapi/src/test/scala/org/knora/webapi/it/v1/BUILD.bazel @@ -5,7 +5,7 @@ load("//third_party:dependencies.bzl", "ALL_WEBAPI_MAIN_DEPENDENCIES", "BASE_TES scala_test( name = "DrawingsGodsV1ITSpec", - size = "small", # 60s + size = "small", srcs = [ "DrawingsGodsV1ITSpec.scala", ], @@ -23,7 +23,7 @@ scala_test( scala_test( name = "ErrorV1ITSpec", - size = "small", # 60s + size = "small", srcs = [ "ErrorV1ITSpec.scala", ], @@ -41,7 +41,7 @@ scala_test( scala_test( name = "KnoraSipiIntegrationV1ITSpec", - size = "medium", + size = "medium", # On Github CI it takes more than 60s! srcs = [ "KnoraSipiIntegrationV1ITSpec.scala", ], @@ -61,7 +61,7 @@ scala_test( scala_test( name = "KnoraSipiPermissionsV1ITSpec", - size = "small", # 60s + size = "small", srcs = [ "KnoraSipiPermissionsV1ITSpec.scala", ], diff --git a/webapi/src/test/scala/org/knora/webapi/other/v1/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/other/v1/BUILD.bazel index 346678f7ba..39c3178617 100644 --- a/webapi/src/test/scala/org/knora/webapi/other/v1/BUILD.bazel +++ b/webapi/src/test/scala/org/knora/webapi/other/v1/BUILD.bazel @@ -5,7 +5,7 @@ load("//third_party:dependencies.bzl", "ALL_WEBAPI_MAIN_DEPENDENCIES", "BASE_TES scala_test( name = "DrawingsGodsV1E2ESpec", - size = "small", # 60s + size = "small", srcs = [ "DrawingsGodsV1E2ESpec.scala", ], diff --git a/webapi/src/test/scala/org/knora/webapi/other/v2/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/other/v2/BUILD.bazel index 9c884e746b..4d4147fd4e 100644 --- a/webapi/src/test/scala/org/knora/webapi/other/v2/BUILD.bazel +++ b/webapi/src/test/scala/org/knora/webapi/other/v2/BUILD.bazel @@ -5,7 +5,7 @@ load("//third_party:dependencies.bzl", "ALL_WEBAPI_MAIN_DEPENDENCIES", "BASE_TES scala_test( name = "LumieresLausanneV2E2ESpec", - size = "small", # 60s + size = "small", srcs = [ "LumieresLausanneV2E2ESpec.scala", ], diff --git a/webapi/src/test/scala/org/knora/webapi/sharedtestdata/SharedOntologyTestDataADM.scala b/webapi/src/test/scala/org/knora/webapi/sharedtestdata/SharedOntologyTestDataADM.scala index 928b3076f4..7382b2a49f 100644 --- a/webapi/src/test/scala/org/knora/webapi/sharedtestdata/SharedOntologyTestDataADM.scala +++ b/webapi/src/test/scala/org/knora/webapi/sharedtestdata/SharedOntologyTestDataADM.scala @@ -73,9 +73,9 @@ object SharedOntologyTestDataADM { val DOKUBIB_DATA_IRI: IRI = OntologyConstants.NamedGraphs.DataNamedGraphStart + "/0804/dokubib" // webern - val WEBERN_ONTOLOGY_IRI: IRI = OntologyConstants.KnoraInternal.InternalOntologyStart + "/08AE/webern" - val WEBERN_ONTOLOGY_IRI_LocalHost: IRI = LocalHost_Ontology + "/08AE/webern/v2" - val WEBERN_DATA_IRI: IRI = OntologyConstants.NamedGraphs.DataNamedGraphStart + "/08AE/webern" + val WEBERN_ONTOLOGY_IRI: IRI = OntologyConstants.KnoraInternal.InternalOntologyStart + "/0806/webern" + val WEBERN_ONTOLOGY_IRI_LocalHost: IRI = LocalHost_Ontology + "/0806/webern/v2" + val WEBERN_DATA_IRI: IRI = OntologyConstants.NamedGraphs.DataNamedGraphStart + "/0806/webern" //foo ontology val FOO_ONTOLOGY_IRI_LocalHost: IRI = LocalHost_Ontology + "/00FF/foo/v2" diff --git a/webapi/src/test/scala/org/knora/webapi/sharedtestdata/SharedTestDataV1.scala b/webapi/src/test/scala/org/knora/webapi/sharedtestdata/SharedTestDataV1.scala index 23ef3f8ae9..be78632e59 100644 --- a/webapi/src/test/scala/org/knora/webapi/sharedtestdata/SharedTestDataV1.scala +++ b/webapi/src/test/scala/org/knora/webapi/sharedtestdata/SharedTestDataV1.scala @@ -441,18 +441,18 @@ object SharedTestDataV1 { /** **********************************/ /** WEBERN **/ /** **********************************/ - val WEBERN_PROJECT_IRI = "http://rdfh.ch/projects/08AE" + val WEBERN_PROJECT_IRI = "http://rdfh.ch/projects/0806" def webernProjectInfo = ProjectInfoV1( id = WEBERN_PROJECT_IRI, shortname = "webern", - shortcode = "08AE", + shortcode = "0806", longname = Some("Anton Webern Gesamtausgabe"), description = Some("Historisch-kritische Edition des Gesamtschaffens von Anton Webern."), keywords = None, logo = None, institution = None, - ontologies = Seq("http://www.knora.org/ontology/08AE/webern"), + ontologies = Seq("http://www.knora.org/ontology/0806/webern"), status = false, selfjoin = false )