wip

Author: miton18

.github/workflows/test.yml

@@ -0,0 +1,37 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: Scala CI
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK 11
+        uses: actions/setup-java@v4
+        with:
+          java-version: '11'
+          distribution: 'temurin'
+          cache: 'sbt'
+      - name: Setup sbt launcher
+        uses: sbt/setup-sbt@v1
+      - name: Run tests
+        run: sbt reload
+      - name: debug
+        run: |
+          unzip -l /home/runner/.cache/coursier/v1/https/repo1.maven.org/maven2/com/clever-cloud/testcontainers-warp10/2.0.0/testcontainers-warp10-2.0.0.jar
+        # Optional: This step uploads information to the GitHub dependency graph and unblocking Dependabot alerts for the repository
+      - name: Upload dependency graph
+        uses: scalacenter/sbt-dependency-submission@ab086b50c947c9774b70f39fc7f6e20ca2706c91

build.sbt

@@ -1,5 +1,5 @@
-lazy val testContainersScalaVersion = "0.41.5"
-lazy val testContainersWarp10Version = "1.0.8"
+lazy val testContainersScalaVersion = "0.43.0"
+lazy val testContainersWarp10Version = "2.0.0"
 lazy val akkaVersion = "2.8.8"
 
 ThisBuild / semanticdbVersion := "4.12.1"
@@ -8,25 +8,25 @@ credentials += Credentials("GnuPG Key ID", "gpg", "B11C53C05D413713BDD3660FA7B8F
 
 lazy val root = (project in file(".")).settings(
   organization := "com.clever-cloud",
-  scalaVersion := "2.13.15",
+  scalaVersion := "2.13.16",
   version := "2.1.2",
   crossScalaVersions := Seq(scalaVersion.value, "3.6.2"),
   name := "testcontainers-scala-warp10",
-  licenses := List("MIT" -> new URI("https://mit-license.org/").toURL()),
+  licenses := List("MIT" -> new URI("https://mit-license.org/").toURL),
   homepage := Some(url("https://github.com/CleverCloud/testcontainers-scala-warp10")),
   resolvers += Resolver.mavenLocal,
   resolvers += Resolver.mavenCentral,
   libraryDependencies ++= Seq(
     "com.dimafeng" %% "testcontainers-scala-core" % testContainersScalaVersion,
     "com.clever-cloud" % "testcontainers-warp10" % testContainersWarp10Version,
-    "net.java.dev.jna" % "jna" % "5.15.0" % Test,
+    "net.java.dev.jna" % "jna" % "5.17.0" % Test,
     "org.scalatest" %% "scalatest" % "3.2.19" % Test,
     ("com.typesafe.akka" %% "akka-protobuf-v3" % akkaVersion % Test).cross(CrossVersion.for3Use2_13),
     ("com.typesafe.akka" %% "akka-stream-typed" % akkaVersion % Test).cross(CrossVersion.for3Use2_13),
     ("com.typesafe.akka" %% "akka-stream" % akkaVersion % Test).cross(CrossVersion.for3Use2_13),
     ("com.typesafe.akka" %% "akka-actor-testkit-typed" % akkaVersion % Test).cross(CrossVersion.for3Use2_13),
     "com.dimafeng" %% "testcontainers-scala-scalatest" % testContainersScalaVersion % Test,
-    "org.slf4j" % "slf4j-jdk14" % "2.0.16" % Test,
+    "org.slf4j" % "slf4j-jdk14" % "2.0.17" % Test,
     ("io.moia" %% "scala-http-client" % "5.2.0" % Test).cross(CrossVersion.for3Use2_13)
   ),
   publishMavenStyle := true,

src/main/scala/com.clevercloud.testcontainers.scala/Warp10Container.scala

@@ -40,11 +40,9 @@ case class Warp10Container(
 }
 
 object Warp10Container {
-  val defaultTag = "2.7.5"
+  val defaultTag = "3.4.1-ubuntu-ci"
 
-  case class Def(
-    tag: String,
-  ) extends ContainerDef {
+  case class Def(tag: String = defaultTag) extends ContainerDef {
     override type Container = Warp10Container
 
     override def createContainer(): Warp10Container = {

src/test/scala/com/clevercloud/testcontainers/scala/Warp10ContainerSpecs.scala

@@ -8,28 +8,21 @@ import akka.http.scaladsl.unmarshalling.Unmarshal
 import io.moia.scalaHttpClient._
 import org.scalatest.concurrent.Eventually
 import org.scalatest.matchers.should.Matchers
-import org.scalatest.time.{ Milliseconds, Seconds, Span }
 import org.scalatest.wordspec.AnyWordSpec
 import com.dimafeng.testcontainers.ForAllTestContainer
-
 import java.time.Clock
 import scala.concurrent.{ Await, ExecutionContextExecutor, Future }
 import scala.concurrent.duration.{ Deadline, DurationInt }
 
-
-class Warp10ContainerSpecs extends AnyWordSpec
-                                   with Matchers
-                                   with Eventually
-                                   with ForAllTestContainer {
-
+class Warp10ContainerSpecs extends AnyWordSpec with Matchers with Eventually with ForAllTestContainer {
 
   private val Warp10AuthHeader = "X-Warp10-Token"
   private val Warp10FetchAPI = "/api/v0/exec"
   private val Warp10FetchGTS = "[ '%s' 'test' {} NOW -1 ] FETCH"
   private val Warp10FetchedHeader = "X-Warp10-Fetched"
   private val Warp10GTS = "1// test{} 42"
   private val Warp10UpdateAPI = "/api/v0/update"
-  private val Warp10Version = "2.7.5"
+  private val Warp10Version = "3.4.1-ubuntu-ci"
 
   val container: Warp10Container = Warp10Container(Warp10Version)
 
@@ -39,29 +32,27 @@ class Warp10ContainerSpecs extends AnyWordSpec
   implicit val ec    : ExecutionContextExecutor = system.executionContext
 
   "warp10 testcontainer" should {
+
     "give write token" in {
       container.container.isRunning shouldBe (true)
 
       assert(container.readToken != null)
       assert(container.writeToken != null)
     }
-    "write to and read from warp10" in {
-      implicit val patienceConfig: PatienceConfig = PatienceConfig(timeout = Span(5, Seconds), interval = Span(50, Milliseconds))
 
+    "write to and read from warp10" in {
       Await.result(warp10Request(container, Warp10UpdateAPI, Warp10GTS, Some(container.writeToken)), 10.seconds) match {
         case HttpClientSuccess(_) =>
           Await.result(warp10Request(container, Warp10FetchAPI, String.format(Warp10FetchGTS, container.readToken), None), 5.seconds) match {
             case HttpClientSuccess(content) =>
               content.status.isSuccess() shouldBe (true)
               content.headers.find(_.lowercaseName() == Warp10FetchedHeader.toLowerCase()).map(_.value().toInt).getOrElse(0) shouldBe (1)
-            case _                          =>
-              assert(false)
+            case _  => assert(false)
           }
         case DomainError(content) =>
           val result = Await.result(Unmarshal(content).to[String], 10.seconds)
           assert(false, result)
-        case _                    =>
-          assert(false)
+        case _ => assert(false)
       }
     }
   }