From 5704eb9e070c0fed896bcaab9ffae2b738f43ea9 Mon Sep 17 00:00:00 2001
From: Fabrice Lecomte <fabrice.lecomte.be@gmail.com>
Date: Wed, 3 Feb 2021 15:35:14 +0100
Subject: [PATCH] Clean config in test

---
 src/main/kotlin/application/Configuration.kt |  6 +++---
 src/test/kotlin/CucumberTest.kt              | 10 ----------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/src/main/kotlin/application/Configuration.kt b/src/main/kotlin/application/Configuration.kt
index caddf5c..0ee858c 100644
--- a/src/main/kotlin/application/Configuration.kt
+++ b/src/main/kotlin/application/Configuration.kt
@@ -7,9 +7,9 @@ object Configuration {
     private var config = ConfigFactory.load()
 
     object Sql {
-        val migrationFiles: URI = this::class.java.getResource("/sql/migrations").toURI()
-        val functionFiles: URI = this::class.java.getResource("/sql/functions").toURI()
-        val fixtureFiles: URI = this::class.java.getResource("/sql/fixtures").toURI()
+        val migrationFiles: URI = this::class.java.getResource("/sql/migrations")?.toURI() ?: error("No migrations found")
+        val functionFiles: URI = this::class.java.getResource("/sql/functions")?.toURI() ?: error("No sql function found")
+        val fixtureFiles: URI = this::class.java.getResource("/sql/fixtures")?.toURI() ?: error("No sql fixture found")
     }
     object Database {
         val host: String = config.getString("db.host")
diff --git a/src/test/kotlin/CucumberTest.kt b/src/test/kotlin/CucumberTest.kt
index d4cc8b6..e71bd8b 100644
--- a/src/test/kotlin/CucumberTest.kt
+++ b/src/test/kotlin/CucumberTest.kt
@@ -32,10 +32,6 @@ class CucumberTest : En, KoinTest {
 
     init {
         if (!unitialized) {
-            Configuration.Database.database = "test"
-            Configuration.Database.username = "test"
-            Configuration.Database.password = "test"
-
             withTestApplication({ module(CUCUMBER) }) {
                 migrations()
             }
@@ -43,9 +39,6 @@ class CucumberTest : En, KoinTest {
         }
 
         Before(-1) { _: Scenario ->
-            Configuration.Database.database = "test"
-            Configuration.Database.username = "test"
-            Configuration.Database.password = "test"
             ktorContext.start()
             //language=PostgreSQL
             get<Connection>().sendQuery("start transaction;", listOf())
@@ -59,9 +52,6 @@ class CucumberTest : En, KoinTest {
     }
 
     private fun migrations() {
-        Configuration.Database.database = "test"
-        Configuration.Database.username = "test"
-        Configuration.Database.password = "test"
         val migrations: Migrations = get()
         migrations.forceAllDown()
         migrations.run()