DC/dc-project
1
1
Fork 0
Code Issues 25 Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Move files

Browse Source 
Move Application and configurations file to the application package
Move JWT files to the auth.jwt package
Move ApplicationContext to auth package an rename to CitizenContext
This commit is contained in:
Fabrice Lecomte
2021-01-17 22:29:32 +01:00
parent c380ba47a5
commit b028ff05b9
55 changed files with 159 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/test/kotlin/CucumberTest.kt
View File

@@ -1,6 +1,6 @@
import fr.dcproject.Config
import fr.dcproject.Env.CUCUMBER
import fr.dcproject.module
import fr.dcproject.application.Configuration
import fr.dcproject.application.Env.CUCUMBER
import fr.dcproject.application.module
import fr.dcproject.utils.LoggerDelegate
import fr.postgresjson.connexion.Connection
import fr.postgresjson.connexion.Requester
@@ -32,9 +32,9 @@ class CucumberTest : En, KoinTest {
init {
if (!unitialized) {
Config.database = "test"
Config.username = "test"
Config.password = "test"
Configuration.database = "test"
Configuration.username = "test"
Configuration.password = "test"
withTestApplication({ module(CUCUMBER) }) {
migrations()
@@ -43,9 +43,9 @@ class CucumberTest : En, KoinTest {
}
Before(-1) { _: Scenario ->
Config.database = "test"
Config.username = "test"
Config.password = "test"
Configuration.database = "test"
Configuration.username = "test"
Configuration.password = "test"
ktorContext.start()
//language=PostgreSQL
get<Connection>().sendQuery("start transaction;", listOf())
@@ -59,9 +59,9 @@ class CucumberTest : En, KoinTest {
}
private fun migrations() {
Config.database = "test"
Config.username = "test"
Config.password = "test"
Configuration.database = "test"
Configuration.username = "test"
Configuration.password = "test"
val migrations: Migrations = get()
migrations.forceAllDown()
migrations.run()
@@ -85,7 +85,7 @@ class CucumberTest : En, KoinTest {
private fun getFixturesRequester(): Requester {
return Requester.RequesterFactory(
connection = get(),
queriesDirectory = Config.Sql.fixtureFiles
queriesDirectory = Configuration.Sql.fixtureFiles
).createRequester()
}
}

6
src/test/kotlin/functional/MailerTest.kt
View File

@@ -3,9 +3,9 @@ package functional
import com.sendgrid.helpers.mail.Mail
import com.sendgrid.helpers.mail.objects.Content
import com.sendgrid.helpers.mail.objects.Email
import fr.dcproject.Env
import fr.dcproject.application.Env.TEST
import fr.dcproject.application.module
import fr.dcproject.messages.Mailer
import fr.dcproject.module
import io.ktor.locations.*
import io.ktor.server.testing.*
import io.ktor.util.*
@@ -25,7 +25,7 @@ class MailerTest : KoinTest, AutoCloseKoinTest() {
@Test
@Tag("online, functional")
fun `can be send an email`() {
withTestApplication({ module(Env.TEST) }) {
withTestApplication({ module(TEST) }) {
get<Mailer>().sendEmail {
Mail(
Email("sso@dc-project.fr"),

6
src/test/kotlin/functional/ViewTest.kt
View File

@@ -1,10 +1,10 @@
package functional
import fr.dcproject.Env
import fr.dcproject.application.Env.TEST
import fr.dcproject.application.module
import fr.dcproject.component.article.ArticleRefVersioning
import fr.dcproject.component.article.ArticleViewManager
import fr.dcproject.component.citizen.CitizenRef
import fr.dcproject.module
import io.ktor.locations.*
import io.ktor.server.testing.*
import io.ktor.util.*
@@ -26,7 +26,7 @@ class ViewTest {
val article = ArticleRefVersioning(id = UUID.randomUUID(), versionId = UUID.randomUUID())
val citizenRef = CitizenRef()
withTestApplication({ module(Env.TEST) }) {
withTestApplication({ module(TEST) }) {
val viewManager: ArticleViewManager = application.get()
/* Get view before */

2
src/test/kotlin/steps/KtorServerAuthSteps.kt
View File

@@ -1,7 +1,7 @@
package steps
import com.auth0.jwt.JWT
import fr.dcproject.JwtConfig
import fr.dcproject.component.auth.jwt.JwtConfig
import fr.dcproject.component.citizen.CitizenRepository
import io.cucumber.java8.En
import io.ktor.http.*

4
src/test/kotlin/unit/voter/FollowVoterTest.kt
View File

@@ -1,9 +1,9 @@
package unit.voter
import fr.dcproject.citizenOrNull
import fr.dcproject.component.article.ArticleForView
import fr.dcproject.component.auth.User
import fr.dcproject.component.auth.UserI
import fr.dcproject.component.auth.citizenOrNull
import fr.dcproject.component.citizen.Citizen
import fr.dcproject.component.citizen.CitizenBasic
import fr.dcproject.component.citizen.CitizenCart
@@ -105,7 +105,7 @@ internal class FollowVoterTest {
)
init {
mockkStatic("fr.dcproject.ApplicationContextKt")
mockkStatic("fr.dcproject.component.auth.CitizenContextKt")
}
@Test

4
src/test/kotlin/unit/voter/OpinionChoiceVoterTest.kt
View File

@@ -3,12 +3,12 @@ package unit.voter
import fr.dcproject.component.article.ArticleForView
import fr.dcproject.component.auth.User
import fr.dcproject.component.auth.UserI
import fr.dcproject.component.auth.user
import fr.dcproject.component.citizen.CitizenBasic
import fr.dcproject.component.citizen.CitizenCart
import fr.dcproject.component.citizen.CitizenI
import fr.dcproject.entity.OpinionChoice
import fr.dcproject.security.voter.OpinionChoiceVoter
import fr.dcproject.user
import fr.ktorVoter.ActionI
import fr.ktorVoter.Vote
import fr.ktorVoter.can
@@ -64,7 +64,7 @@ internal class OpinionChoiceVoterTest {
)
init {
mockkStatic("fr.dcproject.ApplicationContextKt")
mockkStatic("fr.dcproject.component.auth.CitizenContextKt")
}
@Test

4
src/test/kotlin/unit/voter/OpinionVoterTest.kt
View File

@@ -3,13 +3,13 @@ package unit.voter
import fr.dcproject.component.article.ArticleForView
import fr.dcproject.component.auth.User
import fr.dcproject.component.auth.UserI
import fr.dcproject.component.auth.user
import fr.dcproject.component.citizen.CitizenBasic
import fr.dcproject.component.citizen.CitizenCart
import fr.dcproject.component.citizen.CitizenI
import fr.dcproject.entity.Opinion
import fr.dcproject.entity.OpinionChoice
import fr.dcproject.security.voter.OpinionVoter
import fr.dcproject.user
import fr.dcproject.voter.NoSubjectDefinedException
import fr.ktorVoter.*
import io.ktor.application.*
@@ -79,7 +79,7 @@ internal class OpinionVoterTest {
)
init {
mockkStatic("fr.dcproject.ApplicationContextKt")
mockkStatic("fr.dcproject.component.auth.CitizenContextKt")
}
@Test

4
src/test/kotlin/unit/voter/VoteVoterTest.kt
View File

@@ -1,10 +1,10 @@
package unit.voter
import fr.dcproject.citizenOrNull
import fr.dcproject.component.article.ArticleForView
import fr.dcproject.component.article.ArticleRef
import fr.dcproject.component.auth.User
import fr.dcproject.component.auth.UserI
import fr.dcproject.component.auth.citizenOrNull
import fr.dcproject.component.citizen.Citizen
import fr.dcproject.component.citizen.CitizenBasic
import fr.dcproject.component.citizen.CitizenCart
@@ -116,7 +116,7 @@ internal class VoteVoterTest {
)
init {
mockkStatic("fr.dcproject.ApplicationContextKt")
mockkStatic("fr.dcproject.component.auth.CitizenContextKt")
}
@Test