From 8f4ee5f16b69fec4100ee9e38087f6c595553607 Mon Sep 17 00:00:00 2001 From: Michael Hoennig Date: Thu, 28 Nov 2024 07:35:05 +0100 Subject: [PATCH] extract generic ScenarioTest-code to separate directory --- .../hs/office/scenarios/HsOfficeScenarioTests.java | 3 +++ .../scenarios/contact/AddPhoneNumberToContactData.java | 4 ++-- .../hs/office/scenarios/contact/AmendContactData.java | 4 ++-- .../contact/RemovePhoneNumberFromContactData.java | 4 ++-- .../hs/office/scenarios/contact/ReplaceContactData.java | 4 ++-- .../debitor/CreateExternalDebitorForPartner.java | 4 ++-- .../scenarios/debitor/CreateSelfDebitorForPartner.java | 4 ++-- .../scenarios/debitor/CreateSepaMandateForDebitor.java | 4 ++-- .../hs/office/scenarios/debitor/DeleteDebitor.java | 4 ++-- .../scenarios/debitor/DontDeleteDefaultDebitor.java | 4 ++-- .../debitor/FinallyDeleteSepaMandateForDebitor.java | 4 ++-- .../debitor/InvalidateSepaMandateForDebitor.java | 4 ++-- .../hs/office/scenarios/membership/CancelMembership.java | 4 ++-- .../hs/office/scenarios/membership/CreateMembership.java | 4 ++-- .../coopassets/CreateCoopAssetsDepositTransaction.java | 2 +- .../coopassets/CreateCoopAssetsDisbursalTransaction.java | 2 +- .../CreateCoopAssetsRevertSimpleTransaction.java | 2 +- .../CreateCoopAssetsRevertTransferTransaction.java | 6 +++--- .../coopassets/CreateCoopAssetsTransaction.java | 4 ++-- .../coopassets/CreateCoopAssetsTransferTransaction.java | 4 ++-- .../CreateCoopSharesCancellationTransaction.java | 2 +- .../coopshares/CreateCoopSharesRevertTransaction.java | 2 +- .../CreateCoopSharesSubscriptionTransaction.java | 2 +- .../coopshares/CreateCoopSharesTransaction.java | 4 ++-- .../scenarios/partner/AddOperationsContactToPartner.java | 4 ++-- .../scenarios/partner/AddRepresentativeToPartner.java | 4 ++-- .../hs/office/scenarios/partner/CreatePartner.java | 4 ++-- .../hs/office/scenarios/partner/DeletePartner.java | 4 ++-- .../hs/office/scenarios/person/CreatePerson.java | 4 ++-- .../office/scenarios/person/ShouldUpdatePersonData.java | 4 ++-- .../subscription/RemoveOperationsContactFromPartner.java | 4 ++-- .../scenarios/subscription/SubscribeToMailinglist.java | 4 ++-- .../subscription/UnsubscribeFromMailinglist.java | 4 ++-- .../{hs/office => test}/scenarios/JsonOptional.java | 2 +- .../{hs/office => test}/scenarios/PathAssertion.java | 6 +++--- .../hsadminng/{hs/office => test}/scenarios/Produces.java | 2 +- .../hsadminng/{hs/office => test}/scenarios/README.md | 0 .../hsadminng/{hs/office => test}/scenarios/Requires.java | 2 +- .../{hs/office => test}/scenarios/ScenarioTest.java | 8 ++++---- .../{hs/office => test}/scenarios/TemplateResolver.java | 4 ++-- .../scenarios/TemplateResolverUnitTest.java | 4 ++-- .../{hs/office => test}/scenarios/TestReport.java | 2 +- .../hsadminng/{hs/office => test}/scenarios/UseCase.java | 8 ++++---- .../scenarios/UseCaseNotImplementedYet.java | 2 +- 44 files changed, 82 insertions(+), 79 deletions(-) rename src/test/java/net/hostsharing/hsadminng/{hs/office => test}/scenarios/JsonOptional.java (95%) rename src/test/java/net/hostsharing/hsadminng/{hs/office => test}/scenarios/PathAssertion.java (84%) rename src/test/java/net/hostsharing/hsadminng/{hs/office => test}/scenarios/Produces.java (90%) rename src/test/java/net/hostsharing/hsadminng/{hs/office => test}/scenarios/README.md (100%) rename src/test/java/net/hostsharing/hsadminng/{hs/office => test}/scenarios/Requires.java (83%) rename src/test/java/net/hostsharing/hsadminng/{hs/office => test}/scenarios/ScenarioTest.java (95%) rename src/test/java/net/hostsharing/hsadminng/{hs/office => test}/scenarios/TemplateResolver.java (98%) rename src/test/java/net/hostsharing/hsadminng/{hs/office => test}/scenarios/TemplateResolverUnitTest.java (92%) rename src/test/java/net/hostsharing/hsadminng/{hs/office => test}/scenarios/TestReport.java (99%) rename src/test/java/net/hostsharing/hsadminng/{hs/office => test}/scenarios/UseCase.java (98%) rename src/test/java/net/hostsharing/hsadminng/{hs/office => test}/scenarios/UseCaseNotImplementedYet.java (87%) diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/HsOfficeScenarioTests.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/HsOfficeScenarioTests.java index eecd0a4f..90220a20 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/HsOfficeScenarioTests.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/HsOfficeScenarioTests.java @@ -30,6 +30,9 @@ import net.hostsharing.hsadminng.hs.office.scenarios.person.ShouldUpdatePersonDa import net.hostsharing.hsadminng.hs.office.scenarios.subscription.RemoveOperationsContactFromPartner; import net.hostsharing.hsadminng.hs.office.scenarios.subscription.SubscribeToMailinglist; import net.hostsharing.hsadminng.hs.office.scenarios.subscription.UnsubscribeFromMailinglist; +import net.hostsharing.hsadminng.test.scenarios.Produces; +import net.hostsharing.hsadminng.test.scenarios.Requires; +import net.hostsharing.hsadminng.test.scenarios.ScenarioTest; import net.hostsharing.hsadminng.rbac.test.JpaAttempt; import net.hostsharing.hsadminng.test.IgnoreOnFailureExtension; import org.junit.jupiter.api.Disabled; diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/contact/AddPhoneNumberToContactData.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/contact/AddPhoneNumberToContactData.java index 5f8d266d..55530031 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/contact/AddPhoneNumberToContactData.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/contact/AddPhoneNumberToContactData.java @@ -1,7 +1,7 @@ package net.hostsharing.hsadminng.hs.office.scenarios.contact; -import net.hostsharing.hsadminng.hs.office.scenarios.ScenarioTest; -import net.hostsharing.hsadminng.hs.office.scenarios.UseCase; +import net.hostsharing.hsadminng.test.scenarios.ScenarioTest; +import net.hostsharing.hsadminng.test.scenarios.UseCase; import org.springframework.http.HttpStatus; diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/contact/AmendContactData.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/contact/AmendContactData.java index 0c0e3021..96b075e8 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/contact/AmendContactData.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/contact/AmendContactData.java @@ -1,7 +1,7 @@ package net.hostsharing.hsadminng.hs.office.scenarios.contact; -import net.hostsharing.hsadminng.hs.office.scenarios.ScenarioTest; -import net.hostsharing.hsadminng.hs.office.scenarios.UseCase; +import net.hostsharing.hsadminng.test.scenarios.ScenarioTest; +import net.hostsharing.hsadminng.test.scenarios.UseCase; import org.springframework.http.HttpStatus; import static io.restassured.http.ContentType.JSON; diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/contact/RemovePhoneNumberFromContactData.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/contact/RemovePhoneNumberFromContactData.java index 715e1832..10e54445 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/contact/RemovePhoneNumberFromContactData.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/contact/RemovePhoneNumberFromContactData.java @@ -1,7 +1,7 @@ package net.hostsharing.hsadminng.hs.office.scenarios.contact; -import net.hostsharing.hsadminng.hs.office.scenarios.ScenarioTest; -import net.hostsharing.hsadminng.hs.office.scenarios.UseCase; +import net.hostsharing.hsadminng.test.scenarios.ScenarioTest; +import net.hostsharing.hsadminng.test.scenarios.UseCase; import org.springframework.http.HttpStatus; import static io.restassured.http.ContentType.JSON; diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/contact/ReplaceContactData.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/contact/ReplaceContactData.java index 2638a4e5..7309d095 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/contact/ReplaceContactData.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/contact/ReplaceContactData.java @@ -1,7 +1,7 @@ package net.hostsharing.hsadminng.hs.office.scenarios.contact; -import net.hostsharing.hsadminng.hs.office.scenarios.ScenarioTest; -import net.hostsharing.hsadminng.hs.office.scenarios.UseCase; +import net.hostsharing.hsadminng.test.scenarios.ScenarioTest; +import net.hostsharing.hsadminng.test.scenarios.UseCase; import static io.restassured.http.ContentType.JSON; import static org.springframework.http.HttpStatus.CREATED; diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/CreateExternalDebitorForPartner.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/CreateExternalDebitorForPartner.java index cf525c30..2e160573 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/CreateExternalDebitorForPartner.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/CreateExternalDebitorForPartner.java @@ -1,7 +1,7 @@ package net.hostsharing.hsadminng.hs.office.scenarios.debitor; -import net.hostsharing.hsadminng.hs.office.scenarios.UseCase; -import net.hostsharing.hsadminng.hs.office.scenarios.ScenarioTest; +import net.hostsharing.hsadminng.test.scenarios.UseCase; +import net.hostsharing.hsadminng.test.scenarios.ScenarioTest; import net.hostsharing.hsadminng.hs.office.scenarios.person.CreatePerson; import static io.restassured.http.ContentType.JSON; diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/CreateSelfDebitorForPartner.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/CreateSelfDebitorForPartner.java index 41b40ee6..763eefb3 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/CreateSelfDebitorForPartner.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/CreateSelfDebitorForPartner.java @@ -1,7 +1,7 @@ package net.hostsharing.hsadminng.hs.office.scenarios.debitor; -import net.hostsharing.hsadminng.hs.office.scenarios.UseCase; -import net.hostsharing.hsadminng.hs.office.scenarios.ScenarioTest; +import net.hostsharing.hsadminng.test.scenarios.UseCase; +import net.hostsharing.hsadminng.test.scenarios.ScenarioTest; import static io.restassured.http.ContentType.JSON; import static org.springframework.http.HttpStatus.CREATED; diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/CreateSepaMandateForDebitor.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/CreateSepaMandateForDebitor.java index 549848f1..0651665b 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/CreateSepaMandateForDebitor.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/CreateSepaMandateForDebitor.java @@ -1,7 +1,7 @@ package net.hostsharing.hsadminng.hs.office.scenarios.debitor; -import net.hostsharing.hsadminng.hs.office.scenarios.UseCase; -import net.hostsharing.hsadminng.hs.office.scenarios.ScenarioTest; +import net.hostsharing.hsadminng.test.scenarios.UseCase; +import net.hostsharing.hsadminng.test.scenarios.ScenarioTest; import static io.restassured.http.ContentType.JSON; import static org.springframework.http.HttpStatus.CREATED; diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/DeleteDebitor.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/DeleteDebitor.java index 84e9cd30..8b87086a 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/DeleteDebitor.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/DeleteDebitor.java @@ -1,7 +1,7 @@ package net.hostsharing.hsadminng.hs.office.scenarios.debitor; -import net.hostsharing.hsadminng.hs.office.scenarios.UseCase; -import net.hostsharing.hsadminng.hs.office.scenarios.ScenarioTest; +import net.hostsharing.hsadminng.test.scenarios.UseCase; +import net.hostsharing.hsadminng.test.scenarios.ScenarioTest; import org.springframework.http.HttpStatus; public class DeleteDebitor extends UseCase { diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/DontDeleteDefaultDebitor.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/DontDeleteDefaultDebitor.java index e5459c88..4a72837e 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/DontDeleteDefaultDebitor.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/DontDeleteDefaultDebitor.java @@ -1,7 +1,7 @@ package net.hostsharing.hsadminng.hs.office.scenarios.debitor; -import net.hostsharing.hsadminng.hs.office.scenarios.ScenarioTest; -import net.hostsharing.hsadminng.hs.office.scenarios.UseCase; +import net.hostsharing.hsadminng.test.scenarios.ScenarioTest; +import net.hostsharing.hsadminng.test.scenarios.UseCase; import org.springframework.http.HttpStatus; public class DontDeleteDefaultDebitor extends UseCase { diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/FinallyDeleteSepaMandateForDebitor.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/FinallyDeleteSepaMandateForDebitor.java index 224a98f3..82d90ed3 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/FinallyDeleteSepaMandateForDebitor.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/FinallyDeleteSepaMandateForDebitor.java @@ -1,7 +1,7 @@ package net.hostsharing.hsadminng.hs.office.scenarios.debitor; -import net.hostsharing.hsadminng.hs.office.scenarios.UseCase; -import net.hostsharing.hsadminng.hs.office.scenarios.ScenarioTest; +import net.hostsharing.hsadminng.test.scenarios.UseCase; +import net.hostsharing.hsadminng.test.scenarios.ScenarioTest; import org.springframework.http.HttpStatus; import static io.restassured.http.ContentType.JSON; diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/InvalidateSepaMandateForDebitor.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/InvalidateSepaMandateForDebitor.java index 3af160c7..55241a09 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/InvalidateSepaMandateForDebitor.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/InvalidateSepaMandateForDebitor.java @@ -1,7 +1,7 @@ package net.hostsharing.hsadminng.hs.office.scenarios.debitor; -import net.hostsharing.hsadminng.hs.office.scenarios.UseCase; -import net.hostsharing.hsadminng.hs.office.scenarios.ScenarioTest; +import net.hostsharing.hsadminng.test.scenarios.UseCase; +import net.hostsharing.hsadminng.test.scenarios.ScenarioTest; import static io.restassured.http.ContentType.JSON; import static org.springframework.http.HttpStatus.OK; diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/CancelMembership.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/CancelMembership.java index 23f718b5..a93106eb 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/CancelMembership.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/CancelMembership.java @@ -1,8 +1,8 @@ package net.hostsharing.hsadminng.hs.office.scenarios.membership; import io.restassured.http.ContentType; -import net.hostsharing.hsadminng.hs.office.scenarios.ScenarioTest; -import net.hostsharing.hsadminng.hs.office.scenarios.UseCase; +import net.hostsharing.hsadminng.test.scenarios.ScenarioTest; +import net.hostsharing.hsadminng.test.scenarios.UseCase; import org.springframework.http.HttpStatus; import static io.restassured.http.ContentType.JSON; diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/CreateMembership.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/CreateMembership.java index 890dfedf..40ab5dc7 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/CreateMembership.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/CreateMembership.java @@ -1,8 +1,8 @@ package net.hostsharing.hsadminng.hs.office.scenarios.membership; import io.restassured.http.ContentType; -import net.hostsharing.hsadminng.hs.office.scenarios.ScenarioTest; -import net.hostsharing.hsadminng.hs.office.scenarios.UseCase; +import net.hostsharing.hsadminng.test.scenarios.ScenarioTest; +import net.hostsharing.hsadminng.test.scenarios.UseCase; import org.springframework.http.HttpStatus; import static io.restassured.http.ContentType.JSON; diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopassets/CreateCoopAssetsDepositTransaction.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopassets/CreateCoopAssetsDepositTransaction.java index af9b01a1..aab9b9c8 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopassets/CreateCoopAssetsDepositTransaction.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopassets/CreateCoopAssetsDepositTransaction.java @@ -1,6 +1,6 @@ package net.hostsharing.hsadminng.hs.office.scenarios.membership.coopassets; -import net.hostsharing.hsadminng.hs.office.scenarios.ScenarioTest; +import net.hostsharing.hsadminng.test.scenarios.ScenarioTest; public class CreateCoopAssetsDepositTransaction extends CreateCoopAssetsTransaction { diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopassets/CreateCoopAssetsDisbursalTransaction.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopassets/CreateCoopAssetsDisbursalTransaction.java index 542f75d8..627b582b 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopassets/CreateCoopAssetsDisbursalTransaction.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopassets/CreateCoopAssetsDisbursalTransaction.java @@ -1,6 +1,6 @@ package net.hostsharing.hsadminng.hs.office.scenarios.membership.coopassets; -import net.hostsharing.hsadminng.hs.office.scenarios.ScenarioTest; +import net.hostsharing.hsadminng.test.scenarios.ScenarioTest; public class CreateCoopAssetsDisbursalTransaction extends CreateCoopAssetsTransaction { diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopassets/CreateCoopAssetsRevertSimpleTransaction.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopassets/CreateCoopAssetsRevertSimpleTransaction.java index 0ba384a1..c5f2177f 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopassets/CreateCoopAssetsRevertSimpleTransaction.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopassets/CreateCoopAssetsRevertSimpleTransaction.java @@ -1,6 +1,6 @@ package net.hostsharing.hsadminng.hs.office.scenarios.membership.coopassets; -import net.hostsharing.hsadminng.hs.office.scenarios.ScenarioTest; +import net.hostsharing.hsadminng.test.scenarios.ScenarioTest; public class CreateCoopAssetsRevertSimpleTransaction extends CreateCoopAssetsTransaction { diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopassets/CreateCoopAssetsRevertTransferTransaction.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopassets/CreateCoopAssetsRevertTransferTransaction.java index 56ca670c..86c3b701 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopassets/CreateCoopAssetsRevertTransferTransaction.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopassets/CreateCoopAssetsRevertTransferTransaction.java @@ -1,13 +1,13 @@ package net.hostsharing.hsadminng.hs.office.scenarios.membership.coopassets; import io.restassured.http.ContentType; -import net.hostsharing.hsadminng.hs.office.scenarios.ScenarioTest; -import net.hostsharing.hsadminng.hs.office.scenarios.UseCase; +import net.hostsharing.hsadminng.test.scenarios.ScenarioTest; +import net.hostsharing.hsadminng.test.scenarios.UseCase; import org.springframework.http.HttpStatus; import java.math.BigDecimal; -import static net.hostsharing.hsadminng.hs.office.scenarios.ScenarioTest.resolveTyped; +import static net.hostsharing.hsadminng.test.scenarios.ScenarioTest.resolveTyped; public class CreateCoopAssetsRevertTransferTransaction extends CreateCoopAssetsTransaction { diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopassets/CreateCoopAssetsTransaction.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopassets/CreateCoopAssetsTransaction.java index fbe4b8d5..8eecdabf 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopassets/CreateCoopAssetsTransaction.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopassets/CreateCoopAssetsTransaction.java @@ -1,8 +1,8 @@ package net.hostsharing.hsadminng.hs.office.scenarios.membership.coopassets; import io.restassured.http.ContentType; -import net.hostsharing.hsadminng.hs.office.scenarios.ScenarioTest; -import net.hostsharing.hsadminng.hs.office.scenarios.UseCase; +import net.hostsharing.hsadminng.test.scenarios.ScenarioTest; +import net.hostsharing.hsadminng.test.scenarios.UseCase; import org.springframework.http.HttpStatus; import static io.restassured.http.ContentType.JSON; diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopassets/CreateCoopAssetsTransferTransaction.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopassets/CreateCoopAssetsTransferTransaction.java index 9cfe871f..faf3779d 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopassets/CreateCoopAssetsTransferTransaction.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopassets/CreateCoopAssetsTransferTransaction.java @@ -1,10 +1,10 @@ package net.hostsharing.hsadminng.hs.office.scenarios.membership.coopassets; -import net.hostsharing.hsadminng.hs.office.scenarios.ScenarioTest; +import net.hostsharing.hsadminng.test.scenarios.ScenarioTest; import net.hostsharing.hsadminng.hs.office.scenarios.membership.CreateMembership; import net.hostsharing.hsadminng.hs.office.scenarios.partner.CreatePartner; -import static net.hostsharing.hsadminng.hs.office.scenarios.TemplateResolver.Resolver.DROP_COMMENTS; +import static net.hostsharing.hsadminng.test.scenarios.TemplateResolver.Resolver.DROP_COMMENTS; public class CreateCoopAssetsTransferTransaction extends CreateCoopAssetsTransaction { diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopshares/CreateCoopSharesCancellationTransaction.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopshares/CreateCoopSharesCancellationTransaction.java index 16549b36..fb88c3ac 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopshares/CreateCoopSharesCancellationTransaction.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopshares/CreateCoopSharesCancellationTransaction.java @@ -1,6 +1,6 @@ package net.hostsharing.hsadminng.hs.office.scenarios.membership.coopshares; -import net.hostsharing.hsadminng.hs.office.scenarios.ScenarioTest; +import net.hostsharing.hsadminng.test.scenarios.ScenarioTest; public class CreateCoopSharesCancellationTransaction extends CreateCoopSharesTransaction { diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopshares/CreateCoopSharesRevertTransaction.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopshares/CreateCoopSharesRevertTransaction.java index 8464393a..18c0654e 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopshares/CreateCoopSharesRevertTransaction.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopshares/CreateCoopSharesRevertTransaction.java @@ -1,6 +1,6 @@ package net.hostsharing.hsadminng.hs.office.scenarios.membership.coopshares; -import net.hostsharing.hsadminng.hs.office.scenarios.ScenarioTest; +import net.hostsharing.hsadminng.test.scenarios.ScenarioTest; public class CreateCoopSharesRevertTransaction extends CreateCoopSharesTransaction { diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopshares/CreateCoopSharesSubscriptionTransaction.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopshares/CreateCoopSharesSubscriptionTransaction.java index 84db07dd..395d5d26 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopshares/CreateCoopSharesSubscriptionTransaction.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopshares/CreateCoopSharesSubscriptionTransaction.java @@ -1,6 +1,6 @@ package net.hostsharing.hsadminng.hs.office.scenarios.membership.coopshares; -import net.hostsharing.hsadminng.hs.office.scenarios.ScenarioTest; +import net.hostsharing.hsadminng.test.scenarios.ScenarioTest; public class CreateCoopSharesSubscriptionTransaction extends CreateCoopSharesTransaction { diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopshares/CreateCoopSharesTransaction.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopshares/CreateCoopSharesTransaction.java index cd8d9c14..5e82b3aa 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopshares/CreateCoopSharesTransaction.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopshares/CreateCoopSharesTransaction.java @@ -1,8 +1,8 @@ package net.hostsharing.hsadminng.hs.office.scenarios.membership.coopshares; import io.restassured.http.ContentType; -import net.hostsharing.hsadminng.hs.office.scenarios.UseCase; -import net.hostsharing.hsadminng.hs.office.scenarios.ScenarioTest; +import net.hostsharing.hsadminng.test.scenarios.UseCase; +import net.hostsharing.hsadminng.test.scenarios.ScenarioTest; import org.springframework.http.HttpStatus; import static io.restassured.http.ContentType.JSON; diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/partner/AddOperationsContactToPartner.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/partner/AddOperationsContactToPartner.java index f862c782..fe703e34 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/partner/AddOperationsContactToPartner.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/partner/AddOperationsContactToPartner.java @@ -1,8 +1,8 @@ package net.hostsharing.hsadminng.hs.office.scenarios.partner; import io.restassured.http.ContentType; -import net.hostsharing.hsadminng.hs.office.scenarios.ScenarioTest; -import net.hostsharing.hsadminng.hs.office.scenarios.UseCase; +import net.hostsharing.hsadminng.test.scenarios.ScenarioTest; +import net.hostsharing.hsadminng.test.scenarios.UseCase; import org.springframework.http.HttpStatus; import static io.restassured.http.ContentType.JSON; diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/partner/AddRepresentativeToPartner.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/partner/AddRepresentativeToPartner.java index 0e4a28c5..d5ffa22f 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/partner/AddRepresentativeToPartner.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/partner/AddRepresentativeToPartner.java @@ -1,8 +1,8 @@ package net.hostsharing.hsadminng.hs.office.scenarios.partner; import io.restassured.http.ContentType; -import net.hostsharing.hsadminng.hs.office.scenarios.ScenarioTest; -import net.hostsharing.hsadminng.hs.office.scenarios.UseCase; +import net.hostsharing.hsadminng.test.scenarios.ScenarioTest; +import net.hostsharing.hsadminng.test.scenarios.UseCase; import org.springframework.http.HttpStatus; import static io.restassured.http.ContentType.JSON; diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/partner/CreatePartner.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/partner/CreatePartner.java index 3896bbf6..e587ac3c 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/partner/CreatePartner.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/partner/CreatePartner.java @@ -1,8 +1,8 @@ package net.hostsharing.hsadminng.hs.office.scenarios.partner; import io.restassured.http.ContentType; -import net.hostsharing.hsadminng.hs.office.scenarios.UseCase; -import net.hostsharing.hsadminng.hs.office.scenarios.ScenarioTest; +import net.hostsharing.hsadminng.test.scenarios.UseCase; +import net.hostsharing.hsadminng.test.scenarios.ScenarioTest; import org.springframework.http.HttpStatus; import static io.restassured.http.ContentType.JSON; diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/partner/DeletePartner.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/partner/DeletePartner.java index 4453d959..8d02d2a0 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/partner/DeletePartner.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/partner/DeletePartner.java @@ -1,7 +1,7 @@ package net.hostsharing.hsadminng.hs.office.scenarios.partner; -import net.hostsharing.hsadminng.hs.office.scenarios.UseCase; -import net.hostsharing.hsadminng.hs.office.scenarios.ScenarioTest; +import net.hostsharing.hsadminng.test.scenarios.UseCase; +import net.hostsharing.hsadminng.test.scenarios.ScenarioTest; import org.springframework.http.HttpStatus; public class DeletePartner extends UseCase { diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/person/CreatePerson.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/person/CreatePerson.java index 4a43503c..5a4bf987 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/person/CreatePerson.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/person/CreatePerson.java @@ -1,8 +1,8 @@ package net.hostsharing.hsadminng.hs.office.scenarios.person; import io.restassured.http.ContentType; -import net.hostsharing.hsadminng.hs.office.scenarios.UseCase; -import net.hostsharing.hsadminng.hs.office.scenarios.ScenarioTest; +import net.hostsharing.hsadminng.test.scenarios.UseCase; +import net.hostsharing.hsadminng.test.scenarios.ScenarioTest; import org.springframework.http.HttpStatus; public class CreatePerson extends UseCase { diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/person/ShouldUpdatePersonData.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/person/ShouldUpdatePersonData.java index 04a61c5f..f1472005 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/person/ShouldUpdatePersonData.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/person/ShouldUpdatePersonData.java @@ -1,7 +1,7 @@ package net.hostsharing.hsadminng.hs.office.scenarios.person; -import net.hostsharing.hsadminng.hs.office.scenarios.ScenarioTest; -import net.hostsharing.hsadminng.hs.office.scenarios.UseCase; +import net.hostsharing.hsadminng.test.scenarios.ScenarioTest; +import net.hostsharing.hsadminng.test.scenarios.UseCase; import org.springframework.http.HttpStatus; import static io.restassured.http.ContentType.JSON; diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/subscription/RemoveOperationsContactFromPartner.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/subscription/RemoveOperationsContactFromPartner.java index 2190e6d9..42b9f45f 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/subscription/RemoveOperationsContactFromPartner.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/subscription/RemoveOperationsContactFromPartner.java @@ -1,7 +1,7 @@ package net.hostsharing.hsadminng.hs.office.scenarios.subscription; -import net.hostsharing.hsadminng.hs.office.scenarios.ScenarioTest; -import net.hostsharing.hsadminng.hs.office.scenarios.UseCase; +import net.hostsharing.hsadminng.test.scenarios.ScenarioTest; +import net.hostsharing.hsadminng.test.scenarios.UseCase; import static io.restassured.http.ContentType.JSON; import static org.springframework.http.HttpStatus.NOT_FOUND; diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/subscription/SubscribeToMailinglist.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/subscription/SubscribeToMailinglist.java index 7cca9ba4..7b5acaf4 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/subscription/SubscribeToMailinglist.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/subscription/SubscribeToMailinglist.java @@ -1,8 +1,8 @@ package net.hostsharing.hsadminng.hs.office.scenarios.subscription; import io.restassured.http.ContentType; -import net.hostsharing.hsadminng.hs.office.scenarios.UseCase; -import net.hostsharing.hsadminng.hs.office.scenarios.ScenarioTest; +import net.hostsharing.hsadminng.test.scenarios.UseCase; +import net.hostsharing.hsadminng.test.scenarios.ScenarioTest; import org.springframework.http.HttpStatus; import static io.restassured.http.ContentType.JSON; diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/subscription/UnsubscribeFromMailinglist.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/subscription/UnsubscribeFromMailinglist.java index dfb17ea1..99c63ca9 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/subscription/UnsubscribeFromMailinglist.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/subscription/UnsubscribeFromMailinglist.java @@ -1,7 +1,7 @@ package net.hostsharing.hsadminng.hs.office.scenarios.subscription; -import net.hostsharing.hsadminng.hs.office.scenarios.UseCase; -import net.hostsharing.hsadminng.hs.office.scenarios.ScenarioTest; +import net.hostsharing.hsadminng.test.scenarios.UseCase; +import net.hostsharing.hsadminng.test.scenarios.ScenarioTest; import static io.restassured.http.ContentType.JSON; import static org.springframework.http.HttpStatus.NO_CONTENT; diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/JsonOptional.java b/src/test/java/net/hostsharing/hsadminng/test/scenarios/JsonOptional.java similarity index 95% rename from src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/JsonOptional.java rename to src/test/java/net/hostsharing/hsadminng/test/scenarios/JsonOptional.java index 2a169fe2..c4f3a71e 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/JsonOptional.java +++ b/src/test/java/net/hostsharing/hsadminng/test/scenarios/JsonOptional.java @@ -1,4 +1,4 @@ -package net.hostsharing.hsadminng.hs.office.scenarios; +package net.hostsharing.hsadminng.test.scenarios; public final class JsonOptional { diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/PathAssertion.java b/src/test/java/net/hostsharing/hsadminng/test/scenarios/PathAssertion.java similarity index 84% rename from src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/PathAssertion.java rename to src/test/java/net/hostsharing/hsadminng/test/scenarios/PathAssertion.java index e7aac280..fec91e2a 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/PathAssertion.java +++ b/src/test/java/net/hostsharing/hsadminng/test/scenarios/PathAssertion.java @@ -1,10 +1,10 @@ -package net.hostsharing.hsadminng.hs.office.scenarios; +package net.hostsharing.hsadminng.test.scenarios; -import net.hostsharing.hsadminng.hs.office.scenarios.UseCase.HttpResponse; +import net.hostsharing.hsadminng.test.scenarios.UseCase.HttpResponse; import java.util.function.Consumer; -import static net.hostsharing.hsadminng.hs.office.scenarios.TemplateResolver.Resolver.DROP_COMMENTS; +import static net.hostsharing.hsadminng.test.scenarios.TemplateResolver.Resolver.DROP_COMMENTS; import static org.junit.jupiter.api.Assertions.fail; public class PathAssertion { diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/Produces.java b/src/test/java/net/hostsharing/hsadminng/test/scenarios/Produces.java similarity index 90% rename from src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/Produces.java rename to src/test/java/net/hostsharing/hsadminng/test/scenarios/Produces.java index 5d24fd2c..9acdd3ab 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/Produces.java +++ b/src/test/java/net/hostsharing/hsadminng/test/scenarios/Produces.java @@ -1,4 +1,4 @@ -package net.hostsharing.hsadminng.hs.office.scenarios; +package net.hostsharing.hsadminng.test.scenarios; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/README.md b/src/test/java/net/hostsharing/hsadminng/test/scenarios/README.md similarity index 100% rename from src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/README.md rename to src/test/java/net/hostsharing/hsadminng/test/scenarios/README.md diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/Requires.java b/src/test/java/net/hostsharing/hsadminng/test/scenarios/Requires.java similarity index 83% rename from src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/Requires.java rename to src/test/java/net/hostsharing/hsadminng/test/scenarios/Requires.java index 59ea21ec..fa691c31 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/Requires.java +++ b/src/test/java/net/hostsharing/hsadminng/test/scenarios/Requires.java @@ -1,4 +1,4 @@ -package net.hostsharing.hsadminng.hs.office.scenarios; +package net.hostsharing.hsadminng.test.scenarios; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/ScenarioTest.java b/src/test/java/net/hostsharing/hsadminng/test/scenarios/ScenarioTest.java similarity index 95% rename from src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/ScenarioTest.java rename to src/test/java/net/hostsharing/hsadminng/test/scenarios/ScenarioTest.java index 4e3557eb..d996d12b 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/ScenarioTest.java +++ b/src/test/java/net/hostsharing/hsadminng/test/scenarios/ScenarioTest.java @@ -1,9 +1,9 @@ -package net.hostsharing.hsadminng.hs.office.scenarios; +package net.hostsharing.hsadminng.test.scenarios; import lombok.SneakyThrows; import net.hostsharing.hsadminng.hs.office.person.HsOfficePersonEntity; import net.hostsharing.hsadminng.hs.office.person.HsOfficePersonRepository; -import net.hostsharing.hsadminng.hs.office.scenarios.TemplateResolver.Resolver; +import net.hostsharing.hsadminng.test.scenarios.TemplateResolver.Resolver; import net.hostsharing.hsadminng.lambda.Reducer; import net.hostsharing.hsadminng.rbac.context.ContextBasedTest; import net.hostsharing.hsadminng.rbac.test.JpaAttempt; @@ -28,8 +28,7 @@ import java.util.stream.Collectors; import static java.util.Arrays.asList; import static java.util.Optional.ofNullable; -import static net.hostsharing.hsadminng.hs.office.scenarios.TemplateResolver.Resolver.DROP_COMMENTS; -import static net.hostsharing.hsadminng.hs.office.scenarios.TemplateResolver.Resolver.DROP_COMMENTS; +import static net.hostsharing.hsadminng.test.scenarios.TemplateResolver.Resolver.DROP_COMMENTS; import static org.assertj.core.api.Assertions.assertThat; public abstract class ScenarioTest extends ContextBasedTest { @@ -120,6 +119,7 @@ public abstract class ScenarioTest extends ContextBasedTest { callRequiredProducers(potentialProducerMethod); // and finally we call the producer method + potentialProducerMethod.setAccessible(true); potentialProducerMethod.invoke(this); } // @formatter:on diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/TemplateResolver.java b/src/test/java/net/hostsharing/hsadminng/test/scenarios/TemplateResolver.java similarity index 98% rename from src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/TemplateResolver.java rename to src/test/java/net/hostsharing/hsadminng/test/scenarios/TemplateResolver.java index 002d0512..27ecc4cf 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/TemplateResolver.java +++ b/src/test/java/net/hostsharing/hsadminng/test/scenarios/TemplateResolver.java @@ -1,4 +1,4 @@ -package net.hostsharing.hsadminng.hs.office.scenarios; +package net.hostsharing.hsadminng.test.scenarios; import org.apache.commons.lang3.StringUtils; @@ -10,7 +10,7 @@ import java.util.Objects; import java.util.regex.Pattern; import java.util.stream.Collectors; -import static net.hostsharing.hsadminng.hs.office.scenarios.TemplateResolver.Resolver.DROP_COMMENTS; +import static net.hostsharing.hsadminng.test.scenarios.TemplateResolver.Resolver.DROP_COMMENTS; public class TemplateResolver { diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/TemplateResolverUnitTest.java b/src/test/java/net/hostsharing/hsadminng/test/scenarios/TemplateResolverUnitTest.java similarity index 92% rename from src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/TemplateResolverUnitTest.java rename to src/test/java/net/hostsharing/hsadminng/test/scenarios/TemplateResolverUnitTest.java index 435d44d3..babdb32e 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/TemplateResolverUnitTest.java +++ b/src/test/java/net/hostsharing/hsadminng/test/scenarios/TemplateResolverUnitTest.java @@ -1,10 +1,10 @@ -package net.hostsharing.hsadminng.hs.office.scenarios; +package net.hostsharing.hsadminng.test.scenarios; import org.junit.jupiter.api.Test; import java.util.Map; -import static net.hostsharing.hsadminng.hs.office.scenarios.TemplateResolver.Resolver.DROP_COMMENTS; +import static net.hostsharing.hsadminng.test.scenarios.TemplateResolver.Resolver.DROP_COMMENTS; import static org.assertj.core.api.Assertions.assertThat; class TemplateResolverUnitTest { diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/TestReport.java b/src/test/java/net/hostsharing/hsadminng/test/scenarios/TestReport.java similarity index 99% rename from src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/TestReport.java rename to src/test/java/net/hostsharing/hsadminng/test/scenarios/TestReport.java index f0b47bcc..6dd39447 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/TestReport.java +++ b/src/test/java/net/hostsharing/hsadminng/test/scenarios/TestReport.java @@ -1,4 +1,4 @@ -package net.hostsharing.hsadminng.hs.office.scenarios; +package net.hostsharing.hsadminng.test.scenarios; import lombok.SneakyThrows; import net.hostsharing.hsadminng.system.SystemProcess; diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/UseCase.java b/src/test/java/net/hostsharing/hsadminng/test/scenarios/UseCase.java similarity index 98% rename from src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/UseCase.java rename to src/test/java/net/hostsharing/hsadminng/test/scenarios/UseCase.java index 58d76759..8f1eaf1a 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/UseCase.java +++ b/src/test/java/net/hostsharing/hsadminng/test/scenarios/UseCase.java @@ -1,4 +1,4 @@ -package net.hostsharing.hsadminng.hs.office.scenarios; +package net.hostsharing.hsadminng.test.scenarios; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; @@ -35,8 +35,8 @@ import java.util.function.Supplier; import static java.net.URLEncoder.encode; import static java.util.stream.Collectors.joining; -import static net.hostsharing.hsadminng.hs.office.scenarios.TemplateResolver.Resolver.DROP_COMMENTS; -import static net.hostsharing.hsadminng.hs.office.scenarios.TemplateResolver.Resolver.KEEP_COMMENTS; +import static net.hostsharing.hsadminng.test.scenarios.TemplateResolver.Resolver.DROP_COMMENTS; +import static net.hostsharing.hsadminng.test.scenarios.TemplateResolver.Resolver.KEEP_COMMENTS; import static net.hostsharing.hsadminng.test.DebuggerDetection.isDebuggerAttached; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.fail; @@ -113,7 +113,7 @@ public abstract class UseCase> { } public final UseCase given(final String propName, final Object propValue) { - givenProperties.put(propName, ScenarioTest.resolve(propValue == null ? null : propValue.toString(), KEEP_COMMENTS)); + givenProperties.put(propName, ScenarioTest.resolve(propValue == null ? null : propValue.toString(), TemplateResolver.Resolver.KEEP_COMMENTS)); ScenarioTest.putProperty(propName, propValue); return this; } diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/UseCaseNotImplementedYet.java b/src/test/java/net/hostsharing/hsadminng/test/scenarios/UseCaseNotImplementedYet.java similarity index 87% rename from src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/UseCaseNotImplementedYet.java rename to src/test/java/net/hostsharing/hsadminng/test/scenarios/UseCaseNotImplementedYet.java index d21d6413..7f323165 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/UseCaseNotImplementedYet.java +++ b/src/test/java/net/hostsharing/hsadminng/test/scenarios/UseCaseNotImplementedYet.java @@ -1,4 +1,4 @@ -package net.hostsharing.hsadminng.hs.office.scenarios; +package net.hostsharing.hsadminng.test.scenarios; import static org.assertj.core.api.Assumptions.assumeThat;