Migrate HealthCheckTests to new test structure and integrate into AmazonJavaSdkNewTestSuite

Author: micossow

rest/rest-sqs-testing-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/aws/AmazonJavaSdkNewTestSuite.scala

@@ -14,6 +14,7 @@ abstract class AmazonJavaSdkNewTestSuite
     with FifoDeduplicationTests
     with MessageAttributesTests
     with TracingTests
+    with HealthCheckTests
 
 class AmazonJavaSdkV1TestSuite extends AmazonJavaSdkNewTestSuite with SqsClientServerCommunication
 class AmazonJavaSdkV2TestSuite extends AmazonJavaSdkNewTestSuite with SqsClientServerWithSdkV2Communication

…elasticmq/rest/sqs/HealthCheckTest.scala …icmq/rest/sqs/aws/HealthCheckTests.scalarest/rest-sqs-testing-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/HealthCheckTest.scala renamed to rest/rest-sqs-testing-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/aws/HealthCheckTests.scala rest/rest-sqs-testing-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/HealthCheckTest.scala renamed to rest/rest-sqs-testing-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/aws/HealthCheckTests.scala

@@ -1,16 +1,16 @@
-package org.elasticmq.rest.sqs
+package org.elasticmq.rest.sqs.aws
+
 import org.apache.pekko.http.scaladsl.Http
-import org.apache.pekko.http.scaladsl.model.{HttpRequest, HttpResponse, StatusCodes}
+import org.apache.pekko.http.scaladsl.model.{HttpRequest, StatusCodes}
 import org.apache.pekko.http.scaladsl.testkit.ScalatestRouteTest
-import org.scalatest.matchers.should.Matchers
 
+import scala.concurrent.Await
 import scala.concurrent.duration.DurationInt
-import scala.concurrent.{Await, Future}
 
-class HealthCheckTest extends SqsClientServerCommunication with ScalatestRouteTest with Matchers {
+trait HealthCheckTests extends AmazonJavaSdkNewTestBase with ScalatestRouteTest {
 
   test("health check") {
-    val responseFuture: Future[HttpResponse] = Http().singleRequest(HttpRequest(uri = s"$ServiceEndpoint/health"))
+    val responseFuture = Http().singleRequest(HttpRequest(uri = s"http://localhost:9321/health"))
     val response = Await.result(responseFuture, 10.seconds)
 
     response.status shouldBe StatusCodes.OK