=doc, htp minor fixes in docs and tests

akka-docs-dev/rst/java/http/http-model.rst

@@ -136,9 +136,9 @@ The class ``HttpEntities`` contains static methods to create entities from commo
 
 You can use the ``isX` methods of ``HttpEntity`` to find out of which subclass an entity is if you want to provide
 special handling for each of the subtypes. However, in many cases a recipient of an ``HttpEntity`` doesn't care about
-of which subtype an entity is (and how data is transported exactly on the HTTP layer). Therefore, a general
+of which subtype an entity is (and how data is transported exactly on the HTTP layer). Therefore, the general method
-``HttpEntity::getDataBytes: Source<ByteString, ?>`` is provided which allows access to the data of an entity regardless
+``HttpEntity.getDataBytes()`` is provided which returns a ``Source<ByteString, ?>`` that allows access to the data of an
-of its concrete subtype.
+entity regardless of its concrete subtype.
 
 .. note::
 

akka-docs-dev/rst/scala/http/common/http-model.rst

@@ -133,9 +133,9 @@ The ``HttpEntity`` companion object contains several helper constructors to crea
 
 You can pattern match over the subtypes of ``HttpEntity`` if you want to provide special handling for each of the
 subtypes. However, in many cases a recipient of an ``HttpEntity`` doesn't care about of which subtype an entity is
-(and how data is transported exactly on the HTTP layer). Therefore, a general
+(and how data is transported exactly on the HTTP layer). Therefore, the general method ``HttpEntity.dataBytes`` is
-``HttpEntity::dataBytes: Source[ByteString, Any]`` is provided which allows access to the data of an entity regardless
+provided which returns a ``Source[ByteString, Any]`` that allows access to the data of an entity regardless of its
-of its concrete subtype.
+concrete subtype.
 
 .. note::
 

akka-http-core/src/test/scala/akka/http/impl/engine/ws/MessageSpec.scala

@@ -302,7 +302,7 @@ class MessageSpec extends FreeSpec with Matchers with WithMaterializerSpec {
         }
         "for a streamed message don't convert half surrogate pairs naively" in new ServerTestSetup {
           val gclef = "𝄞"
-          gclef.size shouldEqual 2
+          gclef.length shouldEqual 2
 
           // split up the code point
           val half1 = gclef.take(1)

akka-http-core/src/test/scala/akka/http/impl/engine/ws/WebsocketServerSpec.scala

@@ -37,8 +37,7 @@ class WebsocketServerSpec extends FreeSpec with Matchers with WithMaterializerSp
 
           val request = expectRequest
           val upgrade = request.header[UpgradeToWebsocket]
-          upgrade.isDefined shouldBe
+          upgrade.isDefined shouldBe true
-            true
 
           val source =
             Source(List(1, 2, 3, 4, 5)).map(num ⇒ TextMessage.Strict(s"Message $num"))

akka-http-tests/src/test/scala/akka/http/scaladsl/server/directives/WebsocketDirectivesSpec.scala

@@ -10,7 +10,6 @@ import akka.http.scaladsl.model.headers.{ UpgradeProtocol, Upgrade }
 import akka.http.scaladsl.model.{ HttpRequest, StatusCodes, HttpResponse }
 import akka.http.scaladsl.model.ws.{ Message, UpgradeToWebsocket }
 import akka.http.scaladsl.server.{ Route, RoutingSpec }
-import akka.stream.Materializer
 import akka.stream.scaladsl.Flow
 
 class WebsocketDirectivesSpec extends RoutingSpec {