This is an automated email from the ASF dual-hosted git repository.
fanningpj pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-pekko-http.git
The following commit(s) were added to refs/heads/main by this push:
new 546e79121 change a few more akka refs in tests (#166)
546e79121 is described below
commit 546e79121d6ed261cf067eee9fbc4e141fbd6c89
Author: PJ Fanning <[email protected]>
AuthorDate: Sun May 28 20:08:28 2023 +0100
change a few more akka refs in tests (#166)
---
.../javadsl/server/directives/TimeoutDirectivesExamplesTest.java | 2 +-
.../scala/docs/http/scaladsl/SprayJsonPrettyMarshalSpec.scala | 4 ++--
.../server/directives/TimeoutDirectivesExamplesSpec.scala | 2 +-
.../apache/pekko/http/impl/engine/ws/WSServerAutobahnTest.scala | 8 ++++----
.../org/apache/pekko/http/impl/model/parser/HttpHeaderSpec.scala | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git
a/docs/src/test/java/docs/http/javadsl/server/directives/TimeoutDirectivesExamplesTest.java
b/docs/src/test/java/docs/http/javadsl/server/directives/TimeoutDirectivesExamplesTest.java
index eaec841ea..314100826 100644
---
a/docs/src/test/java/docs/http/javadsl/server/directives/TimeoutDirectivesExamplesTest.java
+++
b/docs/src/test/java/docs/http/javadsl/server/directives/TimeoutDirectivesExamplesTest.java
@@ -44,7 +44,7 @@ public class TimeoutDirectivesExamplesTest extends
AllDirectives {
+ "pekko.stdout-loglevel = ERROR\n"
+ "windows-connection-abort-workaround-enabled = auto\n"
+ "pekko.log-dead-letters = OFF\n"
- + "akka.http.server.request-timeout = 1000s");
+ + "pekko.http.server.request-timeout = 1000s");
// large timeout - 1000s (please note - setting to infinite will disable
Timeout-Access header
// and withRequestTimeout will not work)
diff --git
a/docs/src/test/scala/docs/http/scaladsl/SprayJsonPrettyMarshalSpec.scala
b/docs/src/test/scala/docs/http/scaladsl/SprayJsonPrettyMarshalSpec.scala
index 72bf03633..111d77f86 100644
--- a/docs/src/test/scala/docs/http/scaladsl/SprayJsonPrettyMarshalSpec.scala
+++ b/docs/src/test/scala/docs/http/scaladsl/SprayJsonPrettyMarshalSpec.scala
@@ -43,7 +43,7 @@ class SprayJsonPrettyMarshalSpec extends RoutingSpec with
CompileOnlySpec {
get {
pathSingleSlash {
complete {
- PrettyPrintedItem("akka", 42) // will render as JSON
+ PrettyPrintedItem("pekko", 42) // will render as JSON
}
}
}
@@ -57,7 +57,7 @@ class SprayJsonPrettyMarshalSpec extends RoutingSpec with
CompileOnlySpec {
responseAs[String] shouldEqual
"""{""" + "\n" +
""" "id": 42,""" + "\n" +
- """ "name": "akka"""" + "\n" +
+ """ "name": "pekko"""" + "\n" +
"""}"""
}
// #example
diff --git
a/docs/src/test/scala/docs/http/scaladsl/server/directives/TimeoutDirectivesExamplesSpec.scala
b/docs/src/test/scala/docs/http/scaladsl/server/directives/TimeoutDirectivesExamplesSpec.scala
index 928de875d..8583e3717 100644
---
a/docs/src/test/scala/docs/http/scaladsl/server/directives/TimeoutDirectivesExamplesSpec.scala
+++
b/docs/src/test/scala/docs/http/scaladsl/server/directives/TimeoutDirectivesExamplesSpec.scala
@@ -162,7 +162,7 @@ class TimeoutDirectivesFiniteTimeoutExamplesSpec extends
RoutingSpec
"be configurable in routing layer for finite initial value of
request-timeout" in {
val route =
path("timeout") {
- withRequestTimeout(1.seconds) { // modifies the global
akka.http.server.request-timeout for this request
+ withRequestTimeout(1.seconds) { // modifies the global
pekko.http.server.request-timeout for this request
val response: Future[String] = slowFuture() // very slow
complete(response)
}
diff --git
a/http-core/src/test/scala/org/apache/pekko/http/impl/engine/ws/WSServerAutobahnTest.scala
b/http-core/src/test/scala/org/apache/pekko/http/impl/engine/ws/WSServerAutobahnTest.scala
index 45b9a4289..c43341dc8 100644
---
a/http-core/src/test/scala/org/apache/pekko/http/impl/engine/ws/WSServerAutobahnTest.scala
+++
b/http-core/src/test/scala/org/apache/pekko/http/impl/engine/ws/WSServerAutobahnTest.scala
@@ -33,9 +33,9 @@ object WSServerAutobahnTest extends App {
implicit val system: ActorSystem = ActorSystem("WSServerTest")
implicit val fm: ActorMaterializer = ActorMaterializer()
- val host = System.getProperty("akka.ws-host", "127.0.0.1")
- val port = System.getProperty("akka.ws-port", "9001").toInt
- val mode = System.getProperty("akka.ws-mode", "read") // read or sleep
+ val host = System.getProperty("pekko.ws-host", "127.0.0.1")
+ val port = System.getProperty("pekko.ws-port", "9001").toInt
+ val mode = System.getProperty("pekko.ws-mode", "read") // read or sleep
try {
val binding = Http().newServerAt(host, port).bindSync {
@@ -52,7 +52,7 @@ object WSServerAutobahnTest extends App {
mode match {
case "sleep" => while (true) Thread.sleep(1.minute.toMillis)
case "read" => StdIn.readLine("Press RETURN to stop...")
- case _ => throw new Exception("akka.ws-mode MUST be sleep or
read.")
+ case _ => throw new Exception("pekko.ws-mode MUST be sleep or
read.")
}
} finally {
system.terminate()
diff --git
a/http-core/src/test/scala/org/apache/pekko/http/impl/model/parser/HttpHeaderSpec.scala
b/http-core/src/test/scala/org/apache/pekko/http/impl/model/parser/HttpHeaderSpec.scala
index d20599917..940b6a684 100644
---
a/http-core/src/test/scala/org/apache/pekko/http/impl/model/parser/HttpHeaderSpec.scala
+++
b/http-core/src/test/scala/org/apache/pekko/http/impl/model/parser/HttpHeaderSpec.scala
@@ -780,7 +780,7 @@ class HttpHeaderSpec extends AnyFreeSpec with Matchers {
"X-Forwarded-Proto" in {
"X-Forwarded-Proto: http" =!= `X-Forwarded-Proto`("http")
"X-Forwarded-Proto: https" =!= `X-Forwarded-Proto`("https")
- "X-Forwarded-Proto: akka" =!= `X-Forwarded-Proto`("akka")
+ "X-Forwarded-Proto: pekko" =!= `X-Forwarded-Proto`("pekko")
}
"X-Real-Ip" in {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
