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

upgrade klint and format code (remove wildcard import

Browse Source
This commit is contained in:
Fabrice Lecomte
2021-01-18 17:23:16 +01:00
parent a79e1ec086
commit 6cdc526335
98 changed files with 595 additions and 360 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/test/kotlin/steps/ArticleSteps.kt
View File

@@ -15,7 +15,7 @@ import io.cucumber.java8.En
import org.joda.time.DateTime
import org.koin.test.KoinTest
import org.koin.test.get
import java.util.*
import java.util.UUID
import fr.dcproject.component.auth.User as UserEntity
class ArticleSteps : En, KoinTest {
@@ -99,4 +99,4 @@ class ArticleSteps : En, KoinTest {
)
get<CommentArticleRepository>().comment(comment)
}
}
}

4
src/test/kotlin/steps/CitizenSteps.kt
View File

@@ -9,7 +9,7 @@ import io.cucumber.java8.En
import org.joda.time.DateTime
import org.koin.test.KoinTest
import org.koin.test.get
import java.util.*
import java.util.UUID
class CitizenSteps : En, KoinTest {
init {
@@ -55,4 +55,4 @@ class CitizenSteps : En, KoinTest {
get<CitizenRepository>().insertWithUser(citizen)
}
}
}

4
src/test/kotlin/steps/ConstitutionSteps.kt
View File

@@ -15,7 +15,7 @@ import io.cucumber.java8.En
import org.joda.time.DateTime
import org.koin.test.KoinTest
import org.koin.test.get
import java.util.*
import java.util.UUID
import fr.dcproject.component.auth.User as UserEntity
import fr.dcproject.repository.Constitution as ConstitutionRepository
@@ -104,4 +104,4 @@ class ConstitutionSteps : En, KoinTest {
)
get<CommentConstitutionRepository>().comment(comment)
}
}
}

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

@@ -26,4 +26,4 @@ class FollowSteps : En, KoinTest {
get<FollowConstitutionRepository>().follow(follow)
}
}
}
}

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

@@ -4,7 +4,7 @@ import com.auth0.jwt.JWT
import fr.dcproject.component.auth.jwt.JwtConfig
import fr.dcproject.component.citizen.CitizenRepository
import io.cucumber.java8.En
import io.ktor.http.*
import io.ktor.http.HttpHeaders
import org.koin.test.KoinTest
import org.koin.test.get
@@ -23,4 +23,4 @@ class KtorServerAuthSteps : En, KoinTest {
}
}
}
}
}

9
src/test/kotlin/steps/KtorServerContext.kt
View File

@@ -1,8 +1,11 @@
package steps
import io.ktor.application.*
import io.ktor.server.engine.*
import io.ktor.server.testing.*
import io.ktor.application.Application
import io.ktor.server.engine.stop
import io.ktor.server.testing.TestApplicationCall
import io.ktor.server.testing.TestApplicationEngine
import io.ktor.server.testing.TestApplicationRequest
import io.ktor.server.testing.createTestEnvironment
import java.util.concurrent.TimeUnit
import kotlin.test.fail

9
src/test/kotlin/steps/KtorServerRequestSteps.kt
View File

@@ -3,9 +3,12 @@ package steps
import com.jayway.jsonpath.JsonPath
import io.cucumber.datatable.DataTable
import io.cucumber.java8.En
import io.ktor.http.*
import io.ktor.server.testing.*
import io.ktor.util.*
import io.ktor.http.ContentType
import io.ktor.http.HttpHeaders
import io.ktor.http.HttpMethod
import io.ktor.http.HttpStatusCode
import io.ktor.server.testing.setBody
import io.ktor.util.KtorExperimentalAPI
import kotlin.test.assertEquals
import kotlin.test.assertNotEquals

7
src/test/kotlin/steps/KtorServerRestSteps.kt
View File

@@ -2,7 +2,12 @@ package steps
import io.cucumber.datatable.DataTable
import io.cucumber.java8.En
import kotlinx.serialization.json.*
import kotlinx.serialization.json.Json
import kotlinx.serialization.json.JsonArray
import kotlinx.serialization.json.JsonElement
import kotlinx.serialization.json.JsonPrimitive
import kotlinx.serialization.json.jsonArray
import kotlinx.serialization.json.jsonObject
import kotlin.test.assertEquals
import kotlin.test.assertTrue
import kotlin.test.fail

4
src/test/kotlin/steps/OpinionSteps.kt
View File

@@ -10,7 +10,7 @@ import io.cucumber.datatable.DataTable
import io.cucumber.java8.En
import org.koin.test.KoinTest
import org.koin.test.get
import java.util.*
import java.util.UUID
import fr.dcproject.repository.OpinionArticle as OpinionRepository
import fr.dcproject.repository.OpinionChoice as OpinionChoiceRepository
@@ -79,4 +79,4 @@ class OpinionSteps : En, KoinTest {
)
get<OpinionRepository>().updateOpinions(opinion)
}
}
}

4
src/test/kotlin/steps/VoteSteps.kt
View File

@@ -7,7 +7,7 @@ import fr.dcproject.utils.toUUID
import io.cucumber.java8.En
import org.koin.test.KoinTest
import org.koin.test.get
import java.util.*
import java.util.UUID
import fr.dcproject.repository.VoteArticle as VoteRepository
class VoteSteps : En, KoinTest {
@@ -30,4 +30,4 @@ class VoteSteps : En, KoinTest {
)
get<VoteRepository>().vote(vote)
}
}
}

18
src/test/kotlin/steps/WorkgroupSteps.kt
View File

@@ -1,12 +1,12 @@
package steps
import fr.dcproject.component.workgroup.Workgroup
import fr.dcproject.component.workgroup.WorkgroupRef
import fr.dcproject.component.auth.User
import fr.dcproject.component.citizen.Citizen
import fr.dcproject.component.citizen.CitizenI
import fr.dcproject.component.citizen.CitizenRef
import fr.dcproject.component.citizen.CitizenRepository
import fr.dcproject.component.workgroup.Workgroup
import fr.dcproject.component.workgroup.WorkgroupRef
import fr.dcproject.component.workgroup.WorkgroupRepository
import fr.dcproject.component.workgroup.WorkgroupWithMembersI.Member
import fr.dcproject.utils.toUUID
@@ -16,16 +16,18 @@ import org.joda.time.DateTime
import org.junit.Assert
import org.koin.test.KoinTest
import org.koin.test.get
import java.util.*
import java.util.UUID
class WorkgroupSteps : En, KoinTest {
init {
When("I have members in workgroup {string}:") { workgroupId: String, members: DataTable ->
val membersRefs = members.asList()
.map { Member(
citizen = CitizenRef(it.toUUID()),
roles = listOf(Member.Role.MASTER)
) }
.map {
Member(
citizen = CitizenRef(it.toUUID()),
roles = listOf(Member.Role.MASTER)
)
}
get<WorkgroupRepository>().addMembers(WorkgroupRef(workgroupId.toUUID()), membersRefs)
}
@@ -71,4 +73,4 @@ class WorkgroupSteps : En, KoinTest {
Assert.assertNull(get<WorkgroupRepository>().findById(id.toUUID()))
}
}
}
}