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

test: Improve test for serving ontologies in different formats #3115

Merged
merged 32 commits into from
Mar 20, 2024
Merged

test: Improve test for serving ontologies in different formats #3115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
d46d1d9
move test to separate file
BalduinLandolt Mar 13, 2024
ac1ef56
add missing test data
BalduinLandolt Mar 19, 2024
005cdaa
Merge branch 'main' into wip/attempt-cherry-pick
BalduinLandolt Mar 19, 2024
4d440fa
add missing import
BalduinLandolt Mar 19, 2024
ddc857e
restructure the test
BalduinLandolt Mar 13, 2024
6299b4f
restructure
BalduinLandolt Mar 13, 2024
53e6d23
tmp fix compilation warnings
BalduinLandolt Mar 16, 2024
03e216e
continue
BalduinLandolt Mar 16, 2024
009417f
cover more of the previous functionality
BalduinLandolt Mar 18, 2024
166c524
add another test case
BalduinLandolt Mar 18, 2024
d6a8c03
don't persist RDF XML
BalduinLandolt Mar 18, 2024
9c14c5b
avoid false diffs
BalduinLandolt Mar 18, 2024
9a90ac1
comments
BalduinLandolt Mar 18, 2024
2729cc6
add more test cases
BalduinLandolt Mar 18, 2024
ff5c577
more testcases and improved reporting
BalduinLandolt Mar 18, 2024
d215ed4
add new test data for previously untested case
BalduinLandolt Mar 18, 2024
ebb4e1a
clean up
BalduinLandolt Mar 18, 2024
8ba41d3
remove a lot of no longer used test data
BalduinLandolt Mar 18, 2024
04c701f
fmt
BalduinLandolt Mar 18, 2024
d6ccc20
clean up
BalduinLandolt Mar 18, 2024
6fd0692
bring back falsely removed test data
BalduinLandolt Mar 18, 2024
6ddc1df
improve error message
BalduinLandolt Mar 19, 2024
82f3afa
more test cases
BalduinLandolt Mar 19, 2024
ac2e76a
clean up
BalduinLandolt Mar 19, 2024
19ea0a2
add missing test data
BalduinLandolt Mar 19, 2024
51b4af5
more test cases
BalduinLandolt Mar 19, 2024
cf3adce
Merge branch 'main' into wip/move-ontology-test-to-separate-file
BalduinLandolt Mar 19, 2024
eb98ab5
remove unused test data files
BalduinLandolt Mar 19, 2024
7139db3
finalize
BalduinLandolt Mar 19, 2024
f0840fd
update expected client test data
BalduinLandolt Mar 19, 2024
1ff78e6
Merge branch 'main' into wip/move-ontology-test-to-separate-file
BalduinLandolt Mar 19, 2024
fdc73a3
Merge branch 'main' into wip/move-ontology-test-to-separate-file
BalduinLandolt Mar 20, 2024
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
555 changes: 283 additions & 272 deletions integration/src/test/scala/org/knora/webapi/e2e/v2/OntologyFormatsE2ESpec.scala
View file
Open in desktop

Large diffs are not rendered by default.

15 changes: 9 additions & 6 deletions integration/src/test/scala/org/knora/webapi/sharedtestdata/SharedOntologyTestDataADM.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,15 @@ object SharedOntologyTestDataADM {
val LocalHost_Ontology = "http://0.0.0.0:3333/ontology"

// anything
val ANYTHING_ONTOLOGY_IRI: IRI = OntologyConstants.KnoraInternal.InternalOntologyStart + "/0001/anything"
val ANYTHING_ONTOLOGY_IRI_LocalHost: IRI = LocalHost_Ontology + "/0001/anything/v2"
val ANYTHING_DATA_IRI: IRI = OntologyConstants.NamedGraphs.DataNamedGraphStart + "/0001/anything"
val ANYTHING_THING_RESOURCE_CLASS_LocalHost: IRI = ANYTHING_ONTOLOGY_IRI_LocalHost + "#" + "Thing"
val ANYTHING_HasListItem_PROPERTY_LocalHost: IRI = ANYTHING_ONTOLOGY_IRI_LocalHost + "#" + "hasListItem"
val ANYTHING_HasDate_PROPERTY_LocalHost: IRI = ANYTHING_ONTOLOGY_IRI_LocalHost + "#" + "hasDate"
val ANYTHING_ONTOLOGY_IRI: IRI = OntologyConstants.KnoraInternal.InternalOntologyStart + "/0001/anything"
val ANYTHING_ONTOLOGY_IRI_LocalHost: IRI = LocalHost_Ontology + "/0001/anything/v2"
val ANYTHING_ONTOLOGY_IRI_LocalHost_SIMPLE: IRI = LocalHost_Ontology + "/0001/anything/simple/v2"
val ANYTHING_DATA_IRI: IRI = OntologyConstants.NamedGraphs.DataNamedGraphStart + "/0001/anything"
val ANYTHING_THING_RESOURCE_CLASS_LocalHost: IRI = ANYTHING_ONTOLOGY_IRI_LocalHost + "#" + "Thing"
val ANYTHING_THING_RESOURCE_CLASS_LocalHost_SIMPLE: IRI = ANYTHING_ONTOLOGY_IRI_LocalHost_SIMPLE + "#" + "Thing"
val ANYTHING_HasListItem_PROPERTY_LocalHost: IRI = ANYTHING_ONTOLOGY_IRI_LocalHost + "#" + "hasListItem"
val ANYTHING_HasListItem_PROPERTY_LocalHost_SIMPLE: IRI = ANYTHING_ONTOLOGY_IRI_LocalHost_SIMPLE + "#" + "hasListItem"
val ANYTHING_HasDate_PROPERTY_LocalHost: IRI = ANYTHING_ONTOLOGY_IRI_LocalHost + "#" + "hasDate"

// something
val SomethingOntologyIri: IRI = OntologyConstants.KnoraInternal.InternalOntologyStart + "/0001/something"
Expand Down
179 changes: 0 additions & 179 deletions test_data/generated_test_data/ontologyR2RV2/allOntologyMetadata.jsonld
View file
Open in desktop

This file was deleted.

99 changes: 0 additions & 99 deletions test_data/generated_test_data/ontologyR2RV2/allOntologyMetadata.rdf
View file
Open in desktop

This file was deleted.

Loading
Loading