-
Notifications
You must be signed in to change notification settings - Fork 74
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into specific-aggs
- Loading branch information
Showing
7 changed files
with
220 additions
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| { | ||
| "@context" : "https://bluebrain.github.io/nexus/contexts/error.json", | ||
| "@type" : "BlankResourceId", | ||
| "reason" : "Resource identifier cannot be blank." | ||
| } |
97 changes: 97 additions & 0 deletions
97
delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/ce/CatsResponseToJsonLdSpec.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| package ch.epfl.bluebrain.nexus.delta.sdk.ce | ||
|
|
||
| import akka.http.scaladsl.model.ContentTypes.`text/plain(UTF-8)` | ||
| import akka.http.scaladsl.model.MediaRanges.`*/*` | ||
| import akka.http.scaladsl.model.headers.Accept | ||
| import akka.http.scaladsl.model.{ContentType, StatusCodes} | ||
| import akka.http.scaladsl.server.RouteConcatenation | ||
| import akka.stream.scaladsl.Source | ||
| import akka.util.ByteString | ||
| import ch.epfl.bluebrain.nexus.delta.rdf.RdfMediaTypes.`application/ld+json` | ||
| import ch.epfl.bluebrain.nexus.delta.rdf.Vocabulary.contexts | ||
| import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.context.RemoteContextResolution | ||
| import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.encoder.JsonLdEncoder | ||
| import ch.epfl.bluebrain.nexus.delta.rdf.syntax.JsonSyntax | ||
| import ch.epfl.bluebrain.nexus.delta.rdf.utils.JsonKeyOrdering | ||
| import ch.epfl.bluebrain.nexus.delta.sdk.ce.DeltaDirectives._ | ||
| import ch.epfl.bluebrain.nexus.delta.sdk.directives.FileResponse | ||
| import ch.epfl.bluebrain.nexus.delta.sdk.marshalling.HttpResponseFields | ||
| import ch.epfl.bluebrain.nexus.delta.sdk.resources.model.ResourceRejection | ||
| import ch.epfl.bluebrain.nexus.delta.sdk.resources.model.ResourceRejection.BlankResourceId | ||
| import ch.epfl.bluebrain.nexus.delta.sdk.utils.RouteHelpers | ||
| import ch.epfl.bluebrain.nexus.delta.sdk.{AkkaSource, SimpleRejection, SimpleResource} | ||
| import ch.epfl.bluebrain.nexus.testkit.ShouldMatchers.convertToAnyShouldWrapper | ||
| import ch.epfl.bluebrain.nexus.testkit.TestHelpers.jsonContentOf | ||
| import monix.bio.IO | ||
| import cats.effect.{IO => CatsIO} | ||
| import monix.execution.Scheduler | ||
|
|
||
| class CatsResponseToJsonLdSpec extends RouteHelpers with JsonSyntax with RouteConcatenation { | ||
|
|
||
| implicit val s: Scheduler = Scheduler.global | ||
| implicit val rcr: RemoteContextResolution = | ||
| RemoteContextResolution.fixed( | ||
| SimpleResource.contextIri -> SimpleResource.context, | ||
| SimpleRejection.contextIri -> SimpleRejection.context, | ||
| contexts.error -> jsonContentOf("/contexts/error.json").topContextValueOrEmpty | ||
| ) | ||
| implicit val jo: JsonKeyOrdering = JsonKeyOrdering.default() | ||
|
|
||
| private def responseWithSourceError[E: JsonLdEncoder: HttpResponseFields](error: E) = { | ||
| responseWith( | ||
| `text/plain(UTF-8)`, | ||
| IO.raiseError(error) | ||
| ) | ||
| } | ||
|
|
||
| private val expectedBlankIdErrorResponse = jsonContentOf( | ||
| "/directives/blank-id.json" | ||
| ) | ||
|
|
||
| private val FileContents = "hello" | ||
|
|
||
| private def fileSourceOfString(value: String) = { | ||
| IO.pure(Source.single(ByteString(value))) | ||
| } | ||
|
|
||
| private def responseWith[E: JsonLdEncoder: HttpResponseFields]( | ||
| contentType: ContentType, | ||
| contents: IO[E, AkkaSource] | ||
| ) = { | ||
| CatsIO.pure( | ||
| Right( | ||
| FileResponse( | ||
| "file.name", | ||
| contentType, | ||
| 1024, | ||
| contents | ||
| ) | ||
| ) | ||
| ) | ||
| } | ||
|
|
||
| private def request = { | ||
| Get() ~> Accept(`*/*`) | ||
| } | ||
|
|
||
| "ResponseToJsonLd file handling" should { | ||
|
|
||
| "Return the contents of a file" in { | ||
| request ~> emit( | ||
| responseWith(`text/plain(UTF-8)`, fileSourceOfString(FileContents)) | ||
| ) ~> check { | ||
| status shouldEqual StatusCodes.OK | ||
| contentType shouldEqual `text/plain(UTF-8)` | ||
| response.asString shouldEqual FileContents | ||
| } | ||
| } | ||
|
|
||
| "Return an error from a file content IO" in { | ||
| request ~> emit(responseWithSourceError[ResourceRejection](BlankResourceId)) ~> check { | ||
| status shouldEqual StatusCodes.BadRequest // BlankResourceId is supposed to result in BadRequest | ||
| contentType.mediaType shouldEqual `application/ld+json` | ||
| response.asJson shouldEqual expectedBlankIdErrorResponse | ||
| } | ||
| } | ||
| } | ||
| } |
93 changes: 93 additions & 0 deletions
93
...dk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/directives/ResponseToJsonLdSpec.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| package ch.epfl.bluebrain.nexus.delta.sdk.directives | ||
|
|
||
| import akka.http.scaladsl.model.ContentTypes.`text/plain(UTF-8)` | ||
| import akka.http.scaladsl.model.MediaRanges.`*/*` | ||
| import akka.http.scaladsl.model.headers.Accept | ||
| import akka.http.scaladsl.model.{ContentType, StatusCodes} | ||
| import akka.http.scaladsl.server.RouteConcatenation | ||
| import akka.stream.scaladsl.Source | ||
| import akka.util.ByteString | ||
| import ch.epfl.bluebrain.nexus.delta.rdf.RdfMediaTypes.`application/ld+json` | ||
| import ch.epfl.bluebrain.nexus.delta.rdf.Vocabulary.contexts | ||
| import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.context.RemoteContextResolution | ||
| import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.encoder.JsonLdEncoder | ||
| import ch.epfl.bluebrain.nexus.delta.rdf.syntax.JsonSyntax | ||
| import ch.epfl.bluebrain.nexus.delta.rdf.utils.JsonKeyOrdering | ||
| import ch.epfl.bluebrain.nexus.delta.sdk.directives.DeltaDirectives._ | ||
| import ch.epfl.bluebrain.nexus.delta.sdk.marshalling.HttpResponseFields | ||
| import ch.epfl.bluebrain.nexus.delta.sdk.resources.model.ResourceRejection | ||
| import ch.epfl.bluebrain.nexus.delta.sdk.resources.model.ResourceRejection.BlankResourceId | ||
| import ch.epfl.bluebrain.nexus.delta.sdk.utils.RouteHelpers | ||
| import ch.epfl.bluebrain.nexus.delta.sdk.{AkkaSource, SimpleRejection, SimpleResource} | ||
| import ch.epfl.bluebrain.nexus.testkit.ShouldMatchers.convertToAnyShouldWrapper | ||
| import ch.epfl.bluebrain.nexus.testkit.TestHelpers.jsonContentOf | ||
| import monix.bio.IO | ||
| import monix.execution.Scheduler | ||
|
|
||
| class ResponseToJsonLdSpec extends RouteHelpers with JsonSyntax with RouteConcatenation { | ||
|
|
||
| implicit val s: Scheduler = Scheduler.global | ||
| implicit val rcr: RemoteContextResolution = | ||
| RemoteContextResolution.fixed( | ||
| SimpleResource.contextIri -> SimpleResource.context, | ||
| SimpleRejection.contextIri -> SimpleRejection.context, | ||
| contexts.error -> jsonContentOf("/contexts/error.json").topContextValueOrEmpty | ||
| ) | ||
| implicit val jo: JsonKeyOrdering = JsonKeyOrdering.default() | ||
|
|
||
| private def responseWithSourceError[E: JsonLdEncoder: HttpResponseFields](error: E) = { | ||
| responseWith( | ||
| `text/plain(UTF-8)`, | ||
| IO.raiseError(error) | ||
| ) | ||
| } | ||
|
|
||
| private val expectedBlankIdErrorResponse = jsonContentOf( | ||
| "/directives/blank-id.json" | ||
| ) | ||
|
|
||
| private val FileContents = "hello" | ||
|
|
||
| private def fileSourceOfString(value: String) = { | ||
| IO.pure(Source.single(ByteString(value))) | ||
| } | ||
|
|
||
| private def responseWith[E: JsonLdEncoder: HttpResponseFields]( | ||
| contentType: ContentType, | ||
| contents: IO[E, AkkaSource] | ||
| ) = { | ||
| IO.pure( | ||
| FileResponse( | ||
| "file.name", | ||
| contentType, | ||
| 1024, | ||
| contents | ||
| ) | ||
| ) | ||
| } | ||
|
|
||
| private def request = { | ||
| Get() ~> Accept(`*/*`) | ||
| } | ||
|
|
||
| "ResponseToJsonLd file handling" should { | ||
|
|
||
| "Return the contents of a file" in { | ||
| request ~> emit( | ||
| responseWith(`text/plain(UTF-8)`, fileSourceOfString(FileContents)) | ||
| ) ~> check { | ||
| status shouldEqual StatusCodes.OK | ||
| contentType shouldEqual `text/plain(UTF-8)` | ||
| response.asString shouldEqual FileContents | ||
| } | ||
| } | ||
|
|
||
| "Return an error from a file content IO" in { | ||
| request ~> emit(responseWithSourceError[ResourceRejection](BlankResourceId)) ~> check { | ||
| status shouldEqual StatusCodes.BadRequest // BlankResourceId is supposed to result in BadRequest | ||
| contentType.mediaType shouldEqual `application/ld+json` | ||
| response.asJson shouldEqual expectedBlankIdErrorResponse | ||
| } | ||
| } | ||
| } | ||
| } |