diff --git a/circe/src/test/scala/org/http4s/circe/CirceSuite.scala b/circe/src/test/scala/org/http4s/circe/CirceSuite.scala index d7a3d00f2f7..5097c236e07 100644 --- a/circe/src/test/scala/org/http4s/circe/CirceSuite.scala +++ b/circe/src/test/scala/org/http4s/circe/CirceSuite.scala @@ -212,7 +212,7 @@ class CirceSuite extends JawnDecodeSupportSuite[Json] with Http4sLawSuite { ), Headers("content-type" -> "application/json"), ), - true, + strict = true, ) list <- EitherT( stream.map(Printer.noSpaces.print).compile.toList.map(_.asRight[DecodeFailure]) @@ -238,7 +238,7 @@ class CirceSuite extends JawnDecodeSupportSuite[Json] with Http4sLawSuite { ), Headers.empty, ), - true, + strict = true, ) result.value.assertEquals(Left(MediaTypeMissing(Set(MediaType.application.json)))) } @@ -252,7 +252,7 @@ class CirceSuite extends JawnDecodeSupportSuite[Json] with Http4sLawSuite { ), Headers("content-type" -> "application/json"), ), - true, + strict = true, ) result.value.map(_.isRight).assertEquals(true) } @@ -267,7 +267,7 @@ class CirceSuite extends JawnDecodeSupportSuite[Json] with Http4sLawSuite { ), Headers("content-type" -> "application/json"), ), - true, + strict = true, ) list <- EitherT( stream.map(Printer.noSpaces.print).compile.toList.map(_.asRight[DecodeFailure]) @@ -398,7 +398,7 @@ class CirceSuite extends JawnDecodeSupportSuite[Json] with Http4sLawSuite { .withContentType(`Content-Type`(MediaType.application.json)) val decoder = circeInstanceAllowingDuplicateKeys.jsonOf[IO, Foo] - val result = decoder.decode(req, true).value + val result = decoder.decode(req, strict = true).value result .map { @@ -419,7 +419,7 @@ class CirceSuite extends JawnDecodeSupportSuite[Json] with Http4sLawSuite { .withContentType(`Content-Type`(MediaType.application.json)) val decoder = circeInstanceNotAllowingDuplicateKeys.jsonOf[IO, Foo] - val result = decoder.decode(req, true).value + val result = decoder.decode(req, strict = true).value result .map { case Left( @@ -440,7 +440,7 @@ class CirceSuite extends JawnDecodeSupportSuite[Json] with Http4sLawSuite { .withContentType(`Content-Type`(MediaType.application.json)) val decoder = CirceInstances.builder.build.jsonOf[IO, Int] - val result = decoder.decode(req, true).value + val result = decoder.decode(req, strict = true).value result.map { case Left(_: MalformedMessageBodyFailure) => true @@ -453,7 +453,7 @@ class CirceSuite extends JawnDecodeSupportSuite[Json] with Http4sLawSuite { .withEntity(Json.obj()) val decoder = CirceInstances.builder.build.jsonOf[IO, Int] - val result = decoder.decode(req, true).value + val result = decoder.decode(req, strict = true).value result.map { case Left(_: InvalidMessageBodyFailure) => true diff --git a/client/shared/src/test/scala/org/http4s/client/middleware/LoggerSuite.scala b/client/shared/src/test/scala/org/http4s/client/middleware/LoggerSuite.scala index 10d567cf70f..d1b1e6c53b4 100644 --- a/client/shared/src/test/scala/org/http4s/client/middleware/LoggerSuite.scala +++ b/client/shared/src/test/scala/org/http4s/client/middleware/LoggerSuite.scala @@ -40,7 +40,7 @@ class LoggerSuite extends Http4sSuite { private val expectedBody: String = "This is a test resource." private val responseLoggerClient = - ResponseLogger(true, true)(Client.fromHttpApp(testApp)) + ResponseLogger(logHeaders = true, logBody = true)(Client.fromHttpApp(testApp)) test("ResponseLogger should not affect a Get") { val req = Request[IO](uri = uri"/request") @@ -53,7 +53,8 @@ class LoggerSuite extends Http4sSuite { res.assertEquals(expectedBody) } - private val requestLoggerClient = RequestLogger.apply(true, true)(Client.fromHttpApp(testApp)) + private val requestLoggerClient = + RequestLogger.apply(logHeaders = true, logBody = true)(Client.fromHttpApp(testApp)) test("RequestLogger should not affect a Get") { val req = Request[IO](uri = uri"/request") @@ -69,7 +70,9 @@ class LoggerSuite extends Http4sSuite { private def configurableRequestLoggerClient( logBody: Boolean, logAction: Option[String => IO[Unit]], - ) = RequestLogger.apply[IO](true, logBody, logAction = logAction)(Client.fromHttpApp(testApp)) + ) = RequestLogger.apply[IO](logHeaders = true, logBody = logBody, logAction = logAction)( + Client.fromHttpApp(testApp) + ) test("RequestLogger should log a Get for all values of logBody") { forAllF { (logBody: Boolean) => @@ -94,7 +97,7 @@ class LoggerSuite extends Http4sSuite { } private val loggerApp = - Logger(true, true)(Client.fromHttpApp(testApp)).toHttpApp + Logger(logHeaders = true, logBody = true)(Client.fromHttpApp(testApp)).toHttpApp test("Logger should not affect a Get") { val req = Request[IO](uri = uri"/request") diff --git a/ember-core/shared/src/test/scala/org/http4s/ember/core/h2/FrameSpec.scala b/ember-core/shared/src/test/scala/org/http4s/ember/core/h2/FrameSpec.scala index 51eb8e5f59d..1903a1cd0d4 100644 --- a/ember-core/shared/src/test/scala/org/http4s/ember/core/h2/FrameSpec.scala +++ b/ember-core/shared/src/test/scala/org/http4s/ember/core/h2/FrameSpec.scala @@ -61,13 +61,13 @@ class H2FrameSpec extends CatsEffectSuite { val bv = H2Frame.RawFrame.toByteVector(init) val intermediate = H2Frame.RawFrame.fromByteVector(bv).map(_._1) val parsed = intermediate.flatMap(H2Frame.Data.fromRaw(_).toOption) - val expected = H2Frame.Data(Int.MaxValue, ByteVector(0x00, 0x02), None, true) + val expected = H2Frame.Data(Int.MaxValue, ByteVector(0x00, 0x02), None, endStream = true) assertEquals(parsed, expected.some) } test("Data H2Frame should traverse") { - val init = H2Frame.Data(4, ByteVector(0x02, 0xa0), None, false) + val init = H2Frame.Data(4, ByteVector(0x02, 0xa0), None, endStream = false) val encoded = H2Frame.Data.toRaw(init) val back = H2Frame.Data.fromRaw(encoded) assertEquals(back, init.asRight) @@ -75,7 +75,12 @@ class H2FrameSpec extends CatsEffectSuite { test("Data H2Frame should traverse with padding") { val init = - H2Frame.Data(4, ByteVector(0x02, 0xa0), Some(ByteVector(0xff, 0xff, 0xff, 0xff)), false) + H2Frame.Data( + 4, + ByteVector(0x02, 0xa0), + Some(ByteVector(0xff, 0xff, 0xff, 0xff)), + endStream = false, + ) val encoded = H2Frame.Data.toRaw(init) val back = H2Frame.Data.fromRaw(encoded) assertEquals(back, init.asRight) @@ -84,9 +89,9 @@ class H2FrameSpec extends CatsEffectSuite { test("Headers should traverse") { val init = H2Frame.Headers( 7, - Some(H2Frame.Headers.StreamDependency(true, 4, 3)), - true, - true, + Some(H2Frame.Headers.StreamDependency(exclusive = true, 4, 3)), + endStream = true, + endHeaders = true, ByteVector(3, 4), Some(ByteVector(1)), ) @@ -99,7 +104,7 @@ class H2FrameSpec extends CatsEffectSuite { } test("Priority should traverse") { - val init = H2Frame.Priority(5, true, 7, 0x01) + val init = H2Frame.Priority(5, exclusive = true, 7, 0x01) val encoded = H2Frame.Priority.toRaw(init) val back = H2Frame.Priority.fromRaw(encoded) assertEquals( @@ -121,10 +126,10 @@ class H2FrameSpec extends CatsEffectSuite { test("Settings should traverse") { val init = H2Frame.Settings( 0x0, - false, + ack = false, List( H2Frame.Settings.SettingsHeaderTableSize(4096), - H2Frame.Settings.SettingsEnablePush(true), + H2Frame.Settings.SettingsEnablePush(isEnabled = true), H2Frame.Settings.SettingsMaxConcurrentStreams(1024), H2Frame.Settings.SettingsInitialWindowSize(65535), H2Frame.Settings.SettingsMaxFrameSize(16384), @@ -142,7 +147,13 @@ class H2FrameSpec extends CatsEffectSuite { test("PushPromise should traverse") { val init = - H2Frame.PushPromise(74, true, 107, ByteVector(0x1, 0xe, 0xb), Some(ByteVector(0x0, 0x0, 0x0))) + H2Frame.PushPromise( + 74, + endHeaders = true, + 107, + ByteVector(0x1, 0xe, 0xb), + Some(ByteVector(0x0, 0x0, 0x0)), + ) val encoded = H2Frame.PushPromise.toRaw(init) val back = H2Frame.PushPromise.fromRaw(encoded).toOption assertEquals( @@ -182,7 +193,7 @@ class H2FrameSpec extends CatsEffectSuite { } test("Continuation should traverse") { - val init = H2Frame.Continuation(73, true, ByteVector(0xe, 0x8, 0x3)) + val init = H2Frame.Continuation(73, endHeaders = true, ByteVector(0xe, 0x8, 0x3)) val encoded = H2Frame.Continuation.toRaw(init) val back = H2Frame.Continuation.fromRaw(encoded).toOption assertEquals( diff --git a/server/shared/src/test/scala/org/http4s/server/middleware/CORSSuite.scala b/server/shared/src/test/scala/org/http4s/server/middleware/CORSSuite.scala index b35736abd20..fe044dc2393 100644 --- a/server/shared/src/test/scala/org/http4s/server/middleware/CORSSuite.scala +++ b/server/shared/src/test/scala/org/http4s/server/middleware/CORSSuite.scala @@ -222,7 +222,7 @@ class CORSSuite extends Http4sSuite { .apply(app) .run(nonPreflightReq) .map { resp => - assertAllowCredentials(resp, true) + assertAllowCredentials(resp, b = true) } } @@ -233,7 +233,7 @@ class CORSSuite extends Http4sSuite { .apply(app) .run(preflightReq) .map { resp => - assertAllowCredentials(resp, true) + assertAllowCredentials(resp, b = true) } } @@ -244,7 +244,7 @@ class CORSSuite extends Http4sSuite { .apply(app) .run(nonPreflightReq) .map { resp => - assertAllowCredentials(resp, false) + assertAllowCredentials(resp, b = false) } } @@ -255,7 +255,7 @@ class CORSSuite extends Http4sSuite { .apply(app) .run(preflightReq) .map { resp => - assertAllowCredentials(resp, false) + assertAllowCredentials(resp, b = false) } } @@ -265,7 +265,7 @@ class CORSSuite extends Http4sSuite { .apply(app) .run(nonPreflightReq) .map { resp => - assertAllowCredentials(resp, false) + assertAllowCredentials(resp, b = false) } } @@ -275,7 +275,7 @@ class CORSSuite extends Http4sSuite { .apply(app) .run(preflightReq) .map { resp => - assertAllowCredentials(resp, false) + assertAllowCredentials(resp, b = false) } } @@ -285,7 +285,7 @@ class CORSSuite extends Http4sSuite { .apply(app) .run(nonPreflightReq) .map { resp => - assertAllowCredentials(resp, false) + assertAllowCredentials(resp, b = false) } } @@ -295,7 +295,7 @@ class CORSSuite extends Http4sSuite { .apply(app) .run(preflightReq) .map { resp => - assertAllowCredentials(resp, false) + assertAllowCredentials(resp, b = false) } } diff --git a/server/shared/src/test/scala/org/http4s/server/middleware/ErrorActionSuite.scala b/server/shared/src/test/scala/org/http4s/server/middleware/ErrorActionSuite.scala index e95e50c1020..26bd27cb4e3 100644 --- a/server/shared/src/test/scala/org/http4s/server/middleware/ErrorActionSuite.scala +++ b/server/shared/src/test/scala/org/http4s/server/middleware/ErrorActionSuite.scala @@ -41,7 +41,7 @@ class ErrorActionSuite extends Http4sSuite { Connection( SocketAddress(Ipv4Address.fromBytes(127, 0, 0, 1), port"80"), SocketAddress(remote, port"80"), - false, + secure = false, ), ), ) diff --git a/tests/shared/src/test/scala/org/http4s/EntityDecoderSuite.scala b/tests/shared/src/test/scala/org/http4s/EntityDecoderSuite.scala index 2da00a4a7c1..2e105d78db7 100644 --- a/tests/shared/src/test/scala/org/http4s/EntityDecoderSuite.scala +++ b/tests/shared/src/test/scala/org/http4s/EntityDecoderSuite.scala @@ -31,9 +31,9 @@ import java.util.Arrays class EntityDecoderSuite extends Http4sSuite { val `application/excel`: MediaType = - new MediaType("application", "excel", true, false, List("xls")) + new MediaType("application", "excel", compressible = true, binary = false, List("xls")) val `application/gnutar`: MediaType = - new MediaType("application", "gnutar", true, false, List("tar")) + new MediaType("application", "gnutar", compressible = true, binary = false, List("tar")) val `application/soap+xml`: MediaType = new MediaType("application", "soap+xml", MediaType.Compressible, MediaType.NotBinary) val `text/x-h` = new MediaType("text", "x-h") diff --git a/tests/shared/src/test/scala/org/http4s/FormDataDecoderSpec.scala b/tests/shared/src/test/scala/org/http4s/FormDataDecoderSpec.scala index f2c453e7c40..5fe75830a74 100644 --- a/tests/shared/src/test/scala/org/http4s/FormDataDecoderSpec.scala +++ b/tests/shared/src/test/scala/org/http4s/FormDataDecoderSpec.scala @@ -77,7 +77,7 @@ class FormDataDecoderSpec extends Http4sSuite { assertEquals( fooMapper(Map("a" -> Chain("bar"), "b" -> Chain("false"))), Valid( - Foo("bar", false) + Foo("bar", b = false) ), ) } @@ -133,7 +133,7 @@ class FormDataDecoderSpec extends Http4sSuite { "f.b" -> Chain("true"), ) ), - Valid(FooNested(Foo("bar", true), "ccc")), + Valid(FooNested(Foo("bar", b = true), "ccc")), ) } @@ -163,7 +163,7 @@ class FormDataDecoderSpec extends Http4sSuite { "f.b" -> Chain("true"), ) ), - Valid(FooNestedOptional(Option(Foo("bar", true)), Option("ccc"))), + Valid(FooNestedOptional(Option(Foo("bar", b = true)), Option("ccc"))), ) } @@ -183,7 +183,7 @@ class FormDataDecoderSpec extends Http4sSuite { "fs[].b" -> Chain("false", "true"), ) ), - Valid(FooList(List(Foo("f1", false), Foo("f2", true)), false)), + Valid(FooList(List(Foo("f1", b = false), Foo("f2", b = true)), d = false)), ) } @@ -196,7 +196,7 @@ class FormDataDecoderSpec extends Http4sSuite { "d" -> Chain("false") ) ), - Valid(FooList(List.empty[Foo], false)), + Valid(FooList(List.empty[Foo], d = false)), ) } diff --git a/tests/shared/src/test/scala/org/http4s/MessageSuite.scala b/tests/shared/src/test/scala/org/http4s/MessageSuite.scala index 2b830fdb5c1..a717f3ebac4 100644 --- a/tests/shared/src/test/scala/org/http4s/MessageSuite.scala +++ b/tests/shared/src/test/scala/org/http4s/MessageSuite.scala @@ -39,7 +39,7 @@ class MessageSuite extends Http4sSuite { test("ConnectionInfo should get remote connection info when present") { val r = Request() - .withAttribute(Request.Keys.ConnectionInfo, Request.Connection(local, remote, false)) + .withAttribute(Request.Keys.ConnectionInfo, Request.Connection(local, remote, secure = false)) assertEquals(r.server, Some(local)) assertEquals(r.remote, Some(remote)) } @@ -52,14 +52,14 @@ class MessageSuite extends Http4sSuite { test("ConnectionInfo should be utilized to determine the address of server and remote") { val r = Request() - .withAttribute(Request.Keys.ConnectionInfo, Request.Connection(local, remote, false)) + .withAttribute(Request.Keys.ConnectionInfo, Request.Connection(local, remote, secure = false)) assertEquals(r.serverAddr, Some(local.host)) assertEquals(r.remoteAddr, Some(remote.host)) } test("ConnectionInfo should be utilized to determine the port of server and remote") { val r = Request() - .withAttribute(Request.Keys.ConnectionInfo, Request.Connection(local, remote, false)) + .withAttribute(Request.Keys.ConnectionInfo, Request.Connection(local, remote, secure = false)) assertEquals(r.serverPort, Some(local.port)) assertEquals(r.remotePort, Some(remote.port)) } @@ -71,7 +71,7 @@ class MessageSuite extends Http4sSuite { NonEmptyList.of(Some(ipv4"192.168.1.1"), Some(ipv4"192.168.1.2")) val r = Request() .withHeaders(Headers(`X-Forwarded-For`(forwardedValues))) - .withAttribute(Request.Keys.ConnectionInfo, Request.Connection(local, remote, false)) + .withAttribute(Request.Keys.ConnectionInfo, Request.Connection(local, remote, secure = false)) assertEquals(r.from, forwardedValues.head) } @@ -79,7 +79,7 @@ class MessageSuite extends Http4sSuite { "ConnectionInfo should be utilized to determine the from value (remote value if X-Forwarded-For is not present)" ) { val r = Request() - .withAttribute(Request.Keys.ConnectionInfo, Request.Connection(local, remote, false)) + .withAttribute(Request.Keys.ConnectionInfo, Request.Connection(local, remote, secure = false)) assertEquals(r.from, Option(remote.host)) } diff --git a/tests/shared/src/test/scala/org/http4s/headers/StrictTransportSecuritySuite.scala b/tests/shared/src/test/scala/org/http4s/headers/StrictTransportSecuritySuite.scala index 17f30aaf6a2..31a1ced82f0 100644 --- a/tests/shared/src/test/scala/org/http4s/headers/StrictTransportSecuritySuite.scala +++ b/tests/shared/src/test/scala/org/http4s/headers/StrictTransportSecuritySuite.scala @@ -127,19 +127,25 @@ class StrictTransportSecuritySuite extends HeaderLaws { test("parse should accept age") { assertEquals( `Strict-Transport-Security`.parse("max-age=31536000"), - Right(`Strict-Transport-Security`.unsafeFromDuration(365.days, false)), + Right(`Strict-Transport-Security`.unsafeFromDuration(365.days, includeSubDomains = false)), ) } test("parse should accept age and subdomains") { assertEquals( `Strict-Transport-Security`.parse("max-age=31536000; includeSubDomains"), - Right(`Strict-Transport-Security`.unsafeFromDuration(365.days, true)), + Right(`Strict-Transport-Security`.unsafeFromDuration(365.days, includeSubDomains = true)), ) } test("parse should accept age, subdomains and preload") { assertEquals( `Strict-Transport-Security`.parse("max-age=31536000; includeSubDomains; preload"), - Right(`Strict-Transport-Security`.unsafeFromDuration(365.days, true, true)), + Right( + `Strict-Transport-Security`.unsafeFromDuration( + 365.days, + includeSubDomains = true, + preload = true, + ) + ), ) } } diff --git a/tests/shared/src/test/scala/org/http4s/headers/ZipkinHeaderSuite.scala b/tests/shared/src/test/scala/org/http4s/headers/ZipkinHeaderSuite.scala index 5a6da716fb8..b02567ad03e 100644 --- a/tests/shared/src/test/scala/org/http4s/headers/ZipkinHeaderSuite.scala +++ b/tests/shared/src/test/scala/org/http4s/headers/ZipkinHeaderSuite.scala @@ -77,10 +77,10 @@ class ZipkinHeaderSuite extends Http4sSuite with HeaderLaws { } test("sampled parses false when 0") { - assertEquals(`X-B3-Sampled`.parse("0"), Right(`X-B3-Sampled`(false))) + assertEquals(`X-B3-Sampled`.parse("0"), Right(`X-B3-Sampled`(sampled = false))) } test("sampled parses true when 1") { - assertEquals(`X-B3-Sampled`.parse("1"), Right(`X-B3-Sampled`(true))) + assertEquals(`X-B3-Sampled`.parse("1"), Right(`X-B3-Sampled`(sampled = true))) } test("sampled no parse when not 0 or 1") { assert(`X-B3-Sampled`.parse("01").isLeft) diff --git a/tests/shared/src/test/scala/org/http4s/multipart/MultipartSuite.scala b/tests/shared/src/test/scala/org/http4s/multipart/MultipartSuite.scala index f9df2138126..ff53f2fb673 100644 --- a/tests/shared/src/test/scala/org/http4s/multipart/MultipartSuite.scala +++ b/tests/shared/src/test/scala/org/http4s/multipart/MultipartSuite.scala @@ -76,7 +76,7 @@ class MultipartSuite extends Http4sSuite { Request(method = Method.POST, uri = url, body = body, headers = multipart.headers) mkDecoder.use { decoder => - val decoded = decoder.decode(request, true) + val decoded = decoder.decode(request, strict = true) val result = decoded.value assertIOBoolean( @@ -99,7 +99,7 @@ class MultipartSuite extends Http4sSuite { Request(method = Method.POST, uri = url, body = body, headers = multipart.headers) mkDecoder.use { decoder => - val decoded = decoder.decode(request, true) + val decoded = decoder.decode(request, strict = true) val result = decoded.value assertIOBoolean( @@ -126,7 +126,7 @@ class MultipartSuite extends Http4sSuite { Request(method = Method.POST, uri = url, body = body, headers = multipart.headers) mkDecoder.use { decoder => - val decoded = decoder.decode(request, true) + val decoded = decoder.decode(request, strict = true) val result = decoded.value assertIOBoolean( @@ -169,7 +169,7 @@ Content-Type: application/pdf ) mkDecoder.use { decoder => - val decoded = decoder.decode(request, true) + val decoded = decoder.decode(request, strict = true) val result = decoded.value.map(_.isRight) result.assertEquals(true) @@ -202,7 +202,7 @@ I am a big moose ) mkDecoder.use { decoder => - val decoded = decoder.decode(request, true) + val decoded = decoder.decode(request, strict = true) val result = decoded.value.map(_.isRight) result.assertEquals(true) @@ -254,7 +254,7 @@ I am a big moose val request = Request(method = Method.POST, uri = url, body = badBody, headers = multipart.headers) - mkDecoder.use(_.decode(request, true).value).intercept[CustomError.type] + mkDecoder.use(_.decode(request, strict = true).value).intercept[CustomError.type] } test("Should handle characters > 0x00ff in filename") { @@ -282,7 +282,7 @@ Content-Type: application/json ) mkDecoder .use { decoder => - val decoded = decoder.decode(request, true) + val decoded = decoder.decode(request, strict = true) decoded.map(multipart => multipart.parts.headOption.flatMap(part => part.filename)).value } .assertEquals(Right(Some("中文文件名.json"))) diff --git a/tests/shared/src/test/scala/org/http4s/parser/QueryParserSpec.scala b/tests/shared/src/test/scala/org/http4s/parser/QueryParserSpec.scala index 95df5aabb24..c4a5bf9ca09 100644 --- a/tests/shared/src/test/scala/org/http4s/parser/QueryParserSpec.scala +++ b/tests/shared/src/test/scala/org/http4s/parser/QueryParserSpec.scala @@ -81,8 +81,8 @@ class QueryParserSpec extends Http4sSuite { test("The QueryParser should QueryParser using QChars doesn't allow PHP-style [] in keys") { val queryString = "a[]=b&a[]=c" assert( - new QueryParser(Codec.UTF8, true, QueryParser.QChars) - .decode(CharBuffer.wrap(queryString), true) + new QueryParser(Codec.UTF8, colonSeparators = true, qChars = QueryParser.QChars) + .decode(CharBuffer.wrap(queryString), flush = true) .isLeft ) } @@ -96,16 +96,16 @@ class QueryParserSpec extends Http4sSuite { test("The QueryParser should Keep CharBuffer position if not flushing") { val s = "key=value&stuff=cat" val cs = CharBuffer.wrap(s) - val r = new QueryParser(Codec.UTF8, true).decode(cs, false) + val r = new QueryParser(Codec.UTF8, colonSeparators = true).decode(cs, flush = false) assertEquals(r, Right(Query("key" -> Some("value")))) assertEquals(cs.remaining, 9) - val r2 = new QueryParser(Codec.UTF8, true).decode(cs, false) + val r2 = new QueryParser(Codec.UTF8, colonSeparators = true).decode(cs, flush = false) assertEquals(r2, Right(Query())) assertEquals(cs.remaining(), 9) - val r3 = new QueryParser(Codec.UTF8, true).decode(cs, true) + val r3 = new QueryParser(Codec.UTF8, colonSeparators = true).decode(cs, flush = true) assertEquals(r3, Right(Query("stuff" -> Some("cat")))) assertEquals(cs.remaining(), 0) } diff --git a/tests/shared/src/test/scala/org/http4s/websocket/WebSocketFrameDefragmenterSuite.scala b/tests/shared/src/test/scala/org/http4s/websocket/WebSocketFrameDefragmenterSuite.scala index eceab2f2840..29defeff0b7 100644 --- a/tests/shared/src/test/scala/org/http4s/websocket/WebSocketFrameDefragmenterSuite.scala +++ b/tests/shared/src/test/scala/org/http4s/websocket/WebSocketFrameDefragmenterSuite.scala @@ -34,8 +34,8 @@ class WebSocketFrameDefragmenterSuite extends Http4sSuite { val stream: Stream[SyncIO, WebSocketFrame] = Stream .apply( - Text("text", true), - Binary(utf8Bytes"binary", true), + Text("text", last = true), + Binary(utf8Bytes"binary", last = true), Ping(utf8Bytes"ping"), Close(utf8Bytes"close"), ) @@ -44,8 +44,8 @@ class WebSocketFrameDefragmenterSuite extends Http4sSuite { assertEquals( stream.compile.toList.unsafeRunSync(), List( - Text("text", true), - Binary(utf8Bytes"binary", true), + Text("text", last = true), + Binary(utf8Bytes"binary", last = true), Ping(utf8Bytes"ping"), Close(utf8Bytes"close"), ), @@ -56,18 +56,18 @@ class WebSocketFrameDefragmenterSuite extends Http4sSuite { val stream: Stream[SyncIO, WebSocketFrame] = Stream .apply( - Text("h", false), - Continuation(utf8Bytes"e", false), - Continuation(utf8Bytes"l", false), - Continuation(utf8Bytes"l", false), - Continuation(utf8Bytes"o", true), + Text("h", last = false), + Continuation(utf8Bytes"e", last = false), + Continuation(utf8Bytes"l", last = false), + Continuation(utf8Bytes"l", last = false), + Continuation(utf8Bytes"o", last = true), ) .through(defragFragment[SyncIO]) assertEquals( stream.compile.toList.unsafeRunSync(), List( - Text("hello", true) + Text("hello", last = true) ), ) } @@ -76,18 +76,18 @@ class WebSocketFrameDefragmenterSuite extends Http4sSuite { val stream: Stream[SyncIO, WebSocketFrame] = Stream .apply( - Binary(utf8Bytes"w", false), - Continuation(utf8Bytes"o", false), - Continuation(utf8Bytes"r", false), - Continuation(utf8Bytes"l", false), - Continuation(utf8Bytes"d", true), + Binary(utf8Bytes"w", last = false), + Continuation(utf8Bytes"o", last = false), + Continuation(utf8Bytes"r", last = false), + Continuation(utf8Bytes"l", last = false), + Continuation(utf8Bytes"d", last = true), ) .through(defragFragment[SyncIO]) assertEquals( stream.compile.toList.unsafeRunSync(), List( - Binary(utf8Bytes"world", true) + Binary(utf8Bytes"world", last = true) ), ) } @@ -96,22 +96,22 @@ class WebSocketFrameDefragmenterSuite extends Http4sSuite { val stream: Stream[SyncIO, WebSocketFrame] = Stream .apply( - Text("F", false), - Continuation(utf8Bytes"o", false), - Continuation(utf8Bytes"o", true), - Text("Bar", true), - Text("B", false), - Continuation(utf8Bytes"a", false), - Continuation(utf8Bytes"z", true), + Text("F", last = false), + Continuation(utf8Bytes"o", last = false), + Continuation(utf8Bytes"o", last = true), + Text("Bar", last = true), + Text("B", last = false), + Continuation(utf8Bytes"a", last = false), + Continuation(utf8Bytes"z", last = true), ) .through(defragFragment[SyncIO]) assertEquals( stream.compile.toList.unsafeRunSync(), List( - Text("Foo", true), - Text("Bar", true), - Text("Baz", true), + Text("Foo", last = true), + Text("Bar", last = true), + Text("Baz", last = true), ), ) } @@ -120,19 +120,19 @@ class WebSocketFrameDefragmenterSuite extends Http4sSuite { val stream: Stream[SyncIO, WebSocketFrame] = Stream .apply( - Text("F", false), - Continuation(utf8Bytes"o", false), - Continuation(utf8Bytes"o", false), - Continuation(utf8Bytes"o", true), - Binary(utf8Bytes"binary", true), - Text("some text", true), + Text("F", last = false), + Continuation(utf8Bytes"o", last = false), + Continuation(utf8Bytes"o", last = false), + Continuation(utf8Bytes"o", last = true), + Binary(utf8Bytes"binary", last = true), + Text("some text", last = true), Ping(utf8Bytes"ping"), - Binary(utf8Bytes"bin", false), - Continuation(utf8Bytes"Message", true), + Binary(utf8Bytes"bin", last = false), + Continuation(utf8Bytes"Message", last = true), Ping(utf8Bytes"ping"), - Text("B", false), - Continuation(utf8Bytes"a", false), - Continuation(utf8Bytes"r", true), + Text("B", last = false), + Continuation(utf8Bytes"a", last = false), + Continuation(utf8Bytes"r", last = true), Close(utf8Bytes"close"), ) .through(defragFragment[SyncIO]) @@ -141,13 +141,13 @@ class WebSocketFrameDefragmenterSuite extends Http4sSuite { stream.compile.toList .unsafeRunSync(), List( - Text("Fooo", true), - Binary(utf8Bytes"binary", true), - Text("some text", true), + Text("Fooo", last = true), + Binary(utf8Bytes"binary", last = true), + Text("some text", last = true), Ping(utf8Bytes"ping"), - Binary(utf8Bytes"binMessage", true), + Binary(utf8Bytes"binMessage", last = true), Ping(utf8Bytes"ping"), - Text("Bar", true), + Text("Bar", last = true), Close(utf8Bytes"close"), ), ) @@ -167,16 +167,16 @@ class WebSocketFrameDefragmenterSuite extends Http4sSuite { // and outputs the invalid sequence as it is. val stream: Stream[SyncIO, WebSocketFrame] = Stream .apply( - Text("text1", false), - Text("text2", true), + Text("text1", last = false), + Text("text2", last = true), ) .through(defragFragment) assertEquals( stream.compile.toList.unsafeRunSync(), List( - Text("text1", false), - Text("text2", true), + Text("text1", last = false), + Text("text2", last = true), ), ) @@ -191,9 +191,9 @@ class WebSocketFrameDefragmenterSuite extends Http4sSuite { // and outputs the invalid sequence as it is. val stream: Stream[SyncIO, WebSocketFrame] = Stream .apply( - Text("text1", false), - Continuation(utf8Bytes"text2", false), - Continuation(utf8Bytes"text3", false), + Text("text1", last = false), + Continuation(utf8Bytes"text2", last = false), + Continuation(utf8Bytes"text3", last = false), Close(utf8Bytes"close"), ) .through(defragFragment) @@ -201,9 +201,9 @@ class WebSocketFrameDefragmenterSuite extends Http4sSuite { assertEquals( stream.compile.toList.unsafeRunSync(), List( - Text("text1", false), - Continuation(utf8Bytes"text2", false), - Continuation(utf8Bytes"text3", false), + Text("text1", last = false), + Continuation(utf8Bytes"text2", last = false), + Continuation(utf8Bytes"text3", last = false), Close(utf8Bytes"close"), ), ) @@ -219,18 +219,18 @@ class WebSocketFrameDefragmenterSuite extends Http4sSuite { // and outputs the invalid sequence as it is. val stream: Stream[SyncIO, WebSocketFrame] = Stream .apply( - Text("text1", true), - Continuation(utf8Bytes"illegal continuation", true), - Text("text2", true), + Text("text1", last = true), + Continuation(utf8Bytes"illegal continuation", last = true), + Text("text2", last = true), ) .through(defragFragment) assertEquals( stream.compile.toList.unsafeRunSync(), List( - Text("text1", true), - Continuation(utf8Bytes"illegal continuation", true), - Text("text2", true), + Text("text1", last = true), + Continuation(utf8Bytes"illegal continuation", last = true), + Text("text2", last = true), ), ) @@ -243,22 +243,22 @@ class WebSocketFrameDefragmenterSuite extends Http4sSuite { // and outputs the invalid sequence as it is. val stream: Stream[SyncIO, WebSocketFrame] = Stream .apply( - Continuation(utf8Bytes"h", false), - Continuation(utf8Bytes"e", false), - Continuation(utf8Bytes"l", false), - Continuation(utf8Bytes"l", false), - Continuation(utf8Bytes"o", true), + Continuation(utf8Bytes"h", last = false), + Continuation(utf8Bytes"e", last = false), + Continuation(utf8Bytes"l", last = false), + Continuation(utf8Bytes"l", last = false), + Continuation(utf8Bytes"o", last = true), ) .through(defragFragment) assertEquals( stream.compile.toList.unsafeRunSync(), List( - Continuation(utf8Bytes"h", false), - Continuation(utf8Bytes"e", false), - Continuation(utf8Bytes"l", false), - Continuation(utf8Bytes"l", false), - Continuation(utf8Bytes"o", true), + Continuation(utf8Bytes"h", last = false), + Continuation(utf8Bytes"e", last = false), + Continuation(utf8Bytes"l", last = false), + Continuation(utf8Bytes"l", last = false), + Continuation(utf8Bytes"o", last = true), ), ) @@ -267,24 +267,24 @@ class WebSocketFrameDefragmenterSuite extends Http4sSuite { test("WebSocketFrameDefragmenter should defrag normal sequence after illegal sequence") { val stream: Stream[SyncIO, WebSocketFrame] = Stream .apply( - Text("text1", true), + Text("text1", last = true), // This frame is invalid - Continuation(utf8Bytes"illegal continuation", true), + Continuation(utf8Bytes"illegal continuation", last = true), // Sequece after here is valid - Text("h", false), - Continuation(utf8Bytes"e", false), - Continuation(utf8Bytes"l", false), - Continuation(utf8Bytes"l", false), - Continuation(utf8Bytes"o", true), + Text("h", last = false), + Continuation(utf8Bytes"e", last = false), + Continuation(utf8Bytes"l", last = false), + Continuation(utf8Bytes"l", last = false), + Continuation(utf8Bytes"o", last = true), ) .through(defragFragment) assertEquals( stream.compile.toList.unsafeRunSync(), List( - Text("text1", true), - Continuation(utf8Bytes"illegal continuation", true), - Text("hello", true), + Text("text1", last = true), + Continuation(utf8Bytes"illegal continuation", last = true), + Text("hello", last = true), ), ) diff --git a/tests/shared/src/test/scala/org/http4s/websocket/WebSocketSuite.scala b/tests/shared/src/test/scala/org/http4s/websocket/WebSocketSuite.scala index a6670eae6ea..a1157df8a20 100644 --- a/tests/shared/src/test/scala/org/http4s/websocket/WebSocketSuite.scala +++ b/tests/shared/src/test/scala/org/http4s/websocket/WebSocketSuite.scala @@ -47,11 +47,11 @@ class WebSocketSuite extends Http4sSuite { } test("WebSocket decoder should equate frames correctly") { - val f1 = Binary(ByteVector(0x2.toByte, 0x3.toByte), true) - val f11 = Binary(ByteVector(0x2.toByte, 0x3.toByte), true) - val f2 = Binary(ByteVector(0x2.toByte, 0x3.toByte), false) - val f3 = Text(ByteVector(0x2.toByte, 0x3.toByte), true) - val f4 = Binary(ByteVector(0x2.toByte, 0x4.toByte), true) + val f1 = Binary(ByteVector(0x2.toByte, 0x3.toByte), last = true) + val f11 = Binary(ByteVector(0x2.toByte, 0x3.toByte), last = true) + val f2 = Binary(ByteVector(0x2.toByte, 0x3.toByte), last = false) + val f3 = Text(ByteVector(0x2.toByte, 0x3.toByte), last = true) + val f4 = Binary(ByteVector(0x2.toByte, 0x4.toByte), last = true) assertEquals(f1, f1) assertEquals(f1, f11) @@ -61,26 +61,26 @@ class WebSocketSuite extends Http4sSuite { } test("WebSocket decoder should decode a hello world message") { - val result = decode(helloTxtMasked, false) + val result = decode(helloTxtMasked, isClient = false) assert(result.last) assertEquals(new String(result.data.toArray, UTF_8), "Hello") - val result2 = decode(helloTxt, true) + val result2 = decode(helloTxt, isClient = true) assert(result2.last) assertEquals(new String(result2.data.toArray, UTF_8), "Hello") } test("WebSocket decoder should encode a hello world message") { - val frame = Text(ByteVector.view("Hello".getBytes(UTF_8)), false) - val msg = decode(encode(frame, true), false) + val frame = Text(ByteVector.view("Hello".getBytes(UTF_8)), last = false) + val msg = decode(encode(frame, isClient = true), isClient = false) assertEquals(msg, frame) assert(!msg.last) assertEquals(new String(msg.data.toArray, UTF_8), "Hello") } test("WebSocket decoder should encode a continuation message") { - val frame = Continuation(ByteVector.view("Hello".getBytes(UTF_8)), true) - val msg = decode(encode(frame, true), false) + val frame = Continuation(ByteVector.view("Hello".getBytes(UTF_8)), last = true) + val msg = decode(encode(frame, isClient = true), isClient = false) assertEquals(msg, frame) assert(msg.last) assertEquals(new String(msg.data.toArray, UTF_8), "Hello") @@ -94,7 +94,7 @@ class WebSocketSuite extends Http4sSuite { forAll(choose(1000, 4999), reasonGen) { (validCloseCode: Int, validReason: String) => val frame = Close(validCloseCode, validReason).valueOr(throw _) - val msg = decode(encode(frame, true), false) + val msg = decode(encode(frame, isClient = true), isClient = false) assertEquals(msg, frame) assert(msg.last) val closeCode = msg.data.slice(0, 2) @@ -122,10 +122,10 @@ class WebSocketSuite extends Http4sSuite { test("WebSocket decoder should encode and decode a message with 125 < len <= 0xffff") { val bytes = ByteVector((0 until 0xfff).map(_.toByte)) - val frame = Binary(bytes, false) + val frame = Binary(bytes, last = false) - val msg = decode(encode(frame, true), false) - val msg2 = decode(encode(frame, false), true) + val msg = decode(encode(frame, isClient = true), isClient = false) + val msg2 = decode(encode(frame, isClient = false), isClient = true) assertEquals(msg, frame) assertEquals(msg, msg2) @@ -133,10 +133,10 @@ class WebSocketSuite extends Http4sSuite { test("WebSocket decoder should encode and decode a message len > 0xffff") { val bytes = ByteVector((0 until (0xffff + 1)).map(_.toByte)) - val frame = Binary(bytes, false) + val frame = Binary(bytes, last = false) - val msg = decode(encode(frame, true), false) - val msg2 = decode(encode(frame, false), true) + val msg = decode(encode(frame, isClient = true), isClient = false) + val msg2 = decode(encode(frame, isClient = false), isClient = true) assertEquals(msg, frame) assertEquals(msg, msg2)