Refactor test suite to replace AmazonJavaMultiSdkTestBase with IntegrationTestsBase and reorganize packages for consistency and better structure

micossow · micossow · commit 38f6d2e8e0ad · 2026-02-22T17:29:16.000+01:00
diff --git a/rest/rest-sqs-testing-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/integration/CustomServerContextTests.scala b/rest/rest-sqs-testing-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/integration/CustomServerContextTests.scala
@@ -1,8 +1,8 @@
 package org.elasticmq.rest.sqs.integration
 
-import org.elasticmq.rest.sqs.integration.multisdk.{AmazonJavaMultiSdkTestBase, SQSRestServerWithSdkV2Client}
+import org.elasticmq.rest.sqs.integration.common.{IntegrationTestsBase, SQSRestServerWithSdkV2Client}
 
-class CustomServerContextTests extends AmazonJavaMultiSdkTestBase with SQSRestServerWithSdkV2Client {
+class CustomServerContextTests extends IntegrationTestsBase with SQSRestServerWithSdkV2Client {
 
   override val awsRegion = "elasticmq"
   override val awsAccountId = "123456789012"
diff --git a/rest/rest-sqs-testing-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/integration/SqlQueuePersistenceTests.scala b/rest/rest-sqs-testing-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/integration/SqlQueuePersistenceTests.scala
@@ -7,10 +7,10 @@ import org.elasticmq.actor.queue.QueueEvent
 import org.elasticmq.actor.reply._
 import org.elasticmq.persistence.sql.{GetAllMessages, SqlQueuePersistenceActor, SqlQueuePersistenceConfig}
 import org.elasticmq.rest.sqs.integration.client.{ApproximateNumberOfMessagesAttributeName, RedrivePolicyAttributeName, VisibilityTimeoutAttributeName}
-import org.elasticmq.rest.sqs.integration.multisdk.{AmazonJavaMultiSdkTestBase, SQSRestServerWithSdkV2Client}
 import org.elasticmq.rest.sqs.model.RedrivePolicy
 import org.elasticmq.rest.sqs.model.RedrivePolicyJson.format
-import org.elasticmq.rest.sqs.{SQSRestServerBuilder}
+import org.elasticmq.rest.sqs.SQSRestServerBuilder
+import org.elasticmq.rest.sqs.integration.common.{IntegrationTestsBase, SQSRestServerWithSdkV2Client}
 import org.elasticmq.util.NowProvider
 import org.elasticmq.{NodeAddress, StrictSQSLimits}
 import org.scalatest.concurrent.ScalaFutures
@@ -20,7 +20,7 @@ import spray.json.enrichAny
 import scala.concurrent.duration._
 
 class SqlQueuePersistenceTests
-    extends AmazonJavaMultiSdkTestBase
+    extends IntegrationTestsBase
     with SQSRestServerWithSdkV2Client
     with ScalaFutures {
 
diff --git a/rest/rest-sqs-testing-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/integration/client/SqsTestClient.scala b/rest/rest-sqs-testing-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/integration/client/SqsTestClient.scala
@@ -1,6 +1,6 @@
 package org.elasticmq.rest.sqs.integration.client
 
-trait HasSqsTestClient {
+trait SqsTestClient {
 
   def testClient: SqsClient
 }
diff --git a/rest/rest-sqs-testing-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/integration/common/AwsConfig.scala b/rest/rest-sqs-testing-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/integration/common/AwsConfig.scala
@@ -1,4 +1,4 @@
-package org.elasticmq.rest.sqs.integration.multisdk
+package org.elasticmq.rest.sqs.integration.common
 
 trait AwsConfig {
 
diff --git a/rest/rest-sqs-testing-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/integration/common/IntegrationTestsBase.scala b/rest/rest-sqs-testing-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/integration/common/IntegrationTestsBase.scala
@@ -1,12 +1,12 @@
-package org.elasticmq.rest.sqs.integration.multisdk
+package org.elasticmq.rest.sqs.integration.common
 
 import org.elasticmq.MessageAttribute
-import org.elasticmq.rest.sqs.integration.client.{HasSqsTestClient, ReceivedMessage, SqsClientError, SqsClientErrorType}
+import org.elasticmq.rest.sqs.integration.client.{SqsTestClient, ReceivedMessage, SqsClientError, SqsClientErrorType}
 import org.scalatest.concurrent.Eventually
 import org.scalatest.funsuite.AnyFunSuite
 import org.scalatest.matchers.should.Matchers
 
-trait AmazonJavaMultiSdkTestBase extends AnyFunSuite with HasSqsTestClient with AwsConfig with Matchers with Eventually {
+trait IntegrationTestsBase extends AnyFunSuite with SqsTestClient with AwsConfig with Matchers with Eventually {
 
   protected def assertError(
       result: Either[SqsClientError, _],
diff --git a/rest/rest-sqs-testing-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/integration/common/SQSRestServerWithSdkV1Client.scala b/rest/rest-sqs-testing-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/integration/common/SQSRestServerWithSdkV1Client.scala
@@ -1,4 +1,4 @@
-package org.elasticmq.rest.sqs.integration.multisdk
+package org.elasticmq.rest.sqs.integration.common
 
 import com.amazonaws.auth.{AWSStaticCredentialsProvider, BasicAWSCredentials}
 import com.amazonaws.client.builder.AwsClientBuilder.EndpointConfiguration
diff --git a/rest/rest-sqs-testing-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/integration/common/SQSRestServerWithSdkV2Client.scala b/rest/rest-sqs-testing-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/integration/common/SQSRestServerWithSdkV2Client.scala
@@ -1,4 +1,4 @@
-package org.elasticmq.rest.sqs.integration.multisdk
+package org.elasticmq.rest.sqs.integration.common
 
 import org.elasticmq.rest.sqs.integration.client.{AwsSdkV2SqsClient, SqsClient}
 import org.elasticmq.rest.sqs.{SQSRestServer, SQSRestServerBuilder}
diff --git a/rest/rest-sqs-testing-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/integration/multisdk/CreateQueueRaceConditionTests.scala b/rest/rest-sqs-testing-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/integration/multisdk/CreateQueueRaceConditionTests.scala
@@ -1,12 +1,13 @@
 package org.elasticmq.rest.sqs.integration.multisdk
 
 import org.elasticmq.rest.sqs.integration.client.VisibilityTimeoutAttributeName
+import org.elasticmq.rest.sqs.integration.common.IntegrationTestsBase
 
 import java.util.concurrent.Executors
 import scala.concurrent.duration.Duration
 import scala.concurrent.{Await, ExecutionContext, ExecutionContextExecutor, Future}
 
-trait CreateQueueRaceConditionTests extends AmazonJavaMultiSdkTestBase {
+trait CreateQueueRaceConditionTests extends IntegrationTestsBase {
 
   test("should create one queue and return its address for every request with the same name and metadata") {
     implicit val ec: ExecutionContextExecutor = ExecutionContext.fromExecutor(Executors.newFixedThreadPool(100))
diff --git a/rest/rest-sqs-testing-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/integration/multisdk/DeadLetterQueueTests.scala b/rest/rest-sqs-testing-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/integration/multisdk/DeadLetterQueueTests.scala
@@ -1,15 +1,12 @@
 package org.elasticmq.rest.sqs.integration.multisdk
 
-import org.elasticmq.rest.sqs.integration.client.{
-  DeadLetterQueueSourceArn,
-  RedrivePolicyAttributeName,
-  VisibilityTimeoutAttributeName
-}
+import org.elasticmq.rest.sqs.integration.client.{DeadLetterQueueSourceArn, RedrivePolicyAttributeName, VisibilityTimeoutAttributeName}
+import org.elasticmq.rest.sqs.integration.common.IntegrationTestsBase
 import org.elasticmq.rest.sqs.model.RedrivePolicy
 import org.elasticmq.rest.sqs.model.RedrivePolicyJson.format
 import spray.json.enrichAny
 
-trait DeadLetterQueueTests extends AmazonJavaMultiSdkTestBase {
+trait DeadLetterQueueTests extends IntegrationTestsBase {
 
   test("should list DeadLetterQueueSourceArn in receive message attributes") {
     // given
diff --git a/rest/rest-sqs-testing-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/integration/multisdk/FifoDeduplicationTests.scala b/rest/rest-sqs-testing-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/integration/multisdk/FifoDeduplicationTests.scala
@@ -2,8 +2,9 @@ package org.elasticmq.rest.sqs.integration.multisdk
 
 import org.elasticmq.StringMessageAttribute
 import org.elasticmq.rest.sqs.integration.client._
+import org.elasticmq.rest.sqs.integration.common.IntegrationTestsBase
 
-trait FifoDeduplicationTests extends AmazonJavaMultiSdkTestBase {
+trait FifoDeduplicationTests extends IntegrationTestsBase {
 
   test("FIFO provided message deduplication ids should take priority over content based deduplication") {
     // Given
diff --git a/rest/rest-sqs-testing-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/integration/multisdk/FifoQueueTests.scala b/rest/rest-sqs-testing-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/integration/multisdk/FifoQueueTests.scala
@@ -1,8 +1,9 @@
 package org.elasticmq.rest.sqs.integration.multisdk
 
 import org.elasticmq.rest.sqs.integration.client._
+import org.elasticmq.rest.sqs.integration.common.IntegrationTestsBase
 
-trait FifoQueueTests extends AmazonJavaMultiSdkTestBase {
+trait FifoQueueTests extends IntegrationTestsBase {
 
   test("FIFO queues should return an error if the queue's name does not end in .fifo") {
     // expect
diff --git a/rest/rest-sqs-testing-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/integration/multisdk/HealthCheckTests.scala b/rest/rest-sqs-testing-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/integration/multisdk/HealthCheckTests.scala
@@ -3,11 +3,12 @@ package org.elasticmq.rest.sqs.integration.multisdk
 import org.apache.pekko.http.scaladsl.Http
 import org.apache.pekko.http.scaladsl.model.{HttpRequest, StatusCodes}
 import org.apache.pekko.http.scaladsl.testkit.ScalatestRouteTest
+import org.elasticmq.rest.sqs.integration.common.IntegrationTestsBase
 
 import scala.concurrent.Await
 import scala.concurrent.duration.DurationInt
 
-trait HealthCheckTests extends AmazonJavaMultiSdkTestBase with ScalatestRouteTest {
+trait HealthCheckTests extends IntegrationTestsBase with ScalatestRouteTest {
 
   test("health check") {
     val responseFuture = Http().singleRequest(HttpRequest(uri = s"http://localhost:9321/health"))
diff --git a/rest/rest-sqs-testing-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/integration/multisdk/MessageAttributesTests.scala b/rest/rest-sqs-testing-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/integration/multisdk/MessageAttributesTests.scala
@@ -2,8 +2,9 @@ package org.elasticmq.rest.sqs.integration.multisdk
 
 import org.elasticmq.StringMessageAttribute
 import org.elasticmq.rest.sqs.integration.client._
+import org.elasticmq.rest.sqs.integration.common.IntegrationTestsBase
 
-trait MessageAttributesTests extends AmazonJavaMultiSdkTestBase {
+trait MessageAttributesTests extends IntegrationTestsBase {
 
   test("Sending message with empty attribute value and String data type should result in error") {
     // given
diff --git a/rest/rest-sqs-testing-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/integration/multisdk/MessageMoveTaskTests.scala b/rest/rest-sqs-testing-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/integration/multisdk/MessageMoveTaskTests.scala
@@ -2,14 +2,15 @@ package org.elasticmq.rest.sqs.integration.multisdk
 
 import org.elasticmq.rest.sqs.integration.client.client.QueueUrl
 import org.elasticmq.rest.sqs.integration.client._
+import org.elasticmq.rest.sqs.integration.common.IntegrationTestsBase
 import org.elasticmq.rest.sqs.model.RedrivePolicy
 import org.elasticmq.rest.sqs.model.RedrivePolicyJson.format
 import spray.json.enrichAny
 
 import java.util.UUID
 import scala.concurrent.duration.DurationInt
 
-trait MessageMoveTaskTests extends AmazonJavaMultiSdkTestBase {
+trait MessageMoveTaskTests extends IntegrationTestsBase {
 
   private val NumMessages = 6
   private val DlqArn = s"arn:aws:sqs:$awsRegion:$awsAccountId:testQueue-dlq"
diff --git a/rest/rest-sqs-testing-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/integration/multisdk/MessageOperationsTests.scala b/rest/rest-sqs-testing-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/integration/multisdk/MessageOperationsTests.scala
@@ -1,11 +1,12 @@
 package org.elasticmq.rest.sqs.integration.multisdk
 
 import org.elasticmq.rest.sqs.integration.client._
+import org.elasticmq.rest.sqs.integration.common.IntegrationTestsBase
 import org.elasticmq.{BinaryMessageAttribute, NumberMessageAttribute, StringMessageAttribute}
 
 import scala.concurrent.duration.DurationInt
 
-trait MessageOperationsTests extends AmazonJavaMultiSdkTestBase {
+trait MessageOperationsTests extends IntegrationTestsBase {
 
   test("should return error when message body is empty") {
     // given
diff --git a/rest/rest-sqs-testing-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/integration/multisdk/MultiSdkTestSuite.scala b/rest/rest-sqs-testing-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/integration/multisdk/MultiSdkTestSuite.scala
@@ -1,7 +1,9 @@
 package org.elasticmq.rest.sqs.integration.multisdk
 
+import org.elasticmq.rest.sqs.integration.common.{IntegrationTestsBase, SQSRestServerWithSdkV1Client, SQSRestServerWithSdkV2Client}
+
 abstract class AmazonJavaMultiSdkTestSuite
-    extends AmazonJavaMultiSdkTestBase
+    extends IntegrationTestsBase
     with QueueOperationsTests
     with QueueAttributesTests
     with MessageOperationsTests
diff --git a/rest/rest-sqs-testing-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/integration/multisdk/QueueAttributesTests.scala b/rest/rest-sqs-testing-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/integration/multisdk/QueueAttributesTests.scala
@@ -1,8 +1,9 @@
 package org.elasticmq.rest.sqs.integration.multisdk
 
 import org.elasticmq.rest.sqs.integration.client._
+import org.elasticmq.rest.sqs.integration.common.IntegrationTestsBase
 
-trait QueueAttributesTests extends AmazonJavaMultiSdkTestBase {
+trait QueueAttributesTests extends IntegrationTestsBase {
 
   test("should create a queue with the default visibility timeout") {
     // given
diff --git a/rest/rest-sqs-testing-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/integration/multisdk/QueueOperationsTests.scala b/rest/rest-sqs-testing-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/integration/multisdk/QueueOperationsTests.scala
@@ -1,10 +1,11 @@
 package org.elasticmq.rest.sqs.integration.multisdk
 
 import org.elasticmq.rest.sqs.integration.client.{QueueDoesNotExist, SqsClientError}
+import org.elasticmq.rest.sqs.integration.common.IntegrationTestsBase
 
 import scala.concurrent.duration.DurationInt
 
-trait QueueOperationsTests extends AmazonJavaMultiSdkTestBase {
+trait QueueOperationsTests extends IntegrationTestsBase {
 
   test("should create a queue") {
     testClient.createQueue("testQueue1").toOption.get
diff --git a/rest/rest-sqs-testing-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/integration/multisdk/TracingTests.scala b/rest/rest-sqs-testing-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/integration/multisdk/TracingTests.scala
@@ -1,8 +1,9 @@
 package org.elasticmq.rest.sqs.integration.multisdk
 
 import org.elasticmq.rest.sqs.integration.client.{AWSTraceHeader, SendMessageBatchEntry}
+import org.elasticmq.rest.sqs.integration.common.IntegrationTestsBase
 
-trait TracingTests extends AmazonJavaMultiSdkTestBase {
+trait TracingTests extends IntegrationTestsBase {
 
   test("Message should not have assigned trace if such one was not provided") {
     val queueUrl = testClient.createQueue("testQueue1").toOption.get

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`package org.elasticmq.rest.sqs.integration.client`
`2`	`2`
`3`		`-trait HasSqsTestClient {`
	`3`	`+trait SqsTestClient {`
`4`	`4`
`5`	`5`	`def testClient: SqsClient`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.elasticmq.rest.sqs.integration.multisdk`
	`1`	`+package org.elasticmq.rest.sqs.integration.common`
`2`	`2`
`3`	`3`	`trait AwsConfig {`
`4`	`4`