From f225f7345cd49b094ee634248ea2b3fe365275c6 Mon Sep 17 00:00:00 2001 From: Fabrice Lecomte Date: Tue, 17 Mar 2020 01:34:30 +0100 Subject: [PATCH] Lint --- src/test/kotlin/feature/CitizenSteps.kt | 8 ++++---- src/test/kotlin/feature/ConstitutionSteps.kt | 20 +++++++++++++------ .../security/voter/ArticleVoterTest.kt | 1 - 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/src/test/kotlin/feature/CitizenSteps.kt b/src/test/kotlin/feature/CitizenSteps.kt index 727d1aa..fb6408b 100644 --- a/src/test/kotlin/feature/CitizenSteps.kt +++ b/src/test/kotlin/feature/CitizenSteps.kt @@ -16,8 +16,8 @@ class CitizenSteps : En, KoinTest { Given("I have citizen") { extraData: DataTable? -> val params = extraData?.asMap(String::class.java, String::class.java) createCitizen( - params?.get("firstName") ?: "firstName"+UUID.randomUUID(), - params?.get("lastName") ?: "lastName"+UUID.randomUUID(), + params?.get("firstName") ?: "firstName" + UUID.randomUUID(), + params?.get("lastName") ?: "lastName" + UUID.randomUUID(), extraData ) } @@ -31,11 +31,11 @@ class CitizenSteps : En, KoinTest { } } - private fun createCitizen (firstName: String, lastName: String, extraData: DataTable? = null, id: UUID? = null) { + private fun createCitizen(firstName: String, lastName: String, extraData: DataTable? = null, id: UUID? = null) { val params = extraData?.asMap(String::class.java, String::class.java) val id: UUID = id ?: params?.get("id")?.let { UUID.fromString(it) } ?: UUID.randomUUID() - val email = params?.get("email") ?: ("$firstName-$lastName".toLowerCase()) + "@dc-project.fr" + val email = params?.get("email") ?: ("$firstName-$lastName".toLowerCase()) + "@dc-project.fr" val user = User( id = id, diff --git a/src/test/kotlin/feature/ConstitutionSteps.kt b/src/test/kotlin/feature/ConstitutionSteps.kt index d547170..eff66c4 100644 --- a/src/test/kotlin/feature/ConstitutionSteps.kt +++ b/src/test/kotlin/feature/ConstitutionSteps.kt @@ -41,14 +41,14 @@ class ConstitutionSteps : En, KoinTest { private fun createConstitution(extraData: DataTable? = null, id: UUID? = null) { val params = extraData?.asMap(String::class.java, String::class.java) val createdByUsername = params?.get("createdBy") - val username = (createdByUsername ?: "username"+UUID.randomUUID().toString()) + val username = (createdByUsername ?: "username" + UUID.randomUUID().toString()) .toLowerCase().replace(' ', '-') val createdBy = if (createdByUsername != null) { get().findByUsername(username) ?: error("Citizen not exist") } else { - val first = "firstName"+UUID.randomUUID().toString() - val last = "lastName"+UUID.randomUUID().toString() + val first = "firstName" + UUID.randomUUID().toString() + val last = "lastName" + UUID.randomUUID().toString() Citizen( birthday = DateTime.now(), name = CitizenI.Name( @@ -76,12 +76,20 @@ class ConstitutionSteps : En, KoinTest { get().upsert(constitution) } - private fun commentConstitution(constitutionId: String, firstName: String, lastName: String, extraData: DataTable? = null) { + private fun commentConstitution( + constitutionId: String, + firstName: String, + lastName: String, + extraData: DataTable? = null + ) { val params = extraData?.asMap(String::class.java, String::class.java) - val constitution = get().findById(UUID.fromString(constitutionId)) ?: error("Constitution not exist") + val constitution = + get().findById(UUID.fromString(constitutionId)) ?: error("Constitution not exist") - val citizen = get().findByUsername(("$firstName-$lastName".toLowerCase()).toLowerCase().replace(' ', '-')) ?: error("Citizen not exist") + val citizen = get().findByUsername( + ("$firstName-$lastName".toLowerCase()).toLowerCase().replace(' ', '-') + ) ?: error("Citizen not exist") val comment: CommentEntity = CommentEntity( id = params?.get("id")?.let { UUID.fromString(it) } ?: UUID.randomUUID(), diff --git a/src/test/kotlin/fr/dcproject/security/voter/ArticleVoterTest.kt b/src/test/kotlin/fr/dcproject/security/voter/ArticleVoterTest.kt index 6e8430f..290e0ec 100644 --- a/src/test/kotlin/fr/dcproject/security/voter/ArticleVoterTest.kt +++ b/src/test/kotlin/fr/dcproject/security/voter/ArticleVoterTest.kt @@ -50,7 +50,6 @@ internal class ArticleVoterTest { @Test fun `other user can be view the article`() = ArticleVoter().run { val article = getArticle(tesla) - val article2 = getArticle(tesla) mockk { every { user } returns einstein.user