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

feat(clientapi): Return v2 test data #1514

Merged
merged 12 commits into from
Nov 19, 2019
Merged

feat(clientapi): Return v2 test data #1514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f61c6f1
feat(clientapi): Return v2 test data (ongoing).
Nov 11, 2019
fdf0041
feat(clientapi): Return v2 test data (ongoing).
Nov 13, 2019
506447e
feat(clientapi): Return v2 test data (ongoing).
Nov 13, 2019
f9a1159
Merge branch 'develop' into wip/1513-values-test-data
Nov 14, 2019
7530982
feat(clientapi): Return v2 test data (ongoing).
Nov 14, 2019
435bae0
feat(clientapi): Return v2 test data (ongoing).
Nov 14, 2019
85c3fbb
feat(clientapi): Return v2 test data.
Nov 15, 2019
097756f
Merge branch 'develop' into wip/1513-values-test-data
Nov 15, 2019
aa1a33d
Merge branch 'develop' into wip/1513-values-test-data
Nov 15, 2019
2951071
fix(clientapi): Propagage error in getting test data.
Nov 19, 2019
f6cd54c
Merge branch 'develop' into wip/1513-values-test-data
Nov 19, 2019
4777da4
test(api-v2): Test submitting simple schema in value update requests.
Nov 19, 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
34 changes: 28 additions & 6 deletions webapi/_test_data/all_data/anything-data.ttl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,9 @@
anything:hasBoolean <http://rdfh.ch/0001/H6gBWUuJSuuO-CilHV8kQw/values/IN4R19yYR0ygi3K2VEHpUQ>;
anything:hasUri <http://rdfh.ch/0001/H6gBWUuJSuuO-CilHV8kQw/values/uBAmWuRhR-eo1u1eP7qqNg>;
anything:hasInterval <http://rdfh.ch/0001/H6gBWUuJSuuO-CilHV8kQw/values/RbDKPKHWTC-0lkRKae-E6A>;
anything:hasColor <http://rdfh.ch/0001/H6gBWUuJSuuO-CilHV8kQw/values/TAziKNP8QxuyhC4Qf9-b6w> .
anything:hasColor <http://rdfh.ch/0001/H6gBWUuJSuuO-CilHV8kQw/values/TAziKNP8QxuyhC4Qf9-b6w>;
anything:hasGeometry <http://rdfh.ch/0001/H6gBWUuJSuuO-CilHV8kQw/values/we-ybmj-SRen-91n4RaDOQ>;
anything:hasGeoname <http://rdfh.ch/0001/H6gBWUuJSuuO-CilHV8kQw/values/hty-ONF8SwKN2RKU7rLKDg>.

<http://rdfh.ch/0001/H6gBWUuJSuuO-CilHV8kQw/values/-rG4F5FTTu2iB5mTBPVn5Q> a knora-base:DateValue;
knora-base:valueHasUUID "-rG4F5FTTu2iB5mTBPVn5Q"^^xsd:string;
Expand Down Expand Up @@ -226,6 +228,26 @@
knora-base:hasPermissions "CR knora-admin:Creator|M knora-admin:ProjectMember|V knora-admin:KnownUser|RV knora-admin:UnknownUser";
knora-base:attachedToUser <http://rdfh.ch/users/BhkfBc3hTeS_IDo-JgXRbQ> .

<http://rdfh.ch/0001/H6gBWUuJSuuO-CilHV8kQw/values/we-ybmj-SRen-91n4RaDOQ> a knora-base:GeomValue;
knora-base:valueHasUUID "we-ybmj-SRen-91n4RaDOQ"^^xsd:string;
knora-base:isDeleted false;
knora-base:valueCreationDate "2018-05-28T15:52:03.897Z"^^xsd:dateTime;
knora-base:valueHasGeometry """{"status":"active","lineColor":"#ff3333","lineWidth":2,"points":[{"x":0.08098591549295775,"y":0.16741071428571427},{"x":0.7394366197183099,"y":0.7299107142857143}],"type":"rectangle","original_index":0}""";
knora-base:valueHasOrder 0;
knora-base:valueHasString """{"status":"active","lineColor":"#ff3333","lineWidth":2,"points":[{"x":0.08098591549295775,"y":0.16741071428571427},{"x":0.7394366197183099,"y":0.7299107142857143}],"type":"rectangle","original_index":0}""";
knora-base:hasPermissions "CR knora-admin:Creator|M knora-admin:ProjectMember|V knora-admin:KnownUser|RV knora-admin:UnknownUser";
knora-base:attachedToUser <http://rdfh.ch/users/BhkfBc3hTeS_IDo-JgXRbQ> .

<http://rdfh.ch/0001/H6gBWUuJSuuO-CilHV8kQw/values/hty-ONF8SwKN2RKU7rLKDg> a knora-base:GeonameValue;
knora-base:valueHasUUID "hty-ONF8SwKN2RKU7rLKDg"^^xsd:string;
knora-base:isDeleted false;
knora-base:valueCreationDate "2018-05-28T15:52:03.897Z"^^xsd:dateTime;
knora-base:valueHasGeonameCode "2661604";
knora-base:valueHasOrder 0;
knora-base:valueHasString "2661604";
knora-base:hasPermissions "CR knora-admin:Creator|M knora-admin:ProjectMember|V knora-admin:KnownUser|RV knora-admin:UnknownUser";
knora-base:attachedToUser <http://rdfh.ch/users/BhkfBc3hTeS_IDo-JgXRbQ> .

<http://rdfh.ch/0001/H6gBWUuJSuuO-CilHV8kQw/values/XAhEeE3kSVqM4JPGdLt4Ew> a knora-base:ListValue;
knora-base:valueHasUUID "XAhEeE3kSVqM4JPGdLt4Ew"^^xsd:string;
knora-base:isDeleted false;
Expand Down Expand Up @@ -527,10 +549,10 @@
rdfs:label "A thing with a picture";
knora-base:hasPermissions "CR knora-admin:Creator|M knora-admin:ProjectMember|RV knora-admin:UnknownUser";
knora-base:creationDate "2016-03-02T15:05:10Z"^^xsd:dateTime;
knora-base:hasStillImageFileValue <http://rdfh.ch/0001/a-thing-picture/values/file1> .
knora-base:hasStillImageFileValue <http://rdfh.ch/0001/a-thing-picture/values/goZ7JFRNSeqF-dNxsqAS7Q> .

<http://rdfh.ch/0001/a-thing-picture/values/file1> a knora-base:StillImageFileValue;
knora-base:valueHasUUID "file1"^^xsd:string;
<http://rdfh.ch/0001/a-thing-picture/values/goZ7JFRNSeqF-dNxsqAS7Q> a knora-base:StillImageFileValue;
knora-base:valueHasUUID "goZ7JFRNSeqF-dNxsqAS7Q"^^xsd:string;
knora-base:valueHasString "test.tiff";
knora-base:originalFilename "test.tiff";
knora-base:originalMimeType "image/tiff";
Expand All @@ -542,9 +564,9 @@
knora-base:dimX 512;
knora-base:dimY 256;
knora-base:hasPermissions "CR knora-admin:Creator|M knora-admin:ProjectMember|RV knora-admin:UnknownUser" ;
knora-base:previousValue <http://rdfh.ch/0001/a-thing-picture/values/file1a> .
knora-base:previousValue <http://rdfh.ch/0001/a-thing-picture/values/_7a19EDVRh2858kmmRZBOQ> .

<http://rdfh.ch/0001/a-thing-picture/values/file1a> a knora-base:StillImageFileValue;
<http://rdfh.ch/0001/a-thing-picture/values/_7a19EDVRh2858kmmRZBOQ> a knora-base:StillImageFileValue;
knora-base:valueHasString "test.tiff";
knora-base:originalFilename "test.tiff";
knora-base:originalMimeType "image/tiff";
Expand Down
2 changes: 1 addition & 1 deletion webapi/src/it/scala/org/knora/webapi/e2e/v2/KnoraSipiIntegrationV2ITSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ class KnoraSipiIntegrationV2ITSpec extends ITKnoraLiveSpec(KnoraSipiIntegrationV
val uploadedFile: SipiUploadResponseEntry = sipiUploadResponse.uploadedFiles.head
uploadedFile.originalFilename should ===(trp88OriginalFilename)
val resourceIri: IRI = aThingPictureIri
stillImageFileValueIri.set("http://rdfh.ch/0001/a-thing-picture/values/file1")
stillImageFileValueIri.set("http://rdfh.ch/0001/a-thing-picture/values/goZ7JFRNSeqF-dNxsqAS7Q")

// JSON describing the new image to Knora.
val jsonLdEntity =
Expand Down
Loading