Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature(api-v2): Generate client test data for ontologies, resources, search, and lists #1549

Merged
merged 15 commits into from
Dec 12, 2019
Merged

feature(api-v2): Generate client test data for ontologies, resources, search, and lists #1549

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
cde41cd
feature(api-v2): Return API v2 test data for resources (ongoing).
Dec 6, 2019
83d150c
test(clientapi): Add more test data.
Dec 9, 2019
cec2da3
test(clientapi): Load incunabula test data.
Dec 9, 2019
5e12353
test(clientapi): Return more test data.
Dec 9, 2019
fa7f264
test(clientapi): Return more test data.
Dec 9, 2019
9e0951b
Merge branch 'develop' into wip/1548-clientapi-testdata
Dec 10, 2019
31e2846
style(routing): Add consistent comment to all knoraApiPath methods.
Dec 10, 2019
2386d08
build(routing): Fix compile error caused by reformatting.
Dec 10, 2019
608d317
test(clientapi): Add more test data.
Dec 11, 2019
44ecb54
test(clientapi): Increase timeout.
Dec 11, 2019
62caf30
test(clientapi): Add resource preview test response.
Dec 11, 2019
e6f5b00
Merge branch 'develop' into wip/1548-clientapi-testdata
Dec 11, 2019
6273366
fix(clientapi): Fix bad URL.
Dec 11, 2019
b40aefb
test(clientapi): Fix silly mistakes, add more test data.
Dec 12, 2019
88b9141
fix(clientapi): Use static modification dates.
Dec 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions webapi/scripts/graphdb-knora-test-data.expect
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ send "load ../_test_data/ontologies/anything-onto.ttl into http://www.knora.org/
expect $prompt
send "load ../_test_data/all_data/anything-data.ttl into http://www.knora.org/data/0001/anything .\r"
expect $prompt
send "load ../_test_data/ontologies/minimal-onto.ttl into http://www.knora.org/ontology/0001/minimal .\r"
expect $prompt
send "load ../_test_data/ontologies/something-onto.ttl into http://www.knora.org/ontology/0001/something .\r"
expect $prompt
send "load ../_test_data/ontologies/beol-onto.ttl into http://www.knora.org/ontology/0801/beol .\r"
Expand Down
2 changes: 1 addition & 1 deletion webapi/src/main/resources/application.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ akka {
# Note that with N concurrent materializations the max number of open request in the pool
# will never exceed N * max-connections * pipelining-limit.
# Must be a power of 2 and > 0!
max-open-requests = 32
max-open-requests = 64

# The maximum number of requests that are dispatched to the target host in
# batch-mode across a single connection (HTTP pipelining).
Expand Down
253 changes: 250 additions & 3 deletions webapi/src/main/scala/org/knora/webapi/SharedTestDataADM.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
package org.knora.webapi

import java.net.URLEncoder
import java.time.Instant

import org.knora.webapi.SharedOntologyTestDataADM._
import org.knora.webapi.messages.admin.responder.groupsmessages.GroupADM
Expand All @@ -30,9 +31,9 @@ import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2
import org.knora.webapi.util.StringFormatter

/**
* This object holds the same user which are loaded with '_test_data/all_data/admin-data.ttl'. Using this object
* in tests, allows easier updating of details as they change over time.
*/
* This object holds the same user which are loaded with '_test_data/all_data/admin-data.ttl'. Using this object
* in tests, allows easier updating of details as they change over time.
*/
object SharedTestDataADM {

/** ***********************************/
Expand Down Expand Up @@ -1447,6 +1448,247 @@ object SharedTestDataADM {
|}""".stripMargin
}

val gravsearchComplexThingSmallerThanDecimal: String =
"""PREFIX anything: <http://0.0.0.0:3333/ontology/0001/anything/v2#>
|PREFIX knora-api: <http://api.knora.org/ontology/knora-api/v2#>
|
|CONSTRUCT {
| ?thing knora-api:isMainResource true .
| ?thing anything:hasDecimal ?decimal .
|} WHERE {
| ?thing a anything:Thing .
| ?thing anything:hasDecimal ?decimal .
| ?decimal knora-api:decimalValueAsDecimal ?decimalDec .
| FILTER(?decimalDec < "3"^^xsd:decimal)
|}""".stripMargin


val gravsearchComplexRegionsForPage: String =
"""PREFIX incunabula: <http://0.0.0.0:3333/ontology/0803/incunabula/v2#>
|PREFIX knora-api: <http://api.knora.org/ontology/knora-api/v2#>
|
|CONSTRUCT {
| ?region knora-api:isMainResource true .
| ?region knora-api:isRegionOf <http://rdfh.ch/0803/9d626dc76c03> .
| ?region knora-api:hasGeometry ?geom .
| ?region knora-api:hasComment ?comment .
| ?region knora-api:hasColor ?color .
|} WHERE {
| ?region a knora-api:Region .
| ?region knora-api:isRegionOf <http://rdfh.ch/0803/9d626dc76c03> .
| ?region knora-api:hasGeometry ?geom .
| ?region knora-api:hasComment ?comment .
| ?region knora-api:hasColor ?color .
|}""".stripMargin

val createResourceWithValues: String =
"""{
| "@type" : "anything:Thing",
| "anything:hasBoolean" : {
| "@type" : "knora-api:BooleanValue",
| "knora-api:booleanValueAsBoolean" : true
| },
| "anything:hasColor" : {
| "@type" : "knora-api:ColorValue",
| "knora-api:colorValueAsColor" : "#ff3333"
| },
| "anything:hasDate" : {
| "@type" : "knora-api:DateValue",
| "knora-api:dateValueHasCalendar" : "GREGORIAN",
| "knora-api:dateValueHasEndEra" : "CE",
| "knora-api:dateValueHasEndYear" : 1489,
| "knora-api:dateValueHasStartEra" : "CE",
| "knora-api:dateValueHasStartYear" : 1489
| },
| "anything:hasDecimal" : {
| "@type" : "knora-api:DecimalValue",
| "knora-api:decimalValueAsDecimal" : {
| "@type" : "xsd:decimal",
| "@value" : "100000000000000.000000000000001"
| }
| },
| "anything:hasGeometry" : {
| "@type" : "knora-api:GeomValue",
| "knora-api:geometryValueAsGeometry" : "{\"status\":\"active\",\"lineColor\":\"#ff3333\",\"lineWidth\":2,\"points\":[{\"x\":0.08098591549295775,\"y\":0.16741071428571427},{\"x\":0.7394366197183099,\"y\":0.7299107142857143}],\"type\":\"rectangle\",\"original_index\":0}"
| },
| "anything:hasGeoname" : {
| "@type" : "knora-api:GeonameValue",
| "knora-api:geonameValueAsGeonameCode" : "2661604"
| },
| "anything:hasInteger" : [ {
| "@type" : "knora-api:IntValue",
| "knora-api:hasPermissions" : "CR knora-admin:Creator|V http://rdfh.ch/groups/0001/thing-searcher",
| "knora-api:intValueAsInt" : 5,
| "knora-api:valueHasComment" : "this is the number five"
| }, {
| "@type" : "knora-api:IntValue",
| "knora-api:intValueAsInt" : 6
| } ],
| "anything:hasInterval" : {
| "@type" : "knora-api:IntervalValue",
| "knora-api:intervalValueHasEnd" : {
| "@type" : "xsd:decimal",
| "@value" : "3.4"
| },
| "knora-api:intervalValueHasStart" : {
| "@type" : "xsd:decimal",
| "@value" : "1.2"
| }
| },
| "anything:hasListItem" : {
| "@type" : "knora-api:ListValue",
| "knora-api:listValueAsListNode" : {
| "@id" : "http://rdfh.ch/lists/0001/treeList03"
| }
| },
| "anything:hasOtherThingValue" : {
| "@type" : "knora-api:LinkValue",
| "knora-api:linkValueHasTargetIri" : {
| "@id" : "http://rdfh.ch/0001/a-thing"
| }
| },
| "anything:hasRichtext" : {
| "@type" : "knora-api:TextValue",
| "knora-api:textValueAsXml" : "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<text><p><strong>this is</strong> text</p> with standoff</text>",
| "knora-api:textValueHasMapping" : {
| "@id" : "http://rdfh.ch/standoff/mappings/StandardMapping"
| }
| },
| "anything:hasText" : {
| "@type" : "knora-api:TextValue",
| "knora-api:valueAsString" : "this is text without standoff"
| },
| "anything:hasUri" : {
| "@type" : "knora-api:UriValue",
| "knora-api:uriValueAsUri" : {
| "@type" : "xsd:anyURI",
| "@value" : "https://www.knora.org"
| }
| },
| "knora-api:attachedToProject" : {
| "@id" : "http://rdfh.ch/projects/0001"
| },
| "rdfs:label" : "test thing",
| "@context" : {
| "rdf" : "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
| "knora-api" : "http://api.knora.org/ontology/knora-api/v2#",
| "rdfs" : "http://www.w3.org/2000/01/rdf-schema#",
| "xsd" : "http://www.w3.org/2001/XMLSchema#",
| "anything" : "http://0.0.0.0:3333/ontology/0001/anything/v2#"
| }
|}""".stripMargin

def createResourceWithCustomCreationDate(creationDate: Instant): String = {
s"""{
| "@type" : "anything:Thing",
| "knora-api:attachedToProject" : {
| "@id" : "http://rdfh.ch/projects/0001"
| },
| "anything:hasBoolean" : {
| "@type" : "knora-api:BooleanValue",
| "knora-api:booleanValueAsBoolean" : true
| },
| "rdfs:label" : "test thing",
| "knora-api:creationDate" : {
| "@type" : "xsd:dateTimeStamp",
| "@value" : "$creationDate"
| },
| "@context" : {
| "rdf" : "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
| "knora-api" : "http://api.knora.org/ontology/knora-api/v2#",
| "rdfs" : "http://www.w3.org/2000/01/rdf-schema#",
| "xsd" : "http://www.w3.org/2001/XMLSchema#",
| "anything" : "http://0.0.0.0:3333/ontology/0001/anything/v2#"
| }
|}""".stripMargin
}

def createResourceAsUser(userADM: UserADM): String = {
s"""{
| "@type" : "anything:Thing",
| "knora-api:attachedToProject" : {
| "@id" : "http://rdfh.ch/projects/0001"
| },
| "anything:hasBoolean" : {
| "@type" : "knora-api:BooleanValue",
| "knora-api:booleanValueAsBoolean" : true
| },
| "rdfs:label" : "test thing",
| "knora-api:attachedToUser" : {
| "@id" : "${userADM.id}"
| },
| "@context" : {
| "rdf" : "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
| "knora-api" : "http://api.knora.org/ontology/knora-api/v2#",
| "rdfs" : "http://www.w3.org/2000/01/rdf-schema#",
| "xsd" : "http://www.w3.org/2001/XMLSchema#",
| "anything" : "http://0.0.0.0:3333/ontology/0001/anything/v2#"
| }
|}""".stripMargin
}

def updateResourceMetadata(resourceIri: IRI,
newLabel: String,
newPermissions: String,
newModificationDate: Instant): String = {
s"""|{
| "@id" : "$resourceIri",
| "@type" : "anything:Thing",
| "rdfs:label" : "$newLabel",
| "knora-api:hasPermissions" : "$newPermissions",
| "knora-api:newModificationDate" : {
| "@type" : "xsd:dateTimeStamp",
| "@value" : "$newModificationDate"
| },
| "@context" : {
| "rdf" : "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
| "knora-api" : "http://api.knora.org/ontology/knora-api/v2#",
| "rdfs" : "http://www.w3.org/2000/01/rdf-schema#",
| "xsd" : "http://www.w3.org/2001/XMLSchema#",
| "anything" : "http://0.0.0.0:3333/ontology/0001/anything/v2#"
| }
|}""".stripMargin
}

def deleteResource(resourceIri: IRI,
lastModificationDate: Instant): String = {
s"""|{
| "@id" : "$resourceIri",
| "@type" : "anything:Thing",
| "knora-api:lastModificationDate" : {
| "@type" : "xsd:dateTimeStamp",
| "@value" : "$lastModificationDate"
| },
| "knora-api:deleteComment" : "This resource is too boring.",
| "@context" : {
| "rdf" : "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
| "knora-api" : "http://api.knora.org/ontology/knora-api/v2#",
| "rdfs" : "http://www.w3.org/2000/01/rdf-schema#",
| "xsd" : "http://www.w3.org/2001/XMLSchema#",
| "anything" : "http://0.0.0.0:3333/ontology/0001/anything/v2#"
| }
|}""".stripMargin
}

def eraseResource(resourceIri: IRI,
lastModificationDate: Instant): String = {
s"""|{
| "@id" : "$resourceIri",
| "@type" : "anything:Thing",
| "knora-api:lastModificationDate" : {
| "@type" : "xsd:dateTimeStamp",
| "@value" : "$lastModificationDate"
| },
| "@context" : {
| "rdf" : "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
| "knora-api" : "http://api.knora.org/ontology/knora-api/v2#",
| "rdfs" : "http://www.w3.org/2000/01/rdf-schema#",
| "xsd" : "http://www.w3.org/2001/XMLSchema#",
| "anything" : "http://0.0.0.0:3333/ontology/0001/anything/v2#"
| }
|}""".stripMargin
}

object AThing {
val iri: IRI = "http://rdfh.ch/0001/a-thing"
val iriEncoded: String = URLEncoder.encode(iri, "UTF-8")
Expand Down Expand Up @@ -1491,4 +1733,9 @@ object SharedTestDataADM {
val linkValueUuid = "uvRVxzL1RD-t9VIQ1TpfUw"
}

val treeList: IRI = "http://rdfh.ch/lists/0001/treeList"

val treeListNode: IRI = "http://rdfh.ch/lists/0001/treeList01"

val otherTreeList: IRI = "http://rdfh.ch/lists/0001/otherTreeList"
}
8 changes: 4 additions & 4 deletions webapi/src/main/scala/org/knora/webapi/routing/AroundDirectives.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ import akka.http.scaladsl.server.Directives._
import org.knora.webapi.util.InstrumentationSupport

/**
* Akka HTTP directives which can be wrapped around a [[akka.http.scaladsl.server.Route]]].
*/
* Akka HTTP directives which can be wrapped around a [[akka.http.scaladsl.server.Route]]].
*/
trait AroundDirectives extends InstrumentationSupport {

/**
* When wrapped around a [[akka.http.scaladsl.server.Route]], logs the time it took for the route to run.
*/
* When wrapped around a [[akka.http.scaladsl.server.Route]], logs the time it took for the route to run.
*/
def logDuration: Directive0 = extractRequestContext.flatMap { ctx =>
val start = System.currentTimeMillis()
mapResponse { resp =>
Expand Down
Loading