diff --git a/build.sbt b/build.sbt index 319d71d5..ac90e8d0 100644 --- a/build.sbt +++ b/build.sbt @@ -49,7 +49,8 @@ lazy val fileManager = project .settings( name := "interop-commons-file-manager", sharedSettings, - libraryDependencies ++= Dependencies.Jars.fileDependencies + libraryDependencies ++= Dependencies.Jars.fileDependencies, + Test / javaOptions += "-Dconfig.file=src/test/resources/application-test.conf" ) .dependsOn(utils) .setupBuildInfo diff --git a/file-manager/src/main/scala/it/pagopa/interop/commons/files/StorageConfiguration.scala b/file-manager/src/main/scala/it/pagopa/interop/commons/files/StorageConfiguration.scala index 5014f5e8..1a3b52fe 100644 --- a/file-manager/src/main/scala/it/pagopa/interop/commons/files/StorageConfiguration.scala +++ b/file-manager/src/main/scala/it/pagopa/interop/commons/files/StorageConfiguration.scala @@ -1,9 +1,11 @@ package it.pagopa.interop.commons.files -import com.typesafe.config.ConfigFactory +import com.typesafe.config.{Config, ConfigFactory} object StorageConfiguration { - val maxConcurrency: Int = ConfigFactory.load().getInt("interop-commons.storage.max-concurrency") - val getUrlDurationMinutes: Int = ConfigFactory.load().getInt("get-url-duration-minutes") - val putUrlDurationMinutes: Int = ConfigFactory.load().getInt("put-url-duration-minutes") + val config: Config = ConfigFactory.load() + + val maxConcurrency: Int = config.getInt("interop-commons.storage.max-concurrency") + val getUrlDurationMinutes: Int = config.getInt("get-url-duration-minutes") + val putUrlDurationMinutes: Int = config.getInt("put-url-duration-minutes") } diff --git a/file-manager/src/test/resources/application-test.conf b/file-manager/src/test/resources/application-test.conf new file mode 100644 index 00000000..97514412 --- /dev/null +++ b/file-manager/src/test/resources/application-test.conf @@ -0,0 +1,2 @@ +get-url-duration-minutes = 5 +put-url-duration-minutes = 1 \ No newline at end of file diff --git a/file-manager/src/test/scala/it/pagopa/interop/commons/files/PDFManagerSpec.scala b/file-manager/src/test/scala/it/pagopa/interop/commons/files/PDFManagerSpec.scala index ab16dc08..75a58d6b 100644 --- a/file-manager/src/test/scala/it/pagopa/interop/commons/files/PDFManagerSpec.scala +++ b/file-manager/src/test/scala/it/pagopa/interop/commons/files/PDFManagerSpec.scala @@ -12,7 +12,7 @@ import scala.io.Source import scala.util.Success import de.redsix.pdfcompare.CompareResultImpl -class PDFManagerSpec extends AnyWordSpecLike with Matchers { +class PDFManagerSpec extends AnyWordSpecLike with Matchers with SpecHelper { val path = getClass.getResource(s"/pdf-template-html.txt").getPath val pdfTemplate = Source.fromFile(new File(path)).mkString diff --git a/file-manager/src/test/scala/it/pagopa/interop/commons/files/S3FileManagerTest.scala b/file-manager/src/test/scala/it/pagopa/interop/commons/files/S3FileManagerTest.scala index 8aaa442e..61653864 100644 --- a/file-manager/src/test/scala/it/pagopa/interop/commons/files/S3FileManagerTest.scala +++ b/file-manager/src/test/scala/it/pagopa/interop/commons/files/S3FileManagerTest.scala @@ -27,7 +27,8 @@ class S3FileManagerTest with Matchers with ScalaFutures with BeforeAndAfterAll - with BeforeAndAfterEach { + with BeforeAndAfterEach + with SpecHelper { override implicit val patienceConfig: PatienceConfig = new PatienceConfig(Span(1, Seconds)) diff --git a/file-manager/src/test/scala/it/pagopa/interop/commons/files/SpecHelper.scala b/file-manager/src/test/scala/it/pagopa/interop/commons/files/SpecHelper.scala new file mode 100644 index 00000000..aea9d681 --- /dev/null +++ b/file-manager/src/test/scala/it/pagopa/interop/commons/files/SpecHelper.scala @@ -0,0 +1,15 @@ +package it.pagopa.interop.commons.files + +import com.typesafe.config.{Config, ConfigFactory} + +trait SpecHelper { + + val testData = ConfigFactory.parseString(s""" + get-url-duration-minutes = 5 + get-url-duration-minutes = 1 + """) + + val config: Config = ConfigFactory + .parseResourcesAnySyntax("application-test") + .withFallback(testData) +}