Fix it tests not compiling due to FutureConverters (#11)

pjfanning · May 30, 2023 · b659834 · b659834
1 parent b32a023
commit b659834
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -55,7 +55,7 @@ jobs:
         run: sbt githubWorkflowCheck
 
       - name: Build project
-        run: sbt '++ ${{ matrix.scala }}' test
+        run: 'sbt ''++ ${{ matrix.scala }}'' it:compile test'
 
       - name: Make target directories
         if: github.event_name != 'pull_request' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v'))

diff --git a/build.sbt b/build.sbt
@@ -22,6 +22,8 @@ ThisBuild / githubWorkflowPublish := Seq(
   )
 )
 
+ThisBuild / githubWorkflowBuild := Seq(WorkflowStep.Sbt(List("it:compile", "test"), name = Some("Build project")))
+
 ThisBuild / mimaPreviousArtifacts := Set.empty
 ThisBuild / resolvers += "Apache Nexus Snapshots".at("https://repository.apache.org/content/repositories/snapshots/")
 

diff --git a/src/it/scala/com/github/pjfanning/pekkohttpspi/dynamodb/ITTestDynamoDB.scala b/src/it/scala/com/github/pjfanning/pekkohttpspi/dynamodb/ITTestDynamoDB.scala
@@ -16,16 +16,14 @@
 
 package com.github.pjfanning.pekkohttpspi.dynamodb
 
-import com.github.pjfanning.pekkohttpspi.{PekkoHttpAsyncHttpService, TestBase}
+import com.github.pjfanning.pekkohttpspi.{FutureConverters, PekkoHttpAsyncHttpService, TestBase}
 import org.scalatest.concurrent.{Eventually, Futures, IntegrationPatience}
 import org.scalatest.wordspec.AnyWordSpec
 import org.scalatest.matchers.should.Matchers
 import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient
 import software.amazon.awssdk.services.dynamodb.model._
 import org.scalatest.concurrent.ScalaFutures._
 
-import scala.compat.java8.FutureConverters._
-
 class ITTestDynamoDB
     extends AnyWordSpec
     with Matchers
@@ -80,10 +78,11 @@ class ITTestDynamoDB
       desc.tableName() should be(tableName)
 
       eventually {
-        val response = client.describeTable(DescribeTableRequest.builder().tableName(tableName).build()).toScala
+        val response =
+          FutureConverters.asScala(client.describeTable(DescribeTableRequest.builder().tableName(tableName).build()))
         response.futureValue.table().tableStatus() should be(TableStatus.ACTIVE)
       }
-      client.deleteTable(DeleteTableRequest.builder().tableName(tableName).build()).toScala
+      FutureConverters.asScala(client.deleteTable(DeleteTableRequest.builder().tableName(tableName).build()))
 
     }
   }

diff --git a/src/main/scala-2.12/com/github/pjfanning/pekkohttpspi/FutureConverters.scala b/src/main/scala-2.12/com/github/pjfanning/pekkohttpspi/FutureConverters.scala
@@ -6,4 +6,6 @@ import scala.concurrent.Future
 private[pekkohttpspi] object FutureConverters {
   @inline final def asJava[T](f: Future[T]): CompletionStage[T] = scala.compat.java8.FutureConverters.toJava(f)
 
+  @inline final def asScala[T](cs: CompletionStage[T]): Future[T] = scala.compat.java8.FutureConverters.toScala(cs)
+
 }
diff --git a/src/main/scala-2.13/com/github/pjfanning/pekkohttpspi/FutureConverters.scala b/src/main/scala-2.13/com/github/pjfanning/pekkohttpspi/FutureConverters.scala
@@ -6,4 +6,6 @@ import scala.jdk.javaapi
 
 private[pekkohttpspi] object FutureConverters {
   @inline final def asJava[T](f: Future[T]): CompletionStage[T] = javaapi.FutureConverters.asJava(f)
+
+  @inline final def asScala[T](cs: CompletionStage[T]): Future[T] = javaapi.FutureConverters.asScala(cs)
 }
diff --git a/src/main/scala-3/com/github/pjfanning/pekkohttpspi/FutureConverters.scala b/src/main/scala-3/com/github/pjfanning/pekkohttpspi/FutureConverters.scala
@@ -6,4 +6,6 @@ import scala.jdk.javaapi
 
 private[pekkohttpspi] object FutureConverters {
   inline final def asJava[T](f: Future[T]): CompletionStage[T] = javaapi.FutureConverters.asJava(f)
+
+  inline final def asScala[T](cs: CompletionStage[T]): Future[T] = javaapi.FutureConverters.asScala(cs)
 }