Skip to content

Commit

Permalink
test: Migrate InputOntologyV2Spec to become a simple unit zio-test in…
Browse files Browse the repository at this point in the history 
… the test source set (#3449)
  • Loading branch information
@seakayone
seakayone authored Jan 2, 2025
1 parent 23c3c6e commit 63aed0f
Show file tree
Hide file tree
Showing 2 changed files with 100 additions and 105 deletions.
3 changes: 0 additions & 3 deletions integration/src/test/scala/org/knora/webapi/it/v2/KnoraSipiAuthenticationITSpec.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import org.apache.pekko.http.scaladsl.model.headers.BasicHttpCredentials
import org.apache.pekko.http.scaladsl.unmarshalling.Unmarshal
import zio.ZIO

import java.nio.file.Paths
import scala.concurrent.Await
import scala.concurrent.duration.*

Expand All @@ -34,8 +33,6 @@ class KnoraSipiAuthenticationITSpec
private val anythingUserEmail = SharedTestDataADM.anythingAdminUser.email
private val password = SharedTestDataADM.testPass

private val marblesOriginalFilename = "marbles.tif"

override lazy val rdfDataObjects: List[RdfDataObject] = List(
RdfDataObject(
path = "test_data/project_data/anything-data.ttl",
Expand Down
202 changes: 100 additions & 102 deletions ...ntologymessages/InputOntologyV2Spec.scala → ...ntologymessages/InputOntologyV2Spec.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,14 @@

package org.knora.webapi.messages.v2.responder.ontologymessages

import zio.ZIO
import zio.test.*
import zio.test.Assertion.*

import java.time.Instant

import dsp.errors.BadRequestException
import org.knora.webapi.ApiV2Complex
import org.knora.webapi.CoreSpec
import org.knora.webapi.messages.IriConversions.*
import org.knora.webapi.messages.StringFormatter
import org.knora.webapi.messages.store.triplestoremessages.SmartIriLiteralV2
Expand All @@ -21,12 +24,92 @@ import org.knora.webapi.slice.ontology.domain.model.Cardinality.ZeroOrOne
/**
* Tests [[InputOntologyV2]].
*/
class InputOntologyV2Spec extends CoreSpec {
object InputOntologyV2Spec extends ZIOSpecDefault {
private implicit val stringFormatter: StringFormatter = StringFormatter.getGeneralInstance

import InputOntologyV2Spec.*
private val PropertyDef = InputOntologyV2(
ontologyMetadata = OntologyMetadataV2(
ontologyIri = "http://0.0.0.0:3333/ontology/0001/anything/v2".toSmartIri,
label = None,
lastModificationDate = Some(Instant.parse("2017-12-19T15:23:42.166Z")),
),
properties = Map(
"http://0.0.0.0:3333/ontology/0001/anything/v2#hasName".toSmartIri -> PropertyInfoContentV2(
propertyIri = "http://0.0.0.0:3333/ontology/0001/anything/v2#hasName".toSmartIri,
predicates = Map(
"http://www.w3.org/1999/02/22-rdf-syntax-ns#type".toSmartIri -> PredicateInfoV2(
predicateIri = "http://www.w3.org/1999/02/22-rdf-syntax-ns#type".toSmartIri,
objects = Seq(SmartIriLiteralV2("http://www.w3.org/2002/07/owl#ObjectProperty".toSmartIri)),
),
"http://api.knora.org/ontology/knora-api/v2#subjectType".toSmartIri -> PredicateInfoV2(
predicateIri = "http://api.knora.org/ontology/knora-api/v2#subjectType".toSmartIri,
objects = Seq(SmartIriLiteralV2("http://0.0.0.0:3333/ontology/0001/anything/v2#Thing".toSmartIri)),
),
"http://api.knora.org/ontology/knora-api/v2#objectType".toSmartIri -> PredicateInfoV2(
predicateIri = "http://api.knora.org/ontology/knora-api/v2#objectType".toSmartIri,
objects = Seq(SmartIriLiteralV2("http://api.knora.org/ontology/knora-api/v2#TextValue".toSmartIri)),
),
"http://www.w3.org/2000/01/rdf-schema#label".toSmartIri -> PredicateInfoV2(
predicateIri = "http://www.w3.org/2000/01/rdf-schema#label".toSmartIri,
objects = Seq(
StringLiteralV2.from("has name", Some("en")),
StringLiteralV2.from("hat Namen", Some("de")),
),
),
"http://www.w3.org/2000/01/rdf-schema#comment".toSmartIri -> PredicateInfoV2(
predicateIri = "http://www.w3.org/2000/01/rdf-schema#comment".toSmartIri,
objects = Seq(
StringLiteralV2.from("The name of a 'Thing'", Some("en")),
StringLiteralV2.from("Der Name eines Dinges", Some("de")),
),
),
),
subPropertyOf = Set(
"http://api.knora.org/ontology/knora-api/v2#hasValue".toSmartIri,
"http://schema.org/name".toSmartIri,
),
ontologySchema = ApiV2Complex,
),
),
)

private val ClassDef = InputOntologyV2(
classes = Map(
"http://0.0.0.0:3333/ontology/0001/anything/v2#WildThing".toSmartIri -> ClassInfoContentV2(
predicates = Map(
"http://www.w3.org/1999/02/22-rdf-syntax-ns#type".toSmartIri -> PredicateInfoV2(
predicateIri = "http://www.w3.org/1999/02/22-rdf-syntax-ns#type".toSmartIri,
objects = Seq(SmartIriLiteralV2("http://www.w3.org/2002/07/owl#Class".toSmartIri)),
),
"http://www.w3.org/2000/01/rdf-schema#label".toSmartIri -> PredicateInfoV2(
predicateIri = "http://www.w3.org/2000/01/rdf-schema#label".toSmartIri,
objects = Seq(StringLiteralV2.from("wild thing", Some("en"))),
),
"http://www.w3.org/2000/01/rdf-schema#comment".toSmartIri -> PredicateInfoV2(
predicateIri = "http://www.w3.org/2000/01/rdf-schema#comment".toSmartIri,
objects = Seq(StringLiteralV2.from("A thing that is wild", Some("en"))),
),
),
classIri = "http://0.0.0.0:3333/ontology/0001/anything/v2#WildThing".toSmartIri,
ontologySchema = ApiV2Complex,
directCardinalities = Map(
"http://0.0.0.0:3333/ontology/0001/anything/v2#hasName".toSmartIri -> KnoraCardinalityInfo(
ZeroOrOne,
),
),
subClassOf = Set("http://0.0.0.0:3333/ontology/0001/anything/v2#Thing".toSmartIri),
),
),
ontologyMetadata = OntologyMetadataV2(
ontologyIri = "http://0.0.0.0:3333/ontology/0001/anything/v2".toSmartIri,
lastModificationDate = Some(Instant.parse("2017-12-19T15:23:42.166Z")),
),
properties = Map(),
)

val spec = suite("InputOntologyV2")(
test("parse a property definition") {

"InputOntologyV2" should {
"parse a property definition" in {
val params =
"""
|{
Expand Down Expand Up @@ -76,11 +159,10 @@ class InputOntologyV2Spec extends CoreSpec {
|}
""".stripMargin

val paramsAsInput: InputOntologyV2 = InputOntologyV2.fromJsonLD(JsonLDUtil.parseJsonLD(params)).unescape
paramsAsInput should ===(PropertyDef)
}

"parse a class definition" in {
val actual = InputOntologyV2.fromJsonLD(JsonLDUtil.parseJsonLD(params)).unescape
assertTrue(actual == PropertyDef)
},
test("parse a class definition") {
val params =
s"""
|{
Expand Down Expand Up @@ -122,11 +204,11 @@ class InputOntologyV2Spec extends CoreSpec {
|}
""".stripMargin

val paramsAsInput: InputOntologyV2 = InputOntologyV2.fromJsonLD(JsonLDUtil.parseJsonLD(params)).unescape
paramsAsInput should ===(ClassDef)
}
val actual = InputOntologyV2.fromJsonLD(JsonLDUtil.parseJsonLD(params)).unescape
assertTrue(actual == ClassDef)
},
test("reject an entity definition with an invalid IRI") {

"reject an entity definition in the wrong ontology" in {
val params =
s"""
|{
Expand Down Expand Up @@ -168,93 +250,9 @@ class InputOntologyV2Spec extends CoreSpec {
|}
""".stripMargin

assertThrows[BadRequestException] {
InputOntologyV2.fromJsonLD(JsonLDUtil.parseJsonLD(params))
}
}
}
}

object InputOntologyV2Spec {
private implicit val stringFormatter: StringFormatter = StringFormatter.getGeneralInstance

val PropertyDef = InputOntologyV2(
ontologyMetadata = OntologyMetadataV2(
ontologyIri = "http://0.0.0.0:3333/ontology/0001/anything/v2".toSmartIri,
label = None,
lastModificationDate = Some(Instant.parse("2017-12-19T15:23:42.166Z")),
),
properties = Map(
"http://0.0.0.0:3333/ontology/0001/anything/v2#hasName".toSmartIri -> PropertyInfoContentV2(
propertyIri = "http://0.0.0.0:3333/ontology/0001/anything/v2#hasName".toSmartIri,
predicates = Map(
"http://www.w3.org/1999/02/22-rdf-syntax-ns#type".toSmartIri -> PredicateInfoV2(
predicateIri = "http://www.w3.org/1999/02/22-rdf-syntax-ns#type".toSmartIri,
objects = Seq(SmartIriLiteralV2("http://www.w3.org/2002/07/owl#ObjectProperty".toSmartIri)),
),
"http://api.knora.org/ontology/knora-api/v2#subjectType".toSmartIri -> PredicateInfoV2(
predicateIri = "http://api.knora.org/ontology/knora-api/v2#subjectType".toSmartIri,
objects = Seq(SmartIriLiteralV2("http://0.0.0.0:3333/ontology/0001/anything/v2#Thing".toSmartIri)),
),
"http://api.knora.org/ontology/knora-api/v2#objectType".toSmartIri -> PredicateInfoV2(
predicateIri = "http://api.knora.org/ontology/knora-api/v2#objectType".toSmartIri,
objects = Seq(SmartIriLiteralV2("http://api.knora.org/ontology/knora-api/v2#TextValue".toSmartIri)),
),
"http://www.w3.org/2000/01/rdf-schema#label".toSmartIri -> PredicateInfoV2(
predicateIri = "http://www.w3.org/2000/01/rdf-schema#label".toSmartIri,
objects = Seq(
StringLiteralV2.from("has name", Some("en")),
StringLiteralV2.from("hat Namen", Some("de")),
),
),
"http://www.w3.org/2000/01/rdf-schema#comment".toSmartIri -> PredicateInfoV2(
predicateIri = "http://www.w3.org/2000/01/rdf-schema#comment".toSmartIri,
objects = Seq(
StringLiteralV2.from("The name of a 'Thing'", Some("en")),
StringLiteralV2.from("Der Name eines Dinges", Some("de")),
),
),
),
subPropertyOf = Set(
"http://api.knora.org/ontology/knora-api/v2#hasValue".toSmartIri,
"http://schema.org/name".toSmartIri,
),
ontologySchema = ApiV2Complex,
),
),
)

val ClassDef = InputOntologyV2(
classes = Map(
"http://0.0.0.0:3333/ontology/0001/anything/v2#WildThing".toSmartIri -> ClassInfoContentV2(
predicates = Map(
"http://www.w3.org/1999/02/22-rdf-syntax-ns#type".toSmartIri -> PredicateInfoV2(
predicateIri = "http://www.w3.org/1999/02/22-rdf-syntax-ns#type".toSmartIri,
objects = Seq(SmartIriLiteralV2("http://www.w3.org/2002/07/owl#Class".toSmartIri)),
),
"http://www.w3.org/2000/01/rdf-schema#label".toSmartIri -> PredicateInfoV2(
predicateIri = "http://www.w3.org/2000/01/rdf-schema#label".toSmartIri,
objects = Seq(StringLiteralV2.from("wild thing", Some("en"))),
),
"http://www.w3.org/2000/01/rdf-schema#comment".toSmartIri -> PredicateInfoV2(
predicateIri = "http://www.w3.org/2000/01/rdf-schema#comment".toSmartIri,
objects = Seq(StringLiteralV2.from("A thing that is wild", Some("en"))),
),
),
classIri = "http://0.0.0.0:3333/ontology/0001/anything/v2#WildThing".toSmartIri,
ontologySchema = ApiV2Complex,
directCardinalities = Map(
"http://0.0.0.0:3333/ontology/0001/anything/v2#hasName".toSmartIri -> KnoraCardinalityInfo(
ZeroOrOne,
),
),
subClassOf = Set("http://0.0.0.0:3333/ontology/0001/anything/v2#Thing".toSmartIri),
),
),
ontologyMetadata = OntologyMetadataV2(
ontologyIri = "http://0.0.0.0:3333/ontology/0001/anything/v2".toSmartIri,
lastModificationDate = Some(Instant.parse("2017-12-19T15:23:42.166Z")),
),
properties = Map(),
for {
exit <- ZIO.attempt(InputOntologyV2.fromJsonLD(JsonLDUtil.parseJsonLD(params))).exit
} yield assert(exit)(failsWithA[BadRequestException])
},
)
}

0 comments on commit 63aed0f

Please sign in to comment.