raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Merge pull request #17987 from spray/w/17984-enable-content-negotiation-tests

Browse source 
ContentNegotiation fixes (and breakage)
This commit is contained in:
Konrad Malawski 2015-07-14 17:38:09 +02:00
commit 12fa39cc39
3 changed files with 68 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

1
akka-http-core/src/main/scala/akka/http/scaladsl/model/HttpCharset.scala
View file

@ -70,6 +70,7 @@ final case class HttpCharset private[http] (override val value: String)(val alia
}
def withQValue(qValue: Float): HttpCharsetRange = HttpCharsetRange(this, qValue.toFloat)
override def toRange: HttpCharsetRange = HttpCharsetRange(this)
/** Java API */
def getAliases: JIterable[String] = {

102
akka-http-tests/src/test/scala/akka/http/scaladsl/marshalling/ContentNegotiationSpec.scala
View file

@ -4,6 +4,9 @@
package akka.http.scaladsl.marshalling
import akka.http.scaladsl.model.MediaType.Encoding
import akka.http.scaladsl.unmarshalling.FromResponseUnmarshaller
import scala.concurrent.Await
import scala.concurrent.duration._
import org.scalatest.{ Matchers, FreeSpec }
@ -13,83 +16,87 @@ import MediaTypes._
import HttpCharsets._
class ContentNegotiationSpec extends FreeSpec with Matchers {
"Content Negotiation should work properly for requests with header(s)" - {
"(without headers)" in test { accept ⇒
"(without headers)" test { accept ⇒
//accept(`text/plain`) should select(`text/plain`, `UTF-8`)
accept(`text/plain` withCharset `UTF-16`) should select(`text/plain`, `UTF-16`)
}
"Accept: */*" test { accept ⇒
accept(`text/plain`) should select(`text/plain`, `UTF-8`)
accept(`text/plain` withCharset `UTF-16`) should select(`text/plain`, `UTF-16`)
}
"Accept: */*" in test { accept ⇒
"Accept: */*;q=.8" test { accept ⇒
accept(`text/plain`) should select(`text/plain`, `UTF-8`)
accept(`text/plain` withCharset `UTF-16`) should select(`text/plain`, `UTF-16`)
}
"Accept: */*;q=.8" in test { accept ⇒
accept(`text/plain`) should select(`text/plain`, `UTF-8`)
accept(`text/plain` withCharset `UTF-16`) should select(`text/plain`, `UTF-16`)
}
"Accept: text/*" in test { accept ⇒
"Accept: text/*" test { accept ⇒
accept(`text/plain`) should select(`text/plain`, `UTF-8`)
accept(`text/xml` withCharset `UTF-16`) should select(`text/xml`, `UTF-16`)
accept(`audio/ogg`) should reject
}
"Accept: text/*;q=.8" in test { accept ⇒
"Accept: text/*;q=.8" test { accept ⇒
accept(`text/plain`) should select(`text/plain`, `UTF-8`)
accept(`text/xml` withCharset `UTF-16`) should select(`text/xml`, `UTF-16`)
accept(`audio/ogg`) should reject
}
"Accept: text/*;q=0" in test { accept ⇒
"Accept: text/*;q=0" test { accept ⇒
accept(`text/plain`) should reject
accept(`text/xml` withCharset `UTF-16`) should reject
accept(`audio/ogg`) should reject
}
"Accept-Charset: UTF-16" in test { accept ⇒
"Accept-Charset: UTF-16" test { accept ⇒
accept(`text/plain`) should select(`text/plain`, `UTF-16`)
accept(`text/plain` withCharset `UTF-8`) should reject
}
"Accept-Charset: UTF-16, UTF-8" in test { accept ⇒
"manually created Accept-Charset: UTF-16" in testHeaders(headers.`Accept-Charset`(Vector(HttpCharsets.`UTF-16`.toRange))) { accept ⇒
accept(`text/plain`) should select(`text/plain`, `UTF-16`)
accept(`text/plain` withCharset `UTF-8`) should reject
}
"Accept-Charset: UTF-16, UTF-8" test { accept ⇒
accept(`text/plain`) should select(`text/plain`, `UTF-8`)
accept(`text/plain` withCharset `UTF-16`) should select(`text/plain`, `UTF-16`)
}
"Accept-Charset: UTF-8;q=.2, UTF-16" in test { accept ⇒
"Accept-Charset: UTF-8;q=.2, UTF-16" test { accept ⇒
accept(`text/plain`) should select(`text/plain`, `UTF-16`)
accept(`text/plain` withCharset `UTF-8`) should select(`text/plain`, `UTF-8`)
}
"Accept-Charset: UTF-8;q=.2" in test { accept ⇒
"Accept-Charset: ISO-8859-1;q=.2" test { accept ⇒
accept(`text/plain`) should select(`text/plain`, `ISO-8859-1`)
accept(`text/plain` withCharset `UTF-8`) should select(`text/plain`, `UTF-8`)
accept(`text/plain` withCharset `UTF-8`) should reject
}
"Accept-Charset: latin1;q=.1, UTF-8;q=.2" in test { accept ⇒
"Accept-Charset: latin1;q=.1, UTF-8;q=.2" test { accept ⇒
accept(`text/plain`) should select(`text/plain`, `UTF-8`)
accept(`text/plain` withCharset `UTF-8`) should select(`text/plain`, `UTF-8`)
}
"Accept-Charset: *" in test { accept ⇒
"Accept-Charset: *" test { accept ⇒
accept(`text/plain`) should select(`text/plain`, `UTF-8`)
accept(`text/plain` withCharset `UTF-16`) should select(`text/plain`, `UTF-16`)
}
"Accept-Charset: *;q=0" in test { accept ⇒
"Accept-Charset: *;q=0" test { accept ⇒
accept(`text/plain`) should reject
accept(`text/plain` withCharset `UTF-16`) should reject
}
"Accept-Charset: us;q=0.1,*;q=0" in test { accept ⇒
"Accept-Charset: us;q=0.1,*;q=0" test { accept ⇒
accept(`text/plain`) should select(`text/plain`, `US-ASCII`)
accept(`text/plain` withCharset `UTF-8`) should reject
}
"Accept: text/xml, text/html;q=.5" in test { accept ⇒
"Accept: text/xml, text/html;q=.5" test { accept ⇒
accept(`text/plain`) should reject
accept(`text/xml`) should select(`text/xml`, `UTF-8`)
accept(`text/html`) should select(`text/html`, `UTF-8`)
@ -100,16 +107,46 @@ class ContentNegotiationSpec extends FreeSpec with Matchers {
}
"""Accept: text/html, text/plain;q=0.8, application/*;q=.5, *;q= .2
Accept-Charset: UTF-16""" in test { accept ⇒
Accept-Charset: UTF-16""" test { accept ⇒
accept(`text/plain`, `text/html`, `audio/ogg`) should select(`text/html`, `UTF-16`)
accept(`text/plain`, `text/html` withCharset `UTF-8`, `audio/ogg`) should select(`text/plain`, `UTF-16`)
accept(`audio/ogg`, `application/javascript`, `text/plain` withCharset `UTF-8`) should select(`application/javascript`, `UTF-16`)
accept(`image/gif`, `application/javascript`) should select(`application/javascript`, `UTF-16`)
accept(`image/gif`, `audio/ogg`) should select(`image/gif`, `UTF-16`)
accept(`image/gif`, `audio/ogg`) should select(`image/gif`)
}
}
def test[U](body: ((ContentType*) ⇒ Option[ContentType]) ⇒ U): String ⇒ U = { example ⇒
def testHeaders[U](headers: HttpHeader*)(body: ((ContentType*) ⇒ Option[ContentType]) ⇒ U): U = {
val request = HttpRequest(headers = headers.toVector)
body { contentTypes ⇒
import scala.concurrent.ExecutionContext.Implicits.global
// creates a pseudo marshaller for X, that applies for all the given content types
trait X
object X extends X
implicit val marshallers: ToEntityMarshaller[X] =
Marshaller.oneOf(contentTypes map {
case ct @ ContentType(mt, Some(cs)) ⇒
Marshaller.withFixedCharset(mt, cs)((s: X) ⇒ HttpEntity(ct, "The X"))
case ContentType(mt, None) ⇒
mt.encoding match {
case Encoding.Open ⇒ Marshaller.withOpenCharset(mt)((s: X, cs) ⇒ HttpEntity(ContentType(mt, cs), "The X"))
case _ ⇒ Marshaller.withOpenCharset(mt)((s: X, _) ⇒ HttpEntity(ContentType(mt, None), "The X"))
}
}: _*)
Await.result(Marshal(X).toResponseFor(request)
.fast.map(response ⇒ Some(response.entity.contentType))
.fast.recover { case _: Marshal.UnacceptableResponseContentTypeException ⇒ None }, 1.second)
}
}
def reject = equal(None)
def select(mediaType: MediaType, charset: HttpCharset) = equal(Some(ContentType(mediaType, charset)))
def select(mediaType: MediaType) = equal(Some(ContentType(mediaType, None)))
implicit class AddStringToIn(example: String) {
def test(body: ((ContentType*) ⇒ Option[ContentType]) ⇒ Unit): Unit = example in {
val headers =
if (example != "(without headers)") {
example.split('\n').toList map { rawHeader ⇒
@ -120,19 +157,8 @@ class ContentNegotiationSpec extends FreeSpec with Matchers {
}
}
} else Nil
val request = HttpRequest(headers = headers)
body { contentTypes ⇒
import scala.concurrent.ExecutionContext.Implicits.global
implicit val marshallers = contentTypes map {
case ct @ ContentType(mt, Some(cs)) ⇒ Marshaller.withFixedCharset(mt, cs)((s: String) ⇒ HttpEntity(ct, s))
case ContentType(mt, None) ⇒ Marshaller.withOpenCharset(mt)((s: String, cs) ⇒ HttpEntity(ContentType(mt, cs), s))
}
Await.result(Marshal("foo").toResponseFor(request)
.fast.map(response ⇒ Some(response.entity.contentType))
.fast.recover { case _: Marshal.UnacceptableResponseContentTypeException ⇒ None }, 1.second)
}
}
def reject = equal(None)
def select(mediaType: MediaType, charset: HttpCharset) = equal(Some(ContentType(mediaType, charset)))
testHeaders(headers: _*)(accept ⇒ body(accept))
}
}
}

2
akka-http/src/main/scala/akka/http/scaladsl/marshalling/Marshal.scala
View file

@ -62,7 +62,7 @@ class Marshal[A](val value: A) {
if (qValueCS(`UTF-8`) == 1f) withCharset(`UTF-8`) // prefer UTF-8 if fully accepted
else charsetRanges match {
// pick the charset which the highest q-value (head of charsetRanges) if it isn't explicitly rejected
case (HttpCharsetRange.One(cs, qValue)) :: _ if qValue > 0f ⇒ withCharset(cs)
case (HttpCharsetRange.One(cs, qValue)) +: _ if qValue > 0f ⇒ withCharset(cs)
case _ ⇒ acc
}