Merge branch 'Baeldung:master' into test-rearrangement

Author: yadavan88

README.md

@@ -6,7 +6,7 @@ In this repository, we have classified the tests in 4 categories.
 | -- |---------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | Unit Tests | Smallest unit of testing, that are not dependent on external tools or services                                                                                |
 | Integration Tests | IntegrationTests means those tests that use some automatic setup within our environment like in-memory Mongo, h2 database etc which don't need explicit setup |
-| Live Tests | Tests that depends on some external services (like httpbin.org, or some internet-based links)                                                                 |
+| Live Tests | Tests that depends on some external services (like httpbin.org, or some internet-based links) or require a running component (eg: starting a Spring Boot application)                                                                 |
 | Manual Tests | The tests where we need to set up an environment explicitly(for e.g. docker), without which the tests can't be run                                             |
 
 

alias.sbt

@@ -0,0 +1,3 @@
+addCommandAlias("specialTests", "testOnly com.baeldung.scala.scalatest.runner.ScalaTestRunnerTests -- -z \"spaces\" -n \"BooleanTests\"")
+
+addCommandAlias("compileAndRunSpecialTest","compile;specialTests")

build.sbt

@@ -6,8 +6,8 @@ ThisBuild / organization := "com.baeldung"
 ThisBuild / organizationName := "core-scala"
 
 val jUnitInterface = "com.github.sbt" % "junit-interface" % "0.13.3" % "test"
-val catsEffect = "org.typelevel" %% "cats-effect" % "3.5.0"
-val catEffectTest = "org.typelevel" %% "cats-effect-testkit" % "3.5.0" % Test
+val catsEffect = "org.typelevel" %% "cats-effect" % "3.5.1"
+val catEffectTest = "org.typelevel" %% "cats-effect-testkit" % "3.5.1" % Test
 val scalaReflection = "org.scala-lang" % "scala-reflect" % scalaV
 val logback = "ch.qos.logback" % "logback-classic" % "1.3.8"
 val embedMongoVersion = "4.7.0"
@@ -260,7 +260,7 @@ lazy val scala_libraries = (project in file("scala-libraries"))
 
 val circeVersion = "0.14.5"
 val monixVersion = "3.4.1"
-val elastic4sVersion = "8.7.0"
+val elastic4sVersion = "8.7.1"
 val sparkVersion = "3.4.0"
 
 val sparkCoreDep = "org.apache.spark" %% "spark-core" % sparkVersion
@@ -308,7 +308,7 @@ lazy val scala_libraries_2 = (project in file("scala-libraries-2"))
   )
 
 val http4sBlaze = "0.23.15"
-val http4sVersion = "0.23.20"
+val http4sVersion = "0.23.22"
 val osLibVersion = "0.9.1"
 lazy val scala_libraries_3 = (project in file("scala-libraries-3"))
   .settings(
@@ -374,7 +374,7 @@ lazy val scala_libraries_4 = (project in file("scala-libraries-4"))
     ),
     libraryDependencies ++= Seq(
       "software.amazon.awssdk" % "s3" % "2.20.85",
-      "com.amazonaws" % "aws-java-sdk-s3" % "1.12.488" % IntegrationTest,
+      "com.amazonaws" % "aws-java-sdk-s3" % "1.12.501" % IntegrationTest,
       "com.dimafeng" %% "testcontainers-scala-scalatest" % "0.40.16" % IntegrationTest,
       "com.dimafeng" %% "testcontainers-scala-localstack-v2" % "0.40.16" % IntegrationTest
     ),

play-scala/application-tests/app/com/baeldung/arrival/controller/ArrivalController.scala

@@ -0,0 +1,16 @@
+package com.baeldung.arrival.controller
+
+import com.baeldung.arrival.service.ArrivalService
+import play.api.libs.json.Json
+import play.api.mvc.{BaseController, ControllerComponents}
+
+import javax.inject.Inject
+import scala.concurrent.ExecutionContext
+
+class ArrivalController @Inject()(arrivalService: ArrivalService, val controllerComponents: ControllerComponents)(implicit ec: ExecutionContext) extends BaseController {
+
+  def index() = Action.async { _ =>
+    arrivalService.getArrivals().map(arrivals => Ok(Json.toJson(arrivals)))
+  }
+
+}

play-scala/application-tests/app/com/baeldung/arrival/controller/action/SourceActions.scala

@@ -0,0 +1,25 @@
+package com.baeldung.arrival.controller.action
+
+import play.api.mvc._
+
+import scala.concurrent.{ExecutionContext, Future}
+
+trait SourceActions {
+
+  def SourceActionFilter(implicit ec: ExecutionContext): ActionFilter[Request] = new ActionFilter[Request] {
+    override protected def filter[A](request: Request[A]): Future[Option[Result]] = {
+      Future.successful {
+        request.headers.get("source") match {
+          case Some(_) => None
+          case None => Some(Results.BadRequest("Source header is absent"))
+        }
+      }
+    }
+
+    override protected def executionContext: ExecutionContext = ec
+  }
+
+  def SourceAction(anyContentParser: BodyParser[AnyContent])(implicit ec: ExecutionContext): ActionBuilder[Request, AnyContent] =
+    new ActionBuilderImpl[AnyContent](anyContentParser) andThen SourceActionFilter
+
+}

play-scala/application-tests/app/com/baeldung/arrival/db/manager/DbManager.scala

@@ -0,0 +1,14 @@
+package com.baeldung.arrival.db.manager
+
+import slick.basic.DatabaseConfig
+import slick.dbio.DBIO
+
+import scala.concurrent.Future
+
+trait DbManager {
+
+  def dbConfig: DatabaseConfig[_]
+
+  def execute[T](dbio: DBIO[T]): Future[T] = dbConfig.db.run(dbio)
+
+}

play-scala/application-tests/app/com/baeldung/arrival/db/manager/H2Manager.scala

@@ -0,0 +1,8 @@
+package com.baeldung.arrival.db.manager
+
+import slick.basic.DatabaseConfig
+import slick.jdbc.H2Profile
+
+import javax.inject.Inject
+
+class H2Manager @Inject()(val dbConfig: DatabaseConfig[H2Profile]) extends DbManager

play-scala/application-tests/app/com/baeldung/arrival/db/manager/PostgresManager.scala

@@ -0,0 +1,8 @@
+package com.baeldung.arrival.db.manager
+
+import slick.basic.DatabaseConfig
+import slick.jdbc.PostgresProfile
+
+import javax.inject.Inject
+
+class PostgresManager @Inject()(val dbConfig: DatabaseConfig[PostgresProfile]) extends DbManager

play-scala/application-tests/app/com/baeldung/arrival/db/repository/ArrivalRepository.scala

@@ -0,0 +1,14 @@
+package com.baeldung.arrival.db.repository
+
+import play.api.libs.json.{Json, OFormat}
+import slick.dbio.DBIO
+
+case class Arrival(planeId: Long, origin: String, destination: String, plane: String)
+
+object Arrival {
+  implicit val format: OFormat[Arrival] = Json.format[Arrival]
+}
+
+trait ArrivalRepository {
+  def getArrivals: DBIO[Seq[Arrival]]
+}

play-scala/application-tests/app/com/baeldung/arrival/db/repository/MockArrivalRepository.scala

@@ -0,0 +1,13 @@
+package com.baeldung.arrival.db.repository
+
+import slick.dbio.DBIO
+
+class MockArrivalRepository extends ArrivalRepository {
+  override def getArrivals: DBIO[Seq[Arrival]] = DBIO.successful(
+    List(
+      Arrival(1L, "origin-1", "destination-1", "F16"),
+      Arrival(2L, "origin-2", "destination-2", "F22"),
+      Arrival(3L, "origin-3", "destination-3", "SR71")
+    )
+  )
+}