hubert/SimpleNotes
1
0
Fork 0
Code Projects Releases Activity

Update kodein

Browse Source
This commit is contained in:
Hubert Van De Walle
2020-07-02 23:18:00 +02:00
parent 02c6b2a0c5
commit fb471f8100
8 changed files with 46 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/test/integration/routing/AuthControllerKtTest.kt
+4 -4
View File
@@ -17,9 +17,9 @@ import io.mockk.mockk
import org.amshove.kluent.*
import org.json.JSONObject
import org.junit.jupiter.api.*
import org.kodein.di.Kodein
import org.kodein.di.generic.bind
import org.kodein.di.generic.instance
import org.kodein.di.DI
import org.kodein.di.bind
import org.kodein.di.instance
import utils.*
import java.util.*
@@ -28,7 +28,7 @@ class AuthControllerKtTest {
private val userService = mockk<UserService>()
private val kodein = Kodein {
private val kodein = DI {
import(mainModule, allowOverride = true)
bind<UserService>(overrides = true) with instance(userService)
}
api/test/integration/routing/UserControllerKtTest.kt
+4 -4
View File
@@ -11,9 +11,9 @@ import io.mockk.coEvery
import io.mockk.mockk
import org.amshove.kluent.*
import org.junit.jupiter.api.*
import org.kodein.di.Kodein
import org.kodein.di.generic.bind
import org.kodein.di.generic.instance
import org.kodein.di.DI
import org.kodein.di.bind
import org.kodein.di.instance
import utils.*
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
@@ -42,7 +42,7 @@ class UserControllerKtTest {
}
private val kodein = Kodein {
private val kodein = DI {
import(mainModule, allowOverride = true)
bind<UserService>(overrides = true) with instance(userService)
}
api/test/integration/services/NoteServiceTest.kt
+5 -6
View File
@@ -18,12 +18,11 @@ import kotlinx.coroutines.runBlocking
import me.liuwj.ktorm.jackson.*
import org.amshove.kluent.*
import org.junit.jupiter.api.*
import org.kodein.di.Kodein
import org.kodein.di.generic.bind
import org.kodein.di.generic.instance
import org.kodein.di.generic.singleton
import org.kodein.di.DI
import org.kodein.di.bind
import org.kodein.di.instance
import org.kodein.di.singleton
import utils.KMariadbContainer
import javax.sql.DataSource
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
class NoteServiceTest {
@@ -32,7 +31,7 @@ class NoteServiceTest {
inner class DB {
private val mariadb = KMariadbContainer().apply { start() }
private val kodein = Kodein {
private val kodein = DI {
import(mainModule, allowOverride = true)
bind(overrides = true) from singleton { mariadb.datasource() }
}
api/test/integration/services/UserServiceTest.kt
+6 -8
View File
@@ -3,16 +3,14 @@ package integration.services
import be.vandewalleh.features.Migration
import be.vandewalleh.mainModule
import be.vandewalleh.services.UserService
import com.zaxxer.hikari.HikariDataSource
import kotlinx.coroutines.runBlocking
import org.amshove.kluent.*
import org.junit.jupiter.api.*
import org.kodein.di.Kodein
import org.kodein.di.generic.bind
import org.kodein.di.generic.instance
import org.kodein.di.generic.singleton
import org.kodein.di.DI
import org.kodein.di.bind
import org.kodein.di.instance
import org.kodein.di.singleton
import utils.KMariadbContainer
import javax.sql.DataSource
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
@@ -21,9 +19,9 @@ class UserServiceTest {
private val mariadb = KMariadbContainer().apply { start() }
private val kodein = Kodein {
private val kodein = DI {
import(mainModule, allowOverride = true)
bind(overrides = true) from singleton { mariadb.datasource() }
bind( overrides = true) from singleton { mariadb.datasource() }
}
private val userService by kodein.instance<UserService>()