From 34a731094427aa43df9274bbdec8a77acd0a702a Mon Sep 17 00:00:00 2001 From: Fabrice Lecomte Date: Wed, 10 Feb 2021 17:48:32 +0100 Subject: [PATCH] move Integration step test --- src/test/kotlin/integration/Article routes.kt | 26 +++++++++---------- src/test/kotlin/integration/Citizen routes.kt | 18 ++++++------- src/test/kotlin/integration/Login routes.kt | 12 ++++----- .../kotlin/integration/Register routes.kt | 4 +-- .../{asserts => steps}/given/Article.kt | 2 +- .../{asserts => steps}/given/Auth.kt | 2 +- .../{asserts => steps}/given/Citizen.kt | 2 +- .../{asserts => steps}/given/Workgroup.kt | 3 +-- .../asserts.kt => steps/then/request.kt} | 2 +- .../{asserts => steps}/when/request.kt | 2 +- 10 files changed, 36 insertions(+), 37 deletions(-) rename src/test/kotlin/integration/{asserts => steps}/given/Article.kt (98%) rename src/test/kotlin/integration/{asserts => steps}/given/Auth.kt (96%) rename src/test/kotlin/integration/{asserts => steps}/given/Citizen.kt (97%) rename src/test/kotlin/integration/{asserts => steps}/given/Workgroup.kt (97%) rename src/test/kotlin/integration/{asserts/asserts.kt => steps/then/request.kt} (98%) rename src/test/kotlin/integration/{asserts => steps}/when/request.kt (98%) diff --git a/src/test/kotlin/integration/Article routes.kt b/src/test/kotlin/integration/Article routes.kt index 74307f9..dea9ff8 100644 --- a/src/test/kotlin/integration/Article routes.kt +++ b/src/test/kotlin/integration/Article routes.kt @@ -1,18 +1,18 @@ package integration -import integration.asserts.`And have property` -import integration.asserts.`And the response should not be null` -import integration.asserts.`Then the response should be` -import integration.asserts.`when`.`When I send a GET request` -import integration.asserts.`when`.`When I send a POST request` -import integration.asserts.`whish contains` -import integration.asserts.and -import integration.asserts.given.`Given I have article created by workgroup` -import integration.asserts.given.`Given I have article` -import integration.asserts.given.`Given I have articles` -import integration.asserts.given.`Given I have citizen` -import integration.asserts.given.`Given I have workgroup` -import integration.asserts.given.`authenticated as` +import integration.steps.`And have property` +import integration.steps.`And the response should not be null` +import integration.steps.`Then the response should be` +import integration.steps.`when`.`When I send a GET request` +import integration.steps.`when`.`When I send a POST request` +import integration.steps.`whish contains` +import integration.steps.and +import integration.steps.given.`Given I have article created by workgroup` +import integration.steps.given.`Given I have article` +import integration.steps.given.`Given I have articles` +import integration.steps.given.`Given I have citizen` +import integration.steps.given.`Given I have workgroup` +import integration.steps.given.`authenticated as` import io.ktor.http.HttpStatusCode.Companion.OK import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Tags diff --git a/src/test/kotlin/integration/Citizen routes.kt b/src/test/kotlin/integration/Citizen routes.kt index 557a4f9..73cd5ed 100644 --- a/src/test/kotlin/integration/Citizen routes.kt +++ b/src/test/kotlin/integration/Citizen routes.kt @@ -1,14 +1,14 @@ package integration -import integration.asserts.`And have property` -import integration.asserts.`And the response should not be null` -import integration.asserts.`Then the response should be` -import integration.asserts.`when`.`When I send a GET request` -import integration.asserts.`when`.`When I send a PUT request` -import integration.asserts.`whish contains` -import integration.asserts.and -import integration.asserts.given.`Given I have citizen` -import integration.asserts.given.`authenticated as` +import integration.steps.`And have property` +import integration.steps.`And the response should not be null` +import integration.steps.`Then the response should be` +import integration.steps.`when`.`When I send a GET request` +import integration.steps.`when`.`When I send a PUT request` +import integration.steps.`whish contains` +import integration.steps.and +import integration.steps.given.`Given I have citizen` +import integration.steps.given.`authenticated as` import io.ktor.http.HttpStatusCode.Companion.BadRequest import io.ktor.http.HttpStatusCode.Companion.Created import io.ktor.http.HttpStatusCode.Companion.OK diff --git a/src/test/kotlin/integration/Login routes.kt b/src/test/kotlin/integration/Login routes.kt index 4e3bda0..c36d884 100644 --- a/src/test/kotlin/integration/Login routes.kt +++ b/src/test/kotlin/integration/Login routes.kt @@ -1,11 +1,11 @@ package integration -import integration.asserts.`And the response should not be null` -import integration.asserts.`Then the response should be` -import integration.asserts.`and should contains` -import integration.asserts.`when`.`When I send a POST request` -import integration.asserts.given.`Given I have citizen` -import integration.asserts.given.`authenticated as` +import integration.steps.`And the response should not be null` +import integration.steps.`Then the response should be` +import integration.steps.`and should contains` +import integration.steps.`when`.`When I send a POST request` +import integration.steps.given.`Given I have citizen` +import integration.steps.given.`authenticated as` import io.ktor.http.HttpStatusCode import io.ktor.http.HttpStatusCode.Companion.NoContent import org.junit.jupiter.api.Tag diff --git a/src/test/kotlin/integration/Register routes.kt b/src/test/kotlin/integration/Register routes.kt index 21b92fd..26fbc8b 100644 --- a/src/test/kotlin/integration/Register routes.kt +++ b/src/test/kotlin/integration/Register routes.kt @@ -1,7 +1,7 @@ package integration -import integration.asserts.`Then the response should be` -import integration.asserts.`when`.`When I send a POST request` +import integration.steps.`Then the response should be` +import integration.steps.`when`.`When I send a POST request` import io.ktor.http.HttpStatusCode import org.amshove.kluent.`should be null` import org.amshove.kluent.`should contain` diff --git a/src/test/kotlin/integration/asserts/given/Article.kt b/src/test/kotlin/integration/steps/given/Article.kt similarity index 98% rename from src/test/kotlin/integration/asserts/given/Article.kt rename to src/test/kotlin/integration/steps/given/Article.kt index 4769ab6..974e5d6 100644 --- a/src/test/kotlin/integration/asserts/given/Article.kt +++ b/src/test/kotlin/integration/steps/given/Article.kt @@ -1,4 +1,4 @@ -package integration.asserts.given +package integration.steps.given import fr.dcproject.common.utils.toUUID import fr.dcproject.component.article.ArticleForUpdate diff --git a/src/test/kotlin/integration/asserts/given/Auth.kt b/src/test/kotlin/integration/steps/given/Auth.kt similarity index 96% rename from src/test/kotlin/integration/asserts/given/Auth.kt rename to src/test/kotlin/integration/steps/given/Auth.kt index 1ed99dd..1e4533d 100644 --- a/src/test/kotlin/integration/asserts/given/Auth.kt +++ b/src/test/kotlin/integration/steps/given/Auth.kt @@ -1,4 +1,4 @@ -package integration.asserts.given +package integration.steps.given import com.auth0.jwt.JWT import fr.dcproject.component.auth.jwt.JwtConfig diff --git a/src/test/kotlin/integration/asserts/given/Citizen.kt b/src/test/kotlin/integration/steps/given/Citizen.kt similarity index 97% rename from src/test/kotlin/integration/asserts/given/Citizen.kt rename to src/test/kotlin/integration/steps/given/Citizen.kt index 6ee77f2..9e47405 100644 --- a/src/test/kotlin/integration/asserts/given/Citizen.kt +++ b/src/test/kotlin/integration/steps/given/Citizen.kt @@ -1,4 +1,4 @@ -package integration.asserts.given +package integration.steps.given import fr.dcproject.common.utils.toUUID import fr.dcproject.component.auth.UserForCreate diff --git a/src/test/kotlin/integration/asserts/given/Workgroup.kt b/src/test/kotlin/integration/steps/given/Workgroup.kt similarity index 97% rename from src/test/kotlin/integration/asserts/given/Workgroup.kt rename to src/test/kotlin/integration/steps/given/Workgroup.kt index b5ef95e..758b514 100644 --- a/src/test/kotlin/integration/asserts/given/Workgroup.kt +++ b/src/test/kotlin/integration/steps/given/Workgroup.kt @@ -1,4 +1,4 @@ -package integration.asserts.given +package integration.steps.given import fr.dcproject.common.utils.toUUID import fr.dcproject.component.auth.UserForCreate @@ -13,7 +13,6 @@ import fr.dcproject.component.workgroup.WorkgroupWithMembersI.Member.Role.MASTER import io.ktor.server.testing.TestApplicationEngine import org.joda.time.DateTime import org.koin.core.context.GlobalContext -import org.koin.test.get import java.util.UUID fun TestApplicationEngine.`Given I have workgroup`( diff --git a/src/test/kotlin/integration/asserts/asserts.kt b/src/test/kotlin/integration/steps/then/request.kt similarity index 98% rename from src/test/kotlin/integration/asserts/asserts.kt rename to src/test/kotlin/integration/steps/then/request.kt index c653886..0af2f27 100644 --- a/src/test/kotlin/integration/asserts/asserts.kt +++ b/src/test/kotlin/integration/steps/then/request.kt @@ -1,4 +1,4 @@ -package integration.asserts +package integration.steps import com.jayway.jsonpath.JsonPath import io.ktor.http.HttpStatusCode diff --git a/src/test/kotlin/integration/asserts/when/request.kt b/src/test/kotlin/integration/steps/when/request.kt similarity index 98% rename from src/test/kotlin/integration/asserts/when/request.kt rename to src/test/kotlin/integration/steps/when/request.kt index 511ce59..85b0261 100644 --- a/src/test/kotlin/integration/asserts/when/request.kt +++ b/src/test/kotlin/integration/steps/when/request.kt @@ -1,4 +1,4 @@ -package integration.asserts.`when` +package integration.steps.`when` import io.ktor.http.ContentType import io.ktor.http.HttpHeaders