Move specs that are used in doc snippets to a separate package

akka · Jan 14, 2019 · 377ff4b · 377ff4b
1 parent bcba72a
commit 377ff4b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/s3/src/test/scala/akka/stream/alpakka/s3/scaladsl/S3WireMockBase.scala b/s3/src/test/scala/akka/stream/alpakka/s3/scaladsl/S3WireMockBase.scala
@@ -7,6 +7,7 @@ package akka.stream.alpakka.s3.scaladsl
 import akka.actor.ActorSystem
 import akka.stream.alpakka.s3.S3Settings
 import akka.stream.alpakka.s3.headers.ServerSideEncryption
+import akka.stream.alpakka.s3.impl.S3Stream
 import akka.stream.alpakka.s3.scaladsl.S3WireMockBase._
 import akka.testkit.TestKit
 import com.github.tomakehurst.wiremock.WireMockServer
@@ -414,6 +415,7 @@ abstract class S3WireMockBase(_system: ActorSystem, _wireMockServer: WireMockSer
   }
 
   def mockCopy(): Unit = mockCopy(body.length)
+  def mockCopyMinChunkSize(): Unit = mockCopy(S3Stream.MinChunkSize)
   def mockCopy(expectedContentLength: Int): Unit = {
     mock.register(
       head(urlEqualTo(s"/$bucketKey"))

diff --git a/...ream/alpakka/s3/scaladsl/S3SinkSpec.scala → ...test/scala/docs/scaladsl/S3SinkSpec.scala b/...ream/alpakka/s3/scaladsl/S3SinkSpec.scala → ...test/scala/docs/scaladsl/S3SinkSpec.scala
@@ -2,12 +2,12 @@
  * Copyright (C) 2016-2018 Lightbend Inc. <http://www.lightbend.com>
  */
 
-package akka.stream.alpakka.s3.scaladsl
+package docs.scaladsl
 
 import akka.NotUsed
-import akka.stream.alpakka.s3.{MultipartUploadResult, S3Headers}
 import akka.stream.alpakka.s3.headers.{CannedAcl, ServerSideEncryption}
-import akka.stream.alpakka.s3.impl.S3Stream
+import akka.stream.alpakka.s3.scaladsl.{S3, S3ClientIntegrationSpec, S3WireMockBase}
+import akka.stream.alpakka.s3.{MultipartUploadResult, S3Headers}
 import akka.stream.scaladsl.{Sink, Source}
 import akka.util.ByteString
 
@@ -99,7 +99,7 @@ class S3SinkSpec extends S3WireMockBase with S3ClientIntegrationSpec {
   }
 
   it should "copy a file from source bucket to target bucket when expected content length is equal to chunk size" in {
-    mockCopy(S3Stream.MinChunkSize)
+    mockCopyMinChunkSize()
 
     val result = S3.multipartCopy(bucket, bucketKey, targetBucket, targetBucketKey).run()
     result.runWith(Sink.head).futureValue shouldBe MultipartUploadResult(targetUrl,

diff --git a/...am/alpakka/s3/scaladsl/S3SourceSpec.scala → ...st/scala/docs/scaladsl/S3SourceSpec.scala b/...am/alpakka/s3/scaladsl/S3SourceSpec.scala → ...st/scala/docs/scaladsl/S3SourceSpec.scala
@@ -2,13 +2,14 @@
  * Copyright (C) 2016-2018 Lightbend Inc. <http://www.lightbend.com>
  */
 
-package akka.stream.alpakka.s3.scaladsl
+package docs.scaladsl
 
 import akka.NotUsed
-import akka.http.scaladsl.model.{ContentType, ContentTypes, HttpEntity, HttpResponse}
 import akka.http.scaladsl.model.headers.ByteRange
+import akka.http.scaladsl.model.{ContentType, ContentTypes, HttpEntity, HttpResponse}
 import akka.stream.alpakka.s3._
 import akka.stream.alpakka.s3.headers.ServerSideEncryption
+import akka.stream.alpakka.s3.scaladsl.{S3, S3ClientIntegrationSpec, S3WireMockBase}
 import akka.stream.scaladsl.{Sink, Source}
 import akka.util.ByteString