From f71109c7fc7068063cab2e2c75c59a73d0dff085 Mon Sep 17 00:00:00 2001 From: Arpad Magosanyi Date: Sun, 26 Oct 2025 10:17:33 +0100 Subject: [PATCH 1/2] modularized --- inez.model/pom.xml | 5 +-- .../magwas/inez/BridiStoreChangeListener.java | 2 +- .../main/java/io/github/magwas/inez/Inez.java | 2 +- .../java/io/github/magwas/inez/InezImpl.java | 2 +- .../magwas/inez/element/BridiElement.java | 4 +- ...idiElementSystemInitializationService.java | 2 +- .../element/GetBridiElementTypeIdService.java | 2 +- .../GetRelativeForBridiElementService.java | 2 +- .../magwas/inez/element/IsOfTypeService.java | 2 +- .../element/RepresentBridiElementService.java | 2 +- .../io/github/magwas/inez/functions/Save.java | 2 +- .../CreateBridisFromParserOutputService.java | 2 +- .../query/CreateBridisFromQueryService.java | 2 +- .../inez/query/GetServiceByNameService.java | 2 +- .../inez/query/QueryProcessorService.java | 4 +- .../storage/CreateBridiFromSumtiService.java | 2 +- .../magwas/inez/storage/SaveBridiService.java | 2 +- inez.model/src/main/java/module-info.java | 13 ++++++ ...veForBridiElementServiceStubGenerator.java | 19 +++++--- .../BridiReferenceTestDataGenerator.java | 10 ++--- .../{ => tests}/SumtiTestDataGenerator.java | 15 ++++--- .../SumtiRepositoryStubGenerator.java | 10 ++--- ...lByRepresentationServiceStubGenerator.java | 10 ++--- ...dByRepresentationServiceStubGenerator.java | 10 ++--- .../{ => tests}/BridiTestDataGenerator.java | 8 ++-- .../GeneratorPatternConstants.java | 44 ++++++++++-------- .../inez/element/BridiElementFactoryStub.java | 13 ------ ...lementSystemInitializationServiceStub.java | 6 --- .../{ => tests}/BridiElementEndToEndTest.java | 11 +++-- .../tests/BridiElementFactoryStub.java | 23 ++++++++++ ...lementSystemInitializationServiceStub.java | 6 +++ ...lementSystemInitializationServiceTest.java | 45 ++++++++++++------- .../{ => tests}/BridiElementTestData.java | 4 +- .../CreateBridiElementServiceTest.java | 22 +++++---- .../{ => tests}/IsInstanceServiceTest.java | 5 ++- ...CreateBridisFromDefinitionServiceStub.java | 6 --- ...eateBridisFromParserOutputServiceStub.java | 6 --- .../CreateBridisFromQueryServiceStub.java | 6 --- .../inez/query/QueryProcessorServiceStub.java | 6 --- ...CreateBridisFromDefinitionServiceStub.java | 6 +++ ...eateBridisFromParserOutputServiceStub.java | 6 +++ .../CreateBridisFromParserOutputTest.java | 11 ++--- .../CreateBridisFromQueryServiceStub.java | 6 +++ .../GetServiceByNameServiceStub.java | 4 +- .../QueryProcessorEndToEndTest.java | 13 +++--- .../tests/QueryProcessorServiceStub.java | 6 +++ .../query/{ => tests}/QueryProcessorTest.java | 9 ++-- .../{ => tests}/QueryProcessorTestData.java | 6 +-- .../storage/AddReferencesServiceStub.java | 6 --- .../inez/storage/AddReferencesTest.java | 32 ------------- .../BridiStoreChangeListenersServiceStub.java | 6 --- .../inez/storage/CreateSumtiServiceStub.java | 6 --- .../inez/storage/DeleteBridiServiceStub.java | 6 --- .../storage/NotifyStoreChangeServiceStub.java | 6 --- .../storage/RemoveReferencesServiceStub.java | 6 --- .../inez/storage/RemoveReferencesTest.java | 29 ------------ .../inez/storage/SaveBridiServiceStub.java | 6 --- .../BridiStoreHistoryServiceStub.java | 6 --- .../BridiReferenceRepositoryStub.java | 5 ++- .../BridiStoreHistoryRepositoryStub.java | 4 +- .../tests/BridiStoreHistoryServiceStub.java | 6 +++ .../{ => tests}/ProblemRepositoryStub.java | 5 ++- .../tests/AddReferencesServiceStub.java | 6 +++ .../{ => tests}/AddReferencesServiceTest.java | 22 +++++---- .../inez/storage/tests/AddReferencesTest.java | 35 +++++++++++++++ .../BridiStoreChangeListenersServiceStub.java | 6 +++ .../{ => tests}/BridiStoreEndToEndTest.java | 12 ++--- .../CreateBridiFromSumtiServiceStub.java | 7 +-- .../{ => tests}/CreateBridiFromSumtiTest.java | 9 ++-- .../storage/tests/CreateSumtiServiceStub.java | 6 +++ .../storage/tests/DeleteBridiServiceStub.java | 6 +++ .../storage/{ => tests}/DeleteBridiTest.java | 27 ++++++----- .../FindAllByRepresentationTest.java | 7 +-- .../FindAllIdByRepresentationTest.java | 7 +-- .../{ => tests}/FindBridiByIdServiceStub.java | 5 ++- .../{ => tests}/FindBridiByIdTest.java | 7 +-- ...BridiIdBySelbriAndSumtiIdsServiceStub.java | 5 ++- .../GetBridiIdBySelbriAndSumtiIdsTest.java | 7 +-- .../tests/NotifyStoreChangeServiceStub.java | 6 +++ .../tests/RemoveReferencesServiceStub.java | 6 +++ .../storage/tests/RemoveReferencesTest.java | 33 ++++++++++++++ .../storage/tests/SaveBridiServiceStub.java | 6 +++ .../storage/{ => tests}/SaveBridiTest.java | 44 ++++++++++-------- .../magwas/inez/{ => tests}/InezImplStub.java | 4 +- .../inez/{ => tests}/InezProblemTestData.java | 5 ++- .../inez/{ => tests}/InezProblemsTest.java | 5 ++- .../magwas/inez/{ => tests}/TestConfig.java | 4 +- inez.model/src/test/java/module-info.java | 14 ++++++ inez.parser/pom.xml | 11 +++-- .../parse/CreateParserFromTokensService.java | 4 +- .../magwas/inez/parse/ParseTextService.java | 2 +- .../inez/parse/ThrowingErrorListener.java | 2 +- inez.parser/src/main/java/module-info.java | 7 +++ .../{ => tests}/IdTestDataGenerator.java | 8 ++-- .../{ => tests}/InputTestDataGenerator.java | 4 +- .../ParseTextServiceStubGenerator.java | 10 +++-- .../ParserOutputTestDataGenerator.java | 10 +++-- .../ReferenceTestDataGenerator.java | 10 +++-- .../RepresentationTestDataGenerator.java | 4 +- .../TestDataGeneratorConstants.java | 4 +- .../CreateParserFromTokensServiceStub.java | 5 ++- .../inez/parse/{ => tests}/ParseTextTest.java | 6 ++- inez.parser/src/test/java/module-info.java | 6 +++ inez.ui/pom.xml | 5 +-- inez.ui/src/main/java/module-info.java | 2 +- .../inez/ui/{ => tests}/EmpptyTest.java | 2 +- inez.ui/tools/javaRun | 2 - pom.xml | 4 +- 108 files changed, 544 insertions(+), 400 deletions(-) create mode 100644 inez.model/src/main/java/module-info.java rename inez.model/src/test/generators-java/io/github/magwas/inez/element/{ => tests}/GetRelativeForBridiElementServiceStubGenerator.java (54%) rename inez.model/src/test/generators-java/io/github/magwas/inez/storage/model/{ => tests}/BridiReferenceTestDataGenerator.java (69%) rename inez.model/src/test/generators-java/io/github/magwas/inez/storage/model/{ => tests}/SumtiTestDataGenerator.java (57%) rename inez.model/src/test/generators-java/io/github/magwas/inez/storage/repository/{ => tests}/SumtiRepositoryStubGenerator.java (69%) rename inez.model/src/test/generators-java/io/github/magwas/inez/storage/{ => tests}/FindAllByRepresentationServiceStubGenerator.java (70%) rename inez.model/src/test/generators-java/io/github/magwas/inez/storage/{ => tests}/FindAllIdByRepresentationServiceStubGenerator.java (74%) rename inez.model/src/test/generators-java/io/github/magwas/inez/{ => tests}/BridiTestDataGenerator.java (75%) rename inez.model/src/test/generators-java/io/github/magwas/inez/{ => tests}/GeneratorPatternConstants.java (61%) delete mode 100644 inez.model/src/test/java/io/github/magwas/inez/element/BridiElementFactoryStub.java delete mode 100644 inez.model/src/test/java/io/github/magwas/inez/element/BridiElementSystemInitializationServiceStub.java rename inez.model/src/test/java/io/github/magwas/inez/element/{ => tests}/BridiElementEndToEndTest.java (90%) create mode 100644 inez.model/src/test/java/io/github/magwas/inez/element/tests/BridiElementFactoryStub.java create mode 100644 inez.model/src/test/java/io/github/magwas/inez/element/tests/BridiElementSystemInitializationServiceStub.java rename inez.model/src/test/java/io/github/magwas/inez/element/{ => tests}/BridiElementSystemInitializationServiceTest.java (55%) rename inez.model/src/test/java/io/github/magwas/inez/element/{ => tests}/BridiElementTestData.java (73%) rename inez.model/src/test/java/io/github/magwas/inez/element/{ => tests}/CreateBridiElementServiceTest.java (81%) rename inez.model/src/test/java/io/github/magwas/inez/element/{ => tests}/IsInstanceServiceTest.java (85%) delete mode 100644 inez.model/src/test/java/io/github/magwas/inez/query/CreateBridisFromDefinitionServiceStub.java delete mode 100644 inez.model/src/test/java/io/github/magwas/inez/query/CreateBridisFromParserOutputServiceStub.java delete mode 100644 inez.model/src/test/java/io/github/magwas/inez/query/CreateBridisFromQueryServiceStub.java delete mode 100644 inez.model/src/test/java/io/github/magwas/inez/query/QueryProcessorServiceStub.java create mode 100644 inez.model/src/test/java/io/github/magwas/inez/query/tests/CreateBridisFromDefinitionServiceStub.java create mode 100644 inez.model/src/test/java/io/github/magwas/inez/query/tests/CreateBridisFromParserOutputServiceStub.java rename inez.model/src/test/java/io/github/magwas/inez/query/{ => tests}/CreateBridisFromParserOutputTest.java (72%) create mode 100644 inez.model/src/test/java/io/github/magwas/inez/query/tests/CreateBridisFromQueryServiceStub.java rename inez.model/src/test/java/io/github/magwas/inez/query/{ => tests}/GetServiceByNameServiceStub.java (78%) rename inez.model/src/test/java/io/github/magwas/inez/query/{ => tests}/QueryProcessorEndToEndTest.java (88%) create mode 100644 inez.model/src/test/java/io/github/magwas/inez/query/tests/QueryProcessorServiceStub.java rename inez.model/src/test/java/io/github/magwas/inez/query/{ => tests}/QueryProcessorTest.java (92%) rename inez.model/src/test/java/io/github/magwas/inez/query/{ => tests}/QueryProcessorTestData.java (80%) delete mode 100644 inez.model/src/test/java/io/github/magwas/inez/storage/AddReferencesServiceStub.java delete mode 100644 inez.model/src/test/java/io/github/magwas/inez/storage/AddReferencesTest.java delete mode 100644 inez.model/src/test/java/io/github/magwas/inez/storage/BridiStoreChangeListenersServiceStub.java delete mode 100644 inez.model/src/test/java/io/github/magwas/inez/storage/CreateSumtiServiceStub.java delete mode 100644 inez.model/src/test/java/io/github/magwas/inez/storage/DeleteBridiServiceStub.java delete mode 100644 inez.model/src/test/java/io/github/magwas/inez/storage/NotifyStoreChangeServiceStub.java delete mode 100644 inez.model/src/test/java/io/github/magwas/inez/storage/RemoveReferencesServiceStub.java delete mode 100644 inez.model/src/test/java/io/github/magwas/inez/storage/RemoveReferencesTest.java delete mode 100644 inez.model/src/test/java/io/github/magwas/inez/storage/SaveBridiServiceStub.java delete mode 100644 inez.model/src/test/java/io/github/magwas/inez/storage/repository/BridiStoreHistoryServiceStub.java rename inez.model/src/test/java/io/github/magwas/inez/storage/repository/{ => tests}/BridiReferenceRepositoryStub.java (79%) rename inez.model/src/test/java/io/github/magwas/inez/storage/repository/{ => tests}/BridiStoreHistoryRepositoryStub.java (58%) create mode 100644 inez.model/src/test/java/io/github/magwas/inez/storage/repository/tests/BridiStoreHistoryServiceStub.java rename inez.model/src/test/java/io/github/magwas/inez/storage/repository/{ => tests}/ProblemRepositoryStub.java (63%) create mode 100644 inez.model/src/test/java/io/github/magwas/inez/storage/tests/AddReferencesServiceStub.java rename inez.model/src/test/java/io/github/magwas/inez/storage/{ => tests}/AddReferencesServiceTest.java (63%) create mode 100644 inez.model/src/test/java/io/github/magwas/inez/storage/tests/AddReferencesTest.java create mode 100644 inez.model/src/test/java/io/github/magwas/inez/storage/tests/BridiStoreChangeListenersServiceStub.java rename inez.model/src/test/java/io/github/magwas/inez/storage/{ => tests}/BridiStoreEndToEndTest.java (86%) rename inez.model/src/test/java/io/github/magwas/inez/storage/{ => tests}/CreateBridiFromSumtiServiceStub.java (75%) rename inez.model/src/test/java/io/github/magwas/inez/storage/{ => tests}/CreateBridiFromSumtiTest.java (64%) create mode 100644 inez.model/src/test/java/io/github/magwas/inez/storage/tests/CreateSumtiServiceStub.java create mode 100644 inez.model/src/test/java/io/github/magwas/inez/storage/tests/DeleteBridiServiceStub.java rename inez.model/src/test/java/io/github/magwas/inez/storage/{ => tests}/DeleteBridiTest.java (53%) rename inez.model/src/test/java/io/github/magwas/inez/storage/{ => tests}/FindAllByRepresentationTest.java (72%) rename inez.model/src/test/java/io/github/magwas/inez/storage/{ => tests}/FindAllIdByRepresentationTest.java (73%) rename inez.model/src/test/java/io/github/magwas/inez/storage/{ => tests}/FindBridiByIdServiceStub.java (90%) rename inez.model/src/test/java/io/github/magwas/inez/storage/{ => tests}/FindBridiByIdTest.java (75%) rename inez.model/src/test/java/io/github/magwas/inez/storage/{ => tests}/GetBridiIdBySelbriAndSumtiIdsServiceStub.java (86%) rename inez.model/src/test/java/io/github/magwas/inez/storage/{ => tests}/GetBridiIdBySelbriAndSumtiIdsTest.java (78%) create mode 100644 inez.model/src/test/java/io/github/magwas/inez/storage/tests/NotifyStoreChangeServiceStub.java create mode 100644 inez.model/src/test/java/io/github/magwas/inez/storage/tests/RemoveReferencesServiceStub.java create mode 100644 inez.model/src/test/java/io/github/magwas/inez/storage/tests/RemoveReferencesTest.java create mode 100644 inez.model/src/test/java/io/github/magwas/inez/storage/tests/SaveBridiServiceStub.java rename inez.model/src/test/java/io/github/magwas/inez/storage/{ => tests}/SaveBridiTest.java (51%) rename inez.model/src/test/java/io/github/magwas/inez/{ => tests}/InezImplStub.java (64%) rename inez.model/src/test/java/io/github/magwas/inez/{ => tests}/InezProblemTestData.java (65%) rename inez.model/src/test/java/io/github/magwas/inez/{ => tests}/InezProblemsTest.java (77%) rename inez.model/src/test/java/io/github/magwas/inez/{ => tests}/TestConfig.java (83%) create mode 100644 inez.model/src/test/java/module-info.java create mode 100644 inez.parser/src/main/java/module-info.java rename inez.parser/src/test/generators-java/io/github/magwas/inez/parse/{ => tests}/IdTestDataGenerator.java (77%) rename inez.parser/src/test/generators-java/io/github/magwas/inez/parse/{ => tests}/InputTestDataGenerator.java (79%) rename inez.parser/src/test/generators-java/io/github/magwas/inez/parse/{ => tests}/ParseTextServiceStubGenerator.java (68%) rename inez.parser/src/test/generators-java/io/github/magwas/inez/parse/{ => tests}/ParserOutputTestDataGenerator.java (73%) rename inez.parser/src/test/generators-java/io/github/magwas/inez/parse/{ => tests}/ReferenceTestDataGenerator.java (68%) rename inez.parser/src/test/generators-java/io/github/magwas/inez/parse/{ => tests}/RepresentationTestDataGenerator.java (86%) rename inez.parser/src/test/generators-java/io/github/magwas/inez/parse/{ => tests}/TestDataGeneratorConstants.java (84%) rename inez.parser/src/test/java/io/github/magwas/inez/parse/{ => tests}/CreateParserFromTokensServiceStub.java (86%) rename inez.parser/src/test/java/io/github/magwas/inez/parse/{ => tests}/ParseTextTest.java (93%) create mode 100644 inez.parser/src/test/java/module-info.java rename inez.ui/src/test/java/io/github/magwas/inez/ui/{ => tests}/EmpptyTest.java (81%) diff --git a/inez.model/pom.xml b/inez.model/pom.xml index 5e573bb..983fb2e 100644 --- a/inez.model/pom.xml +++ b/inez.model/pom.xml @@ -45,13 +45,12 @@ io.github.magwas - konveyor.base + konveyor.runtime ${version.konveyor} - runtime io.github.magwas - konveyor.base + konveyor.runtime ${version.konveyor} test-jar test diff --git a/inez.model/src/main/java/io/github/magwas/inez/BridiStoreChangeListener.java b/inez.model/src/main/java/io/github/magwas/inez/BridiStoreChangeListener.java index 426297e..1fabe1f 100644 --- a/inez.model/src/main/java/io/github/magwas/inez/BridiStoreChangeListener.java +++ b/inez.model/src/main/java/io/github/magwas/inez/BridiStoreChangeListener.java @@ -1,6 +1,6 @@ package io.github.magwas.inez; -import io.github.magwas.kodekonveyorannotations.Glue; +import io.github.magwas.konveyor.annotations.Glue; @Glue public interface BridiStoreChangeListener { diff --git a/inez.model/src/main/java/io/github/magwas/inez/Inez.java b/inez.model/src/main/java/io/github/magwas/inez/Inez.java index 512d39c..8d30a5b 100644 --- a/inez.model/src/main/java/io/github/magwas/inez/Inez.java +++ b/inez.model/src/main/java/io/github/magwas/inez/Inez.java @@ -8,7 +8,7 @@ import io.github.magwas.inez.element.BridiElement; import io.github.magwas.inez.storage.model.Sumti; -import io.github.magwas.kodekonveyorannotations.Glue; +import io.github.magwas.konveyor.annotations.Glue; @Glue public interface Inez { diff --git a/inez.model/src/main/java/io/github/magwas/inez/InezImpl.java b/inez.model/src/main/java/io/github/magwas/inez/InezImpl.java index a593bda..cfa2d6e 100644 --- a/inez.model/src/main/java/io/github/magwas/inez/InezImpl.java +++ b/inez.model/src/main/java/io/github/magwas/inez/InezImpl.java @@ -29,7 +29,7 @@ import io.github.magwas.inez.storage.repository.BridiReferenceRepository; import io.github.magwas.inez.storage.repository.BridiStoreHistoryRepository; import io.github.magwas.inez.storage.repository.ProblemRepository; -import io.github.magwas.kodekonveyorannotations.Delegate; +import io.github.magwas.konveyor.annotations.Delegate; @Component @Delegate diff --git a/inez.model/src/main/java/io/github/magwas/inez/element/BridiElement.java b/inez.model/src/main/java/io/github/magwas/inez/element/BridiElement.java index a113b27..b0f32d5 100644 --- a/inez.model/src/main/java/io/github/magwas/inez/element/BridiElement.java +++ b/inez.model/src/main/java/io/github/magwas/inez/element/BridiElement.java @@ -10,8 +10,8 @@ import io.github.magwas.inez.storage.model.Sumti; import io.github.magwas.inez.storage.repository.BridiReferenceRepository; import io.github.magwas.inez.storage.repository.SumtiRepository; -import io.github.magwas.kodekonveyorannotations.Delegate; -import io.github.magwas.runtime.LogUtil; +import io.github.magwas.konveyor.annotations.Delegate; +import io.github.magwas.konveyor.runtime.LogUtil; @Delegate public class BridiElement implements ElementConstants { diff --git a/inez.model/src/main/java/io/github/magwas/inez/element/BridiElementSystemInitializationService.java b/inez.model/src/main/java/io/github/magwas/inez/element/BridiElementSystemInitializationService.java index 266f8c9..e564c28 100644 --- a/inez.model/src/main/java/io/github/magwas/inez/element/BridiElementSystemInitializationService.java +++ b/inez.model/src/main/java/io/github/magwas/inez/element/BridiElementSystemInitializationService.java @@ -6,7 +6,7 @@ import org.springframework.stereotype.Service; import io.github.magwas.inez.InezImpl; -import io.github.magwas.runtime.LoggerService; +import io.github.magwas.konveyor.runtime.LoggerService; @Service public class BridiElementSystemInitializationService implements ElementConstants { diff --git a/inez.model/src/main/java/io/github/magwas/inez/element/GetBridiElementTypeIdService.java b/inez.model/src/main/java/io/github/magwas/inez/element/GetBridiElementTypeIdService.java index 3bd83be..0eefb2a 100644 --- a/inez.model/src/main/java/io/github/magwas/inez/element/GetBridiElementTypeIdService.java +++ b/inez.model/src/main/java/io/github/magwas/inez/element/GetBridiElementTypeIdService.java @@ -5,7 +5,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import io.github.magwas.runtime.LogUtil; +import io.github.magwas.konveyor.runtime.LogUtil; @Service public class GetBridiElementTypeIdService implements ElementConstants { diff --git a/inez.model/src/main/java/io/github/magwas/inez/element/GetRelativeForBridiElementService.java b/inez.model/src/main/java/io/github/magwas/inez/element/GetRelativeForBridiElementService.java index 5c3c663..33e9584 100644 --- a/inez.model/src/main/java/io/github/magwas/inez/element/GetRelativeForBridiElementService.java +++ b/inez.model/src/main/java/io/github/magwas/inez/element/GetRelativeForBridiElementService.java @@ -8,7 +8,7 @@ import io.github.magwas.inez.storage.model.BridiReference; import io.github.magwas.inez.storage.repository.BridiReferenceRepository; -import io.github.magwas.runtime.LogUtil; +import io.github.magwas.konveyor.runtime.LogUtil; @Service public class GetRelativeForBridiElementService { diff --git a/inez.model/src/main/java/io/github/magwas/inez/element/IsOfTypeService.java b/inez.model/src/main/java/io/github/magwas/inez/element/IsOfTypeService.java index c806c98..8c4fecd 100644 --- a/inez.model/src/main/java/io/github/magwas/inez/element/IsOfTypeService.java +++ b/inez.model/src/main/java/io/github/magwas/inez/element/IsOfTypeService.java @@ -3,7 +3,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import io.github.magwas.runtime.LogUtil; +import io.github.magwas.konveyor.runtime.LogUtil; @Service public class IsOfTypeService implements ElementConstants { diff --git a/inez.model/src/main/java/io/github/magwas/inez/element/RepresentBridiElementService.java b/inez.model/src/main/java/io/github/magwas/inez/element/RepresentBridiElementService.java index d15ab8e..5436cec 100644 --- a/inez.model/src/main/java/io/github/magwas/inez/element/RepresentBridiElementService.java +++ b/inez.model/src/main/java/io/github/magwas/inez/element/RepresentBridiElementService.java @@ -5,7 +5,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import io.github.magwas.runtime.LogUtil; +import io.github.magwas.konveyor.runtime.LogUtil; @Service public class RepresentBridiElementService implements ElementConstants { diff --git a/inez.model/src/main/java/io/github/magwas/inez/functions/Save.java b/inez.model/src/main/java/io/github/magwas/inez/functions/Save.java index 35120d7..171b8ca 100644 --- a/inez.model/src/main/java/io/github/magwas/inez/functions/Save.java +++ b/inez.model/src/main/java/io/github/magwas/inez/functions/Save.java @@ -11,7 +11,7 @@ import io.github.magwas.inez.InezImpl; import io.github.magwas.inez.parse.ParseTextService; import io.github.magwas.inez.query.BridiFunction; -import io.github.magwas.runtime.LogUtil; +import io.github.magwas.konveyor.runtime.LogUtil; @Service public class Save implements BridiFunction { diff --git a/inez.model/src/main/java/io/github/magwas/inez/query/CreateBridisFromParserOutputService.java b/inez.model/src/main/java/io/github/magwas/inez/query/CreateBridisFromParserOutputService.java index aafecfd..4270aa2 100644 --- a/inez.model/src/main/java/io/github/magwas/inez/query/CreateBridisFromParserOutputService.java +++ b/inez.model/src/main/java/io/github/magwas/inez/query/CreateBridisFromParserOutputService.java @@ -1,6 +1,6 @@ package io.github.magwas.inez.query; -import static io.github.magwas.runtime.LogUtil.debug; +import static io.github.magwas.konveyor.runtime.LogUtil.debug; import java.util.List; import java.util.Map; diff --git a/inez.model/src/main/java/io/github/magwas/inez/query/CreateBridisFromQueryService.java b/inez.model/src/main/java/io/github/magwas/inez/query/CreateBridisFromQueryService.java index efdd0e2..bd82c0a 100644 --- a/inez.model/src/main/java/io/github/magwas/inez/query/CreateBridisFromQueryService.java +++ b/inez.model/src/main/java/io/github/magwas/inez/query/CreateBridisFromQueryService.java @@ -10,7 +10,7 @@ import io.github.magwas.inez.element.BridiElementFactory; import io.github.magwas.inez.parse.ParseTextService; import io.github.magwas.inez.storage.SaveBridiService; -import io.github.magwas.runtime.LogUtil; +import io.github.magwas.konveyor.runtime.LogUtil; @Service public class CreateBridisFromQueryService { diff --git a/inez.model/src/main/java/io/github/magwas/inez/query/GetServiceByNameService.java b/inez.model/src/main/java/io/github/magwas/inez/query/GetServiceByNameService.java index 318be9d..34900e0 100644 --- a/inez.model/src/main/java/io/github/magwas/inez/query/GetServiceByNameService.java +++ b/inez.model/src/main/java/io/github/magwas/inez/query/GetServiceByNameService.java @@ -7,7 +7,7 @@ import org.springframework.context.ApplicationContext; import org.springframework.stereotype.Service; -import io.github.magwas.runtime.LoggerService; +import io.github.magwas.konveyor.runtime.LoggerService; @Service public class GetServiceByNameService { diff --git a/inez.model/src/main/java/io/github/magwas/inez/query/QueryProcessorService.java b/inez.model/src/main/java/io/github/magwas/inez/query/QueryProcessorService.java index 17b7517..d9d8ba8 100644 --- a/inez.model/src/main/java/io/github/magwas/inez/query/QueryProcessorService.java +++ b/inez.model/src/main/java/io/github/magwas/inez/query/QueryProcessorService.java @@ -1,7 +1,7 @@ package io.github.magwas.inez.query; -import static io.github.magwas.runtime.LogUtil.debug; -import static io.github.magwas.runtime.LogUtil.warning; +import static io.github.magwas.konveyor.runtime.LogUtil.debug; +import static io.github.magwas.konveyor.runtime.LogUtil.warning; import java.util.ArrayList; import java.util.List; diff --git a/inez.model/src/main/java/io/github/magwas/inez/storage/CreateBridiFromSumtiService.java b/inez.model/src/main/java/io/github/magwas/inez/storage/CreateBridiFromSumtiService.java index 2509ad1..282077a 100644 --- a/inez.model/src/main/java/io/github/magwas/inez/storage/CreateBridiFromSumtiService.java +++ b/inez.model/src/main/java/io/github/magwas/inez/storage/CreateBridiFromSumtiService.java @@ -13,7 +13,7 @@ import io.github.magwas.inez.storage.model.BridiReference; import io.github.magwas.inez.storage.model.Sumti; import io.github.magwas.inez.storage.repository.BridiReferenceRepository; -import io.github.magwas.runtime.LogUtil; +import io.github.magwas.konveyor.runtime.LogUtil; @Service public class CreateBridiFromSumtiService { diff --git a/inez.model/src/main/java/io/github/magwas/inez/storage/SaveBridiService.java b/inez.model/src/main/java/io/github/magwas/inez/storage/SaveBridiService.java index 1c7e741..2224bde 100644 --- a/inez.model/src/main/java/io/github/magwas/inez/storage/SaveBridiService.java +++ b/inez.model/src/main/java/io/github/magwas/inez/storage/SaveBridiService.java @@ -12,7 +12,7 @@ import io.github.magwas.inez.BridiStoreOperation; import io.github.magwas.inez.storage.model.Sumti; import io.github.magwas.inez.storage.repository.SumtiRepository; -import io.github.magwas.runtime.LogUtil; +import io.github.magwas.konveyor.runtime.LogUtil; @Service public class SaveBridiService implements Function { diff --git a/inez.model/src/main/java/module-info.java b/inez.model/src/main/java/module-info.java new file mode 100644 index 0000000..3fcb727 --- /dev/null +++ b/inez.model/src/main/java/module-info.java @@ -0,0 +1,13 @@ +open module inez.model { + exports io.github.magwas.inez; + exports io.github.magwas.inez.element; + exports io.github.magwas.inez.storage.model; + exports io.github.magwas.inez.storage.repository; + exports io.github.magwas.inez.functions; + exports io.github.magwas.inez.query; + exports io.github.magwas.inez.storage; + + requires transitive inez.parser; + requires transitive spring.data.keyvalue; + requires transitive spring.data.commons; +} diff --git a/inez.model/src/test/generators-java/io/github/magwas/inez/element/GetRelativeForBridiElementServiceStubGenerator.java b/inez.model/src/test/generators-java/io/github/magwas/inez/element/tests/GetRelativeForBridiElementServiceStubGenerator.java similarity index 54% rename from inez.model/src/test/generators-java/io/github/magwas/inez/element/GetRelativeForBridiElementServiceStubGenerator.java rename to inez.model/src/test/generators-java/io/github/magwas/inez/element/tests/GetRelativeForBridiElementServiceStubGenerator.java index 5c597e3..9c39eab 100644 --- a/inez.model/src/test/generators-java/io/github/magwas/inez/element/GetRelativeForBridiElementServiceStubGenerator.java +++ b/inez.model/src/test/generators-java/io/github/magwas/inez/element/tests/GetRelativeForBridiElementServiceStubGenerator.java @@ -1,12 +1,12 @@ -package io.github.magwas.inez.element; +package io.github.magwas.inez.element.tests; import java.text.MessageFormat; import java.util.function.Supplier; -import io.github.magwas.inez.GeneratorPatternConstants; -import io.github.magwas.runtime.GeneratorUtil; -import io.github.magwas.runtime.RuntimeConstants; -import io.github.magwas.testing.TestUtil; +import io.github.magwas.inez.tests.GeneratorPatternConstants; +import io.github.magwas.konveyor.runtime.GeneratorUtil; +import io.github.magwas.konveyor.runtime.RuntimeConstants; +import io.github.magwas.konveyor.testing.TestUtil; public class GetRelativeForBridiElementServiceStubGenerator implements Supplier, GeneratorPatternConstants { @@ -14,8 +14,13 @@ public class GetRelativeForBridiElementServiceStubGenerator @Override public StringBuilder get() { StringBuilder builder = GeneratorUtil.stubBoilerPlate(""" - import java.util.stream.Stream; - """, "BridiElementTestData"); +import io.github.magwas.inez.element.GetRelativeForBridiElementService; + +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import java.util.stream.Stream; +""", "BridiElementTestData"); String relatives = TestUtil.loadResourceAsString("relatives"); GeneratorUtil.mapToCode(relatives, line -> MessageFormat.format(GET_RELATIVE_FOR_BRIDI_ELEMENT_PATTERN, diff --git a/inez.model/src/test/generators-java/io/github/magwas/inez/storage/model/BridiReferenceTestDataGenerator.java b/inez.model/src/test/generators-java/io/github/magwas/inez/storage/model/tests/BridiReferenceTestDataGenerator.java similarity index 69% rename from inez.model/src/test/generators-java/io/github/magwas/inez/storage/model/BridiReferenceTestDataGenerator.java rename to inez.model/src/test/generators-java/io/github/magwas/inez/storage/model/tests/BridiReferenceTestDataGenerator.java index 1127ad8..6ebd97e 100644 --- a/inez.model/src/test/generators-java/io/github/magwas/inez/storage/model/BridiReferenceTestDataGenerator.java +++ b/inez.model/src/test/generators-java/io/github/magwas/inez/storage/model/tests/BridiReferenceTestDataGenerator.java @@ -1,12 +1,12 @@ -package io.github.magwas.inez.storage.model; +package io.github.magwas.inez.storage.model.tests; import java.text.MessageFormat; import java.util.function.Supplier; -import io.github.magwas.inez.GeneratorPatternConstants; -import io.github.magwas.runtime.GeneratorUtil; -import io.github.magwas.runtime.RuntimeConstants; -import io.github.magwas.testing.TestUtil; +import io.github.magwas.inez.tests.GeneratorPatternConstants; +import io.github.magwas.konveyor.runtime.GeneratorUtil; +import io.github.magwas.konveyor.runtime.RuntimeConstants; +import io.github.magwas.konveyor.testing.TestUtil; public class BridiReferenceTestDataGenerator implements Supplier, GeneratorPatternConstants { diff --git a/inez.model/src/test/generators-java/io/github/magwas/inez/storage/model/SumtiTestDataGenerator.java b/inez.model/src/test/generators-java/io/github/magwas/inez/storage/model/tests/SumtiTestDataGenerator.java similarity index 57% rename from inez.model/src/test/generators-java/io/github/magwas/inez/storage/model/SumtiTestDataGenerator.java rename to inez.model/src/test/generators-java/io/github/magwas/inez/storage/model/tests/SumtiTestDataGenerator.java index 166ba7f..b9017b7 100644 --- a/inez.model/src/test/generators-java/io/github/magwas/inez/storage/model/SumtiTestDataGenerator.java +++ b/inez.model/src/test/generators-java/io/github/magwas/inez/storage/model/tests/SumtiTestDataGenerator.java @@ -1,12 +1,12 @@ -package io.github.magwas.inez.storage.model; +package io.github.magwas.inez.storage.model.tests; import java.text.MessageFormat; import java.util.function.Supplier; -import io.github.magwas.inez.GeneratorPatternConstants; -import io.github.magwas.runtime.GeneratorUtil; -import io.github.magwas.runtime.RuntimeConstants; -import io.github.magwas.testing.TestUtil; +import io.github.magwas.inez.tests.GeneratorPatternConstants; +import io.github.magwas.konveyor.runtime.GeneratorUtil; +import io.github.magwas.konveyor.runtime.RuntimeConstants; +import io.github.magwas.konveyor.testing.TestUtil; public class SumtiTestDataGenerator implements Supplier, GeneratorPatternConstants { @@ -14,7 +14,10 @@ public class SumtiTestDataGenerator @Override public StringBuilder get() { StringBuilder builder = GeneratorUtil.testDataBoilerPlate( - "import io.github.magwas.inez.parse.IdTestData;", "IdTestData"); + """ +import io.github.magwas.inez.parse.tests.IdTestData; +import io.github.magwas.inez.storage.model.Sumti; +""", "IdTestData"); String sumties = TestUtil.loadResourceAsString("sumties"); GeneratorUtil.mapToCode(sumties, line -> MessageFormat.format(SUMTI_TESTDATA_PATTERN, diff --git a/inez.model/src/test/generators-java/io/github/magwas/inez/storage/repository/SumtiRepositoryStubGenerator.java b/inez.model/src/test/generators-java/io/github/magwas/inez/storage/repository/tests/SumtiRepositoryStubGenerator.java similarity index 69% rename from inez.model/src/test/generators-java/io/github/magwas/inez/storage/repository/SumtiRepositoryStubGenerator.java rename to inez.model/src/test/generators-java/io/github/magwas/inez/storage/repository/tests/SumtiRepositoryStubGenerator.java index 568a0e0..87bf1dc 100644 --- a/inez.model/src/test/generators-java/io/github/magwas/inez/storage/repository/SumtiRepositoryStubGenerator.java +++ b/inez.model/src/test/generators-java/io/github/magwas/inez/storage/repository/tests/SumtiRepositoryStubGenerator.java @@ -1,12 +1,12 @@ -package io.github.magwas.inez.storage.repository; +package io.github.magwas.inez.storage.repository.tests; import java.text.MessageFormat; import java.util.function.Supplier; -import io.github.magwas.inez.GeneratorPatternConstants; -import io.github.magwas.runtime.GeneratorUtil; -import io.github.magwas.runtime.RuntimeConstants; -import io.github.magwas.testing.TestUtil; +import io.github.magwas.inez.tests.GeneratorPatternConstants; +import io.github.magwas.konveyor.runtime.GeneratorUtil; +import io.github.magwas.konveyor.runtime.RuntimeConstants; +import io.github.magwas.konveyor.testing.TestUtil; public class SumtiRepositoryStubGenerator implements Supplier, GeneratorPatternConstants { diff --git a/inez.model/src/test/generators-java/io/github/magwas/inez/storage/FindAllByRepresentationServiceStubGenerator.java b/inez.model/src/test/generators-java/io/github/magwas/inez/storage/tests/FindAllByRepresentationServiceStubGenerator.java similarity index 70% rename from inez.model/src/test/generators-java/io/github/magwas/inez/storage/FindAllByRepresentationServiceStubGenerator.java rename to inez.model/src/test/generators-java/io/github/magwas/inez/storage/tests/FindAllByRepresentationServiceStubGenerator.java index d67ff57..01104b4 100644 --- a/inez.model/src/test/generators-java/io/github/magwas/inez/storage/FindAllByRepresentationServiceStubGenerator.java +++ b/inez.model/src/test/generators-java/io/github/magwas/inez/storage/tests/FindAllByRepresentationServiceStubGenerator.java @@ -1,12 +1,12 @@ -package io.github.magwas.inez.storage; +package io.github.magwas.inez.storage.tests; import java.text.MessageFormat; import java.util.function.Supplier; -import io.github.magwas.inez.GeneratorPatternConstants; -import io.github.magwas.runtime.GeneratorUtil; -import io.github.magwas.runtime.RuntimeConstants; -import io.github.magwas.testing.TestUtil; +import io.github.magwas.inez.tests.GeneratorPatternConstants; +import io.github.magwas.konveyor.runtime.GeneratorUtil; +import io.github.magwas.konveyor.runtime.RuntimeConstants; +import io.github.magwas.konveyor.testing.TestUtil; public class FindAllByRepresentationServiceStubGenerator implements Supplier, GeneratorPatternConstants { diff --git a/inez.model/src/test/generators-java/io/github/magwas/inez/storage/FindAllIdByRepresentationServiceStubGenerator.java b/inez.model/src/test/generators-java/io/github/magwas/inez/storage/tests/FindAllIdByRepresentationServiceStubGenerator.java similarity index 74% rename from inez.model/src/test/generators-java/io/github/magwas/inez/storage/FindAllIdByRepresentationServiceStubGenerator.java rename to inez.model/src/test/generators-java/io/github/magwas/inez/storage/tests/FindAllIdByRepresentationServiceStubGenerator.java index 2937fec..60b4bac 100644 --- a/inez.model/src/test/generators-java/io/github/magwas/inez/storage/FindAllIdByRepresentationServiceStubGenerator.java +++ b/inez.model/src/test/generators-java/io/github/magwas/inez/storage/tests/FindAllIdByRepresentationServiceStubGenerator.java @@ -1,12 +1,12 @@ -package io.github.magwas.inez.storage; +package io.github.magwas.inez.storage.tests; import java.text.MessageFormat; import java.util.function.Supplier; -import io.github.magwas.inez.GeneratorPatternConstants; -import io.github.magwas.runtime.GeneratorUtil; -import io.github.magwas.runtime.RuntimeConstants; -import io.github.magwas.testing.TestUtil; +import io.github.magwas.inez.tests.GeneratorPatternConstants; +import io.github.magwas.konveyor.runtime.GeneratorUtil; +import io.github.magwas.konveyor.runtime.RuntimeConstants; +import io.github.magwas.konveyor.testing.TestUtil; public class FindAllIdByRepresentationServiceStubGenerator implements Supplier, GeneratorPatternConstants { diff --git a/inez.model/src/test/generators-java/io/github/magwas/inez/BridiTestDataGenerator.java b/inez.model/src/test/generators-java/io/github/magwas/inez/tests/BridiTestDataGenerator.java similarity index 75% rename from inez.model/src/test/generators-java/io/github/magwas/inez/BridiTestDataGenerator.java rename to inez.model/src/test/generators-java/io/github/magwas/inez/tests/BridiTestDataGenerator.java index 35db835..97c5962 100644 --- a/inez.model/src/test/generators-java/io/github/magwas/inez/BridiTestDataGenerator.java +++ b/inez.model/src/test/generators-java/io/github/magwas/inez/tests/BridiTestDataGenerator.java @@ -1,11 +1,11 @@ -package io.github.magwas.inez; +package io.github.magwas.inez.tests; import java.text.MessageFormat; import java.util.function.Supplier; -import io.github.magwas.runtime.GeneratorUtil; -import io.github.magwas.runtime.RuntimeConstants; -import io.github.magwas.testing.TestUtil; +import io.github.magwas.konveyor.runtime.GeneratorUtil; +import io.github.magwas.konveyor.runtime.RuntimeConstants; +import io.github.magwas.konveyor.testing.TestUtil; public class BridiTestDataGenerator implements Supplier, GeneratorPatternConstants { diff --git a/inez.model/src/test/generators-java/io/github/magwas/inez/GeneratorPatternConstants.java b/inez.model/src/test/generators-java/io/github/magwas/inez/tests/GeneratorPatternConstants.java similarity index 61% rename from inez.model/src/test/generators-java/io/github/magwas/inez/GeneratorPatternConstants.java rename to inez.model/src/test/generators-java/io/github/magwas/inez/tests/GeneratorPatternConstants.java index 8252cc2..080f82b 100644 --- a/inez.model/src/test/generators-java/io/github/magwas/inez/GeneratorPatternConstants.java +++ b/inez.model/src/test/generators-java/io/github/magwas/inez/tests/GeneratorPatternConstants.java @@ -1,23 +1,25 @@ -package io.github.magwas.inez; +package io.github.magwas.inez.tests; public interface GeneratorPatternConstants { String GET_RELATIVE_FOR_BRIDI_ELEMENT_PATTERN = "\twhen(mock.apply({0}_ID, {1}_ID, {2}, {3})).thenReturn(Stream.of({4}_ID));\n"; String BRIDI_TEST_DATA_PATTERN = "\tBridi {0} = new Bridi({1}, {2},{3});\n"; String BRIDI_TEST_DATA_HEADER = """ - import java.util.List; - import io.github.magwas.inez.parse.IdTestData; - import io.github.magwas.inez.parse.IdUtil; - import io.github.magwas.inez.parse.ParserConstants; - import io.github.magwas.inez.parse.ReferenceTestData; +import java.util.List; - """; +import io.github.magwas.inez.Bridi; +import io.github.magwas.inez.parse.IdUtil; +import io.github.magwas.inez.parse.ParserConstants; +import io.github.magwas.inez.parse.tests.IdTestData; +import io.github.magwas.inez.parse.tests.ReferenceTestData; +"""; String SUMTI_REPOSITORY_STUB_PATTERN = "\twhen(mock.findById({0}_ID)).thenReturn(Optional.of({0}_SUMTI));\n"; String SUMTI_REPOSITORY_STUB_EXTRA = "\twhen(mock.findAllByRepresentation(GO_REPR)).thenReturn(Set.of(GO_SUMTI, GO2_SUMTI));\n"; String SUMTI_REPOSITORY_STUB_HEADER = """ - import java.util.Set; - import java.util.Optional; - import io.github.magwas.inez.storage.model.SumtiTestData; - """; +import java.util.Set; +import java.util.Optional; +import io.github.magwas.inez.storage.model.tests.SumtiTestData; +import io.github.magwas.inez.storage.repository.SumtiRepository; +"""; String SUMTI_TESTDATA_PATTERN = "\tSumti {0}_SUMTI = new Sumti({1}, {2});\n"; String BRIDI_REFERENCE_PATTERN = """ BridiReference {0}_REFERENCE_0 = new BridiReference( @@ -31,16 +33,20 @@ public interface GeneratorPatternConstants { {0}_REFERENCE_2); """; String BRIDI_REFERENCE_HEADER = """ - import io.github.magwas.inez.parse.IdTestData; - import io.github.magwas.inez.parse.IdUtil; - import java.util.List; - """; +import io.github.magwas.inez.parse.IdUtil; +import io.github.magwas.inez.parse.tests.IdTestData; +import io.github.magwas.inez.storage.model.BridiReference; + +import java.util.List; +"""; String FIND_ALL_BY_REPRESENTATION_STUB_HEADER = """ - import java.util.stream.Stream; +import java.util.stream.Stream; - import io.github.magwas.inez.BridiTestData; - import io.github.magwas.inez.parse.ParserConstants; - """; +import io.github.magwas.inez.storage.FindAllByRepresentationService; +import io.github.magwas.inez.storage.FindAllIdByRepresentationService; +import io.github.magwas.inez.tests.BridiTestData; +import io.github.magwas.inez.parse.ParserConstants; +"""; String FIND_ALL_ID_BY_REPRESENTATION_STUB_PATTERN = "\t\twhen(mock.apply({0})).thenAnswer((args) -> Stream.of({1}));\n"; String FIND_ALL_BY_REPRESENTATION_STUB_PATTERN = "\t\twhen(mock.apply({0})).thenAnswer((args) -> Stream.of({1}));\n"; diff --git a/inez.model/src/test/java/io/github/magwas/inez/element/BridiElementFactoryStub.java b/inez.model/src/test/java/io/github/magwas/inez/element/BridiElementFactoryStub.java deleted file mode 100644 index 0452b03..0000000 --- a/inez.model/src/test/java/io/github/magwas/inez/element/BridiElementFactoryStub.java +++ /dev/null @@ -1,13 +0,0 @@ -package io.github.magwas.inez.element; - -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - -public class BridiElementFactoryStub { - public static BridiElementFactory stub() { - BridiElementFactory mock = mock(BridiElementFactory.class); - when(mock.apply(any())).then(x -> new BridiElement(x.getArgument(0))); - return mock; - } -} diff --git a/inez.model/src/test/java/io/github/magwas/inez/element/BridiElementSystemInitializationServiceStub.java b/inez.model/src/test/java/io/github/magwas/inez/element/BridiElementSystemInitializationServiceStub.java deleted file mode 100644 index 849a8a9..0000000 --- a/inez.model/src/test/java/io/github/magwas/inez/element/BridiElementSystemInitializationServiceStub.java +++ /dev/null @@ -1,6 +0,0 @@ -package io.github.magwas.inez.element; - -import io.github.magwas.testing.IndirectlyTested; - -@IndirectlyTested -public class BridiElementSystemInitializationServiceStub {} diff --git a/inez.model/src/test/java/io/github/magwas/inez/element/BridiElementEndToEndTest.java b/inez.model/src/test/java/io/github/magwas/inez/element/tests/BridiElementEndToEndTest.java similarity index 90% rename from inez.model/src/test/java/io/github/magwas/inez/element/BridiElementEndToEndTest.java rename to inez.model/src/test/java/io/github/magwas/inez/element/tests/BridiElementEndToEndTest.java index abc24dd..e4d2bf4 100644 --- a/inez.model/src/test/java/io/github/magwas/inez/element/BridiElementEndToEndTest.java +++ b/inez.model/src/test/java/io/github/magwas/inez/element/tests/BridiElementEndToEndTest.java @@ -1,4 +1,4 @@ -package io.github.magwas.inez.element; +package io.github.magwas.inez.element.tests; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertSame; @@ -17,11 +17,15 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit.jupiter.SpringExtension; -import io.github.magwas.inez.BridiTestData; import io.github.magwas.inez.InezImpl; -import io.github.magwas.inez.TestConfig; +import io.github.magwas.inez.element.BridiElement; +import io.github.magwas.inez.element.BridiElementFactory; +import io.github.magwas.inez.element.BridiElementSystemInitializationService; +import io.github.magwas.inez.element.ElementConstants; import io.github.magwas.inez.storage.repository.BridiReferenceRepository; import io.github.magwas.inez.storage.repository.SumtiRepository; +import io.github.magwas.inez.tests.BridiTestData; +import io.github.magwas.inez.tests.TestConfig; @Tag("end-to-end") @ExtendWith(SpringExtension.class) @@ -52,7 +56,6 @@ void setUp() { @Test void test() throws IOException { assertSame(inez.getBridiReferenceRepository(), bridiReferenceRepository); - assertSame(bridiElementSystemInitialization.inez, inez); bridiElementSystemInitialization.apply(); BridiElement elementModel = bridiElementFactory.apply(ELEMENT_MODEL_ID); assertTrue(elementModel diff --git a/inez.model/src/test/java/io/github/magwas/inez/element/tests/BridiElementFactoryStub.java b/inez.model/src/test/java/io/github/magwas/inez/element/tests/BridiElementFactoryStub.java new file mode 100644 index 0000000..7ab8f1d --- /dev/null +++ b/inez.model/src/test/java/io/github/magwas/inez/element/tests/BridiElementFactoryStub.java @@ -0,0 +1,23 @@ +package io.github.magwas.inez.element.tests; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import java.lang.reflect.Constructor; + +import io.github.magwas.inez.element.BridiElement; +import io.github.magwas.inez.element.BridiElementFactory; + +public class BridiElementFactoryStub { + public static BridiElementFactory stub() throws NoSuchMethodException { + BridiElementFactory mock = mock(BridiElementFactory.class); + Constructor declaredConstructor = BridiElement.class.getDeclaredConstructor(String.class); + declaredConstructor.setAccessible(true); + when(mock.apply(any())).thenAnswer(invocation -> { + String argument = invocation.getArgument(0, String.class); + return declaredConstructor.newInstance(argument); + }); + return mock; + } +} diff --git a/inez.model/src/test/java/io/github/magwas/inez/element/tests/BridiElementSystemInitializationServiceStub.java b/inez.model/src/test/java/io/github/magwas/inez/element/tests/BridiElementSystemInitializationServiceStub.java new file mode 100644 index 0000000..5d2f75f --- /dev/null +++ b/inez.model/src/test/java/io/github/magwas/inez/element/tests/BridiElementSystemInitializationServiceStub.java @@ -0,0 +1,6 @@ +package io.github.magwas.inez.element.tests; + +import io.github.magwas.konveyor.testing.IndirectlyTested; + +@IndirectlyTested +public class BridiElementSystemInitializationServiceStub {} diff --git a/inez.model/src/test/java/io/github/magwas/inez/element/BridiElementSystemInitializationServiceTest.java b/inez.model/src/test/java/io/github/magwas/inez/element/tests/BridiElementSystemInitializationServiceTest.java similarity index 55% rename from inez.model/src/test/java/io/github/magwas/inez/element/BridiElementSystemInitializationServiceTest.java rename to inez.model/src/test/java/io/github/magwas/inez/element/tests/BridiElementSystemInitializationServiceTest.java index 75cbf09..c1d79eb 100644 --- a/inez.model/src/test/java/io/github/magwas/inez/element/BridiElementSystemInitializationServiceTest.java +++ b/inez.model/src/test/java/io/github/magwas/inez/element/tests/BridiElementSystemInitializationServiceTest.java @@ -1,4 +1,4 @@ -package io.github.magwas.inez.element; +package io.github.magwas.inez.element.tests; import static org.mockito.Mockito.verify; @@ -9,107 +9,118 @@ import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; -import io.github.magwas.testing.TestBase; +import io.github.magwas.inez.Inez; +import io.github.magwas.inez.InezImpl; +import io.github.magwas.inez.element.BridiElementSystemInitializationService; +import io.github.magwas.inez.element.ElementConstants; +import io.github.magwas.konveyor.runtime.LoggerService; +import io.github.magwas.konveyor.testing.TestBase; +import io.github.magwas.konveyor.testing.TestUtil; class BridiElementSystemInitializationServiceTest extends TestBase implements ElementConstants { @InjectMocks public BridiElementSystemInitializationService bridiElementSystemInitialization; + Inez inez; + LoggerService logger; + @BeforeEach @Override public void setUp() throws Throwable { super.setUp(); + inez = TestUtil.dependency(bridiElementSystemInitialization, InezImpl.class); + logger = TestUtil.dependency(bridiElementSystemInitialization, LoggerService.class); bridiElementSystemInitialization.apply(); } @Test @DisplayName("creates sumti IS_A") void test() throws IOException { - verify(bridiElementSystemInitialization.inez).createSumti(IS_A_ID, IS_A_REPR); + verify(inez).createSumti(IS_A_ID, IS_A_REPR); } @Test @DisplayName("creates sumti CONTAINS") void test1() throws IOException { - verify(bridiElementSystemInitialization.inez).createSumti(CONTAINS_ID, CONTAINS_REPR); + verify(inez).createSumti(CONTAINS_ID, CONTAINS_REPR); } @Test @DisplayName("creates sumti ROOT") void test2() throws IOException { - verify(bridiElementSystemInitialization.inez).createSumti(ROOT_ID, ROOT_ID); + verify(inez).createSumti(ROOT_ID, ROOT_ID); } @Test @DisplayName("creates sumti THING") void test3() throws IOException { - verify(bridiElementSystemInitialization.inez).createSumti(THING_ID, THING_ID); + verify(inez).createSumti(THING_ID, THING_ID); } @Test @DisplayName("creates sumti CONTAINER") void test4() throws IOException { - verify(bridiElementSystemInitialization.inez).createSumti(CONTAINER_ID, CONTAINER_ID); + verify(inez).createSumti(CONTAINER_ID, CONTAINER_ID); } @Test @DisplayName("creates sumti UNPLACED") void test5() throws IOException { - verify(bridiElementSystemInitialization.inez).createSumti(UNPLACED_ID, UNPLACED_ID); + verify(inez).createSumti(UNPLACED_ID, UNPLACED_ID); } @Test @DisplayName("creates sumti TRUE") void test6() throws IOException { - verify(bridiElementSystemInitialization.inez).createSumti(TRUE_ID, TRUE_ID); + verify(inez).createSumti(TRUE_ID, TRUE_ID); } @Test @DisplayName("creates sumti FALSE") void test7() throws IOException { - verify(bridiElementSystemInitialization.inez).createSumti(FALSE_ID, FALSE_ID); + verify(inez).createSumti(FALSE_ID, FALSE_ID); } @Test @DisplayName("creates sumti IS_FUNCTION_FOR") void test8() throws IOException { - verify(bridiElementSystemInitialization.inez).createSumti(IS_FUNCTION_FOR_ID, IS_FUNCTION_FOR_REPR); + verify(inez).createSumti(IS_FUNCTION_FOR_ID, IS_FUNCTION_FOR_REPR); } @Test @DisplayName("creates sumti SAVE_FUNCTION_REF") void test9() throws IOException { - verify(bridiElementSystemInitialization.inez).createSumti(SAVE_FUNCTION_REF_ID, SAVE_FUNCTION_REF_ID); + verify(inez).createSumti(SAVE_FUNCTION_REF_ID, SAVE_FUNCTION_REF_ID); } @Test @DisplayName("creates sumti DOSAVE") void test10() throws IOException { - verify(bridiElementSystemInitialization.inez).createSumti(DOSAVE_ID, DOSAVE_REPR); + verify(inez).createSumti(DOSAVE_ID, DOSAVE_REPR); } @Test @DisplayName("creates sumti DIAGRAM") void test11() throws IOException { - verify(bridiElementSystemInitialization.inez).createSumti(DIAGRAM_ID, DIAGRAM_ID); + verify(inez).createSumti(DIAGRAM_ID, DIAGRAM_ID); } @Test @DisplayName("creates sumti DIAGRAM_ELEMENT") void test12() throws IOException { - verify(bridiElementSystemInitialization.inez).createSumti(DIAGRAM_ELEMENT_ID, DIAGRAM_ELEMENT_REPR); + verify(inez).createSumti(DIAGRAM_ELEMENT_ID, DIAGRAM_ELEMENT_REPR); } @Test @DisplayName("creates bridis from the definition file") void test13() throws IOException { - verify(bridiElementSystemInitialization.inez).createFromdefinitions(ELEMENT_DEFINITIONS_RESOURCE); + verify(inez).createFromdefinitions(ELEMENT_DEFINITIONS_RESOURCE); } @Test @DisplayName("logs success") void test14() throws IOException { - verify(bridiElementSystemInitialization.logger).info("BridiElement system initialized"); + verify(logger).info("BridiElement system initialized"); } } diff --git a/inez.model/src/test/java/io/github/magwas/inez/element/BridiElementTestData.java b/inez.model/src/test/java/io/github/magwas/inez/element/tests/BridiElementTestData.java similarity index 73% rename from inez.model/src/test/java/io/github/magwas/inez/element/BridiElementTestData.java rename to inez.model/src/test/java/io/github/magwas/inez/element/tests/BridiElementTestData.java index 436308e..328cd9b 100644 --- a/inez.model/src/test/java/io/github/magwas/inez/element/BridiElementTestData.java +++ b/inez.model/src/test/java/io/github/magwas/inez/element/tests/BridiElementTestData.java @@ -1,8 +1,8 @@ -package io.github.magwas.inez.element; +package io.github.magwas.inez.element.tests; import java.util.Set; -import io.github.magwas.inez.parse.IdTestData; +import io.github.magwas.inez.parse.tests.IdTestData; public interface BridiElementTestData extends IdTestData { diff --git a/inez.model/src/test/java/io/github/magwas/inez/element/CreateBridiElementServiceTest.java b/inez.model/src/test/java/io/github/magwas/inez/element/tests/CreateBridiElementServiceTest.java similarity index 81% rename from inez.model/src/test/java/io/github/magwas/inez/element/CreateBridiElementServiceTest.java rename to inez.model/src/test/java/io/github/magwas/inez/element/tests/CreateBridiElementServiceTest.java index a57afaf..ef314cd 100644 --- a/inez.model/src/test/java/io/github/magwas/inez/element/CreateBridiElementServiceTest.java +++ b/inez.model/src/test/java/io/github/magwas/inez/element/tests/CreateBridiElementServiceTest.java @@ -1,4 +1,4 @@ -package io.github.magwas.inez.element; +package io.github.magwas.inez.element.tests; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -15,7 +15,11 @@ import org.mockito.InjectMocks; import io.github.magwas.inez.Bridi; -import io.github.magwas.testing.TestBase; +import io.github.magwas.inez.element.BridiElement; +import io.github.magwas.inez.element.CreateBridiElementService; +import io.github.magwas.inez.storage.SaveBridiService; +import io.github.magwas.konveyor.testing.TestBase; +import io.github.magwas.konveyor.testing.TestUtil; class CreateBridiElementServiceTest extends TestBase implements BridiElementTestData { @@ -32,7 +36,8 @@ public void setUp() throws Throwable { element = createBridiElement.apply(MY_MODEL_ID, HUMAN_ID, ALICE_REPR); @SuppressWarnings("unchecked") ArgumentCaptor> argument = ArgumentCaptor.forClass(List.class); - verify(createBridiElement.saveBridi).apply(argument.capture()); + SaveBridiService saveBridi = TestUtil.dependency(createBridiElement, SaveBridiService.class); + verify(saveBridi).apply(argument.capture()); saved = argument.getValue(); } @@ -46,19 +51,19 @@ void test0() { @DisplayName("the first one is the element") void test1() { String elementId = element.id; - assertEquals(elementId, saved.get(0).id()); + assertEquals(elementId, saved.getFirst().id()); } @Test @DisplayName("with the given representation") void test2() { - assertEquals(ALICE_REPR, saved.get(0).representation()); + assertEquals(ALICE_REPR, saved.getFirst().representation()); } @Test @DisplayName("and the given rerferences") void test3() { - assertEquals(List.of(), saved.get(0).references()); + assertEquals(List.of(), saved.getFirst().references()); } @Test @@ -91,11 +96,12 @@ void test5_1() { @Test @DisplayName("the references are saved") - void test6() { + void test6() throws IllegalAccessException { createBridiElement.apply(MY_MODEL_ID, HUMAN_ID, ALICE_REPR, IS_A_ID, ALICE_ID, GOD_ID); @SuppressWarnings("unchecked") ArgumentCaptor> argument = ArgumentCaptor.forClass(List.class); - verify(createBridiElement.saveBridi, times(2)).apply(argument.capture()); + verify(TestUtil.dependency(createBridiElement, SaveBridiService.class), times(2)) + .apply(argument.capture()); List saved = argument.getValue(); assertEquals(3, saved.size()); assertEquals(List.of(IS_A_ID, ALICE_ID, GOD_ID), saved.get(0).references()); diff --git a/inez.model/src/test/java/io/github/magwas/inez/element/IsInstanceServiceTest.java b/inez.model/src/test/java/io/github/magwas/inez/element/tests/IsInstanceServiceTest.java similarity index 85% rename from inez.model/src/test/java/io/github/magwas/inez/element/IsInstanceServiceTest.java rename to inez.model/src/test/java/io/github/magwas/inez/element/tests/IsInstanceServiceTest.java index 733e272..01a16f0 100644 --- a/inez.model/src/test/java/io/github/magwas/inez/element/IsInstanceServiceTest.java +++ b/inez.model/src/test/java/io/github/magwas/inez/element/tests/IsInstanceServiceTest.java @@ -1,4 +1,4 @@ -package io.github.magwas.inez.element; +package io.github.magwas.inez.element.tests; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -7,7 +7,8 @@ import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; -import io.github.magwas.testing.TestBase; +import io.github.magwas.inez.element.IsInstanceService; +import io.github.magwas.konveyor.testing.TestBase; class IsInstanceServiceTest extends TestBase implements BridiElementTestData { diff --git a/inez.model/src/test/java/io/github/magwas/inez/query/CreateBridisFromDefinitionServiceStub.java b/inez.model/src/test/java/io/github/magwas/inez/query/CreateBridisFromDefinitionServiceStub.java deleted file mode 100644 index 35d4341..0000000 --- a/inez.model/src/test/java/io/github/magwas/inez/query/CreateBridisFromDefinitionServiceStub.java +++ /dev/null @@ -1,6 +0,0 @@ -package io.github.magwas.inez.query; - -import io.github.magwas.testing.IndirectlyTested; - -@IndirectlyTested -public class CreateBridisFromDefinitionServiceStub {} diff --git a/inez.model/src/test/java/io/github/magwas/inez/query/CreateBridisFromParserOutputServiceStub.java b/inez.model/src/test/java/io/github/magwas/inez/query/CreateBridisFromParserOutputServiceStub.java deleted file mode 100644 index 0abca87..0000000 --- a/inez.model/src/test/java/io/github/magwas/inez/query/CreateBridisFromParserOutputServiceStub.java +++ /dev/null @@ -1,6 +0,0 @@ -package io.github.magwas.inez.query; - -import io.github.magwas.testing.IndirectlyTested; - -@IndirectlyTested -public class CreateBridisFromParserOutputServiceStub {} diff --git a/inez.model/src/test/java/io/github/magwas/inez/query/CreateBridisFromQueryServiceStub.java b/inez.model/src/test/java/io/github/magwas/inez/query/CreateBridisFromQueryServiceStub.java deleted file mode 100644 index 419d9f2..0000000 --- a/inez.model/src/test/java/io/github/magwas/inez/query/CreateBridisFromQueryServiceStub.java +++ /dev/null @@ -1,6 +0,0 @@ -package io.github.magwas.inez.query; - -import io.github.magwas.testing.IndirectlyTested; - -@IndirectlyTested -public class CreateBridisFromQueryServiceStub {} diff --git a/inez.model/src/test/java/io/github/magwas/inez/query/QueryProcessorServiceStub.java b/inez.model/src/test/java/io/github/magwas/inez/query/QueryProcessorServiceStub.java deleted file mode 100644 index 040ca6d..0000000 --- a/inez.model/src/test/java/io/github/magwas/inez/query/QueryProcessorServiceStub.java +++ /dev/null @@ -1,6 +0,0 @@ -package io.github.magwas.inez.query; - -import io.github.magwas.testing.IndirectlyTested; - -@IndirectlyTested -public class QueryProcessorServiceStub {} diff --git a/inez.model/src/test/java/io/github/magwas/inez/query/tests/CreateBridisFromDefinitionServiceStub.java b/inez.model/src/test/java/io/github/magwas/inez/query/tests/CreateBridisFromDefinitionServiceStub.java new file mode 100644 index 0000000..ace68d9 --- /dev/null +++ b/inez.model/src/test/java/io/github/magwas/inez/query/tests/CreateBridisFromDefinitionServiceStub.java @@ -0,0 +1,6 @@ +package io.github.magwas.inez.query.tests; + +import io.github.magwas.konveyor.testing.IndirectlyTested; + +@IndirectlyTested +public class CreateBridisFromDefinitionServiceStub {} diff --git a/inez.model/src/test/java/io/github/magwas/inez/query/tests/CreateBridisFromParserOutputServiceStub.java b/inez.model/src/test/java/io/github/magwas/inez/query/tests/CreateBridisFromParserOutputServiceStub.java new file mode 100644 index 0000000..a6bc4d0 --- /dev/null +++ b/inez.model/src/test/java/io/github/magwas/inez/query/tests/CreateBridisFromParserOutputServiceStub.java @@ -0,0 +1,6 @@ +package io.github.magwas.inez.query.tests; + +import io.github.magwas.konveyor.testing.IndirectlyTested; + +@IndirectlyTested +public class CreateBridisFromParserOutputServiceStub {} diff --git a/inez.model/src/test/java/io/github/magwas/inez/query/CreateBridisFromParserOutputTest.java b/inez.model/src/test/java/io/github/magwas/inez/query/tests/CreateBridisFromParserOutputTest.java similarity index 72% rename from inez.model/src/test/java/io/github/magwas/inez/query/CreateBridisFromParserOutputTest.java rename to inez.model/src/test/java/io/github/magwas/inez/query/tests/CreateBridisFromParserOutputTest.java index bf1cfd0..99bb271 100644 --- a/inez.model/src/test/java/io/github/magwas/inez/query/CreateBridisFromParserOutputTest.java +++ b/inez.model/src/test/java/io/github/magwas/inez/query/tests/CreateBridisFromParserOutputTest.java @@ -1,4 +1,4 @@ -package io.github.magwas.inez.query; +package io.github.magwas.inez.query.tests; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -10,10 +10,11 @@ import org.mockito.InjectMocks; import io.github.magwas.inez.Bridi; -import io.github.magwas.inez.BridiTestData; -import io.github.magwas.inez.parse.ParserOutputTestData; -import io.github.magwas.testing.TestBase; -import io.github.magwas.testing.TestUtil; +import io.github.magwas.inez.parse.tests.ParserOutputTestData; +import io.github.magwas.inez.query.CreateBridisFromParserOutputService; +import io.github.magwas.inez.tests.BridiTestData; +import io.github.magwas.konveyor.testing.TestBase; +import io.github.magwas.konveyor.testing.TestUtil; class CreateBridisFromParserOutputTest extends TestBase implements BridiTestData, ParserOutputTestData { @InjectMocks diff --git a/inez.model/src/test/java/io/github/magwas/inez/query/tests/CreateBridisFromQueryServiceStub.java b/inez.model/src/test/java/io/github/magwas/inez/query/tests/CreateBridisFromQueryServiceStub.java new file mode 100644 index 0000000..dc7ad27 --- /dev/null +++ b/inez.model/src/test/java/io/github/magwas/inez/query/tests/CreateBridisFromQueryServiceStub.java @@ -0,0 +1,6 @@ +package io.github.magwas.inez.query.tests; + +import io.github.magwas.konveyor.testing.IndirectlyTested; + +@IndirectlyTested +public class CreateBridisFromQueryServiceStub {} diff --git a/inez.model/src/test/java/io/github/magwas/inez/query/GetServiceByNameServiceStub.java b/inez.model/src/test/java/io/github/magwas/inez/query/tests/GetServiceByNameServiceStub.java similarity index 78% rename from inez.model/src/test/java/io/github/magwas/inez/query/GetServiceByNameServiceStub.java rename to inez.model/src/test/java/io/github/magwas/inez/query/tests/GetServiceByNameServiceStub.java index a98495c..bf3a35d 100644 --- a/inez.model/src/test/java/io/github/magwas/inez/query/GetServiceByNameServiceStub.java +++ b/inez.model/src/test/java/io/github/magwas/inez/query/tests/GetServiceByNameServiceStub.java @@ -1,4 +1,4 @@ -package io.github.magwas.inez.query; +package io.github.magwas.inez.query.tests; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -6,6 +6,8 @@ import org.springframework.beans.BeansException; import io.github.magwas.inez.element.ElementConstants; +import io.github.magwas.inez.query.BridiFunction; +import io.github.magwas.inez.query.GetServiceByNameService; public class GetServiceByNameServiceStub implements ElementConstants { public static GetServiceByNameService stub() throws BeansException, ClassNotFoundException { diff --git a/inez.model/src/test/java/io/github/magwas/inez/query/QueryProcessorEndToEndTest.java b/inez.model/src/test/java/io/github/magwas/inez/query/tests/QueryProcessorEndToEndTest.java similarity index 88% rename from inez.model/src/test/java/io/github/magwas/inez/query/QueryProcessorEndToEndTest.java rename to inez.model/src/test/java/io/github/magwas/inez/query/tests/QueryProcessorEndToEndTest.java index 3704e0e..f197244 100644 --- a/inez.model/src/test/java/io/github/magwas/inez/query/QueryProcessorEndToEndTest.java +++ b/inez.model/src/test/java/io/github/magwas/inez/query/tests/QueryProcessorEndToEndTest.java @@ -1,4 +1,4 @@ -package io.github.magwas.inez.query; +package io.github.magwas.inez.query.tests; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -16,12 +16,13 @@ import org.springframework.test.context.junit.jupiter.SpringExtension; import io.github.magwas.inez.Bridi; -import io.github.magwas.inez.BridiTestData; import io.github.magwas.inez.InezImpl; -import io.github.magwas.inez.TestConfig; -import io.github.magwas.inez.parse.InputTestData; -import io.github.magwas.runtime.LogUtil; -import io.github.magwas.testing.TestUtil; +import io.github.magwas.inez.parse.tests.InputTestData; +import io.github.magwas.inez.query.GetServiceByNameService; +import io.github.magwas.inez.tests.BridiTestData; +import io.github.magwas.inez.tests.TestConfig; +import io.github.magwas.konveyor.runtime.LogUtil; +import io.github.magwas.konveyor.testing.TestUtil; @Tag("end-to-end") @ExtendWith(SpringExtension.class) diff --git a/inez.model/src/test/java/io/github/magwas/inez/query/tests/QueryProcessorServiceStub.java b/inez.model/src/test/java/io/github/magwas/inez/query/tests/QueryProcessorServiceStub.java new file mode 100644 index 0000000..8d2980f --- /dev/null +++ b/inez.model/src/test/java/io/github/magwas/inez/query/tests/QueryProcessorServiceStub.java @@ -0,0 +1,6 @@ +package io.github.magwas.inez.query.tests; + +import io.github.magwas.konveyor.testing.IndirectlyTested; + +@IndirectlyTested +public class QueryProcessorServiceStub {} diff --git a/inez.model/src/test/java/io/github/magwas/inez/query/QueryProcessorTest.java b/inez.model/src/test/java/io/github/magwas/inez/query/tests/QueryProcessorTest.java similarity index 92% rename from inez.model/src/test/java/io/github/magwas/inez/query/QueryProcessorTest.java rename to inez.model/src/test/java/io/github/magwas/inez/query/tests/QueryProcessorTest.java index 41fe95d..17ec8a7 100644 --- a/inez.model/src/test/java/io/github/magwas/inez/query/QueryProcessorTest.java +++ b/inez.model/src/test/java/io/github/magwas/inez/query/tests/QueryProcessorTest.java @@ -1,4 +1,4 @@ -package io.github.magwas.inez.query; +package io.github.magwas.inez.query.tests; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -12,9 +12,10 @@ import io.github.magwas.inez.Bridi; import io.github.magwas.inez.parse.ParserConstants; -import io.github.magwas.runtime.LogUtil; -import io.github.magwas.testing.TestBase; -import io.github.magwas.testing.TestUtil; +import io.github.magwas.inez.query.QueryProcessorService; +import io.github.magwas.konveyor.runtime.LogUtil; +import io.github.magwas.konveyor.testing.TestBase; +import io.github.magwas.konveyor.testing.TestUtil; class QueryProcessorTest extends TestBase implements QueryProcessorTestData { diff --git a/inez.model/src/test/java/io/github/magwas/inez/query/QueryProcessorTestData.java b/inez.model/src/test/java/io/github/magwas/inez/query/tests/QueryProcessorTestData.java similarity index 80% rename from inez.model/src/test/java/io/github/magwas/inez/query/QueryProcessorTestData.java rename to inez.model/src/test/java/io/github/magwas/inez/query/tests/QueryProcessorTestData.java index 83746ef..ccd0582 100644 --- a/inez.model/src/test/java/io/github/magwas/inez/query/QueryProcessorTestData.java +++ b/inez.model/src/test/java/io/github/magwas/inez/query/tests/QueryProcessorTestData.java @@ -1,10 +1,10 @@ -package io.github.magwas.inez.query; +package io.github.magwas.inez.query.tests; import java.util.Set; import io.github.magwas.inez.Bridi; -import io.github.magwas.inez.BridiTestData; -import io.github.magwas.inez.parse.RepresentationTestData; +import io.github.magwas.inez.parse.tests.RepresentationTestData; +import io.github.magwas.inez.tests.BridiTestData; public interface QueryProcessorTestData extends RepresentationTestData, BridiTestData { String TEST_TEXT = diff --git a/inez.model/src/test/java/io/github/magwas/inez/storage/AddReferencesServiceStub.java b/inez.model/src/test/java/io/github/magwas/inez/storage/AddReferencesServiceStub.java deleted file mode 100644 index 3f93ea5..0000000 --- a/inez.model/src/test/java/io/github/magwas/inez/storage/AddReferencesServiceStub.java +++ /dev/null @@ -1,6 +0,0 @@ -package io.github.magwas.inez.storage; - -import io.github.magwas.testing.IndirectlyTested; - -@IndirectlyTested -public class AddReferencesServiceStub {} diff --git a/inez.model/src/test/java/io/github/magwas/inez/storage/AddReferencesTest.java b/inez.model/src/test/java/io/github/magwas/inez/storage/AddReferencesTest.java deleted file mode 100644 index b3ea365..0000000 --- a/inez.model/src/test/java/io/github/magwas/inez/storage/AddReferencesTest.java +++ /dev/null @@ -1,32 +0,0 @@ -package io.github.magwas.inez.storage; - -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyNoInteractions; - -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; -import org.mockito.InjectMocks; - -import io.github.magwas.inez.parse.ReferenceTestData; -import io.github.magwas.inez.storage.model.BridiReferenceTestData; -import io.github.magwas.testing.TestBase; - -class AddReferencesTest extends TestBase implements BridiReferenceTestData, ReferenceTestData { - @InjectMocks - AddReferencesService addReferences; - - @Test - @DisplayName("adds all the references of the bridi to the repository") - void test() { - addReferences.apply(SUMTI_IS_A_THING_ID, SUMTI_IS_A_THING_REFERENCES); - SUMTI_IS_A_THING_REFERENCELIST.forEach( - x -> verify(addReferences.bridiReferenceRepository).save(x)); - } - - @Test - @DisplayName("if references is null, does nothing") - void test1() { - addReferences.apply(SUMTI_IS_A_THING_ID, null); - verifyNoInteractions(addReferences.bridiReferenceRepository); - } -} diff --git a/inez.model/src/test/java/io/github/magwas/inez/storage/BridiStoreChangeListenersServiceStub.java b/inez.model/src/test/java/io/github/magwas/inez/storage/BridiStoreChangeListenersServiceStub.java deleted file mode 100644 index 4a9aafe..0000000 --- a/inez.model/src/test/java/io/github/magwas/inez/storage/BridiStoreChangeListenersServiceStub.java +++ /dev/null @@ -1,6 +0,0 @@ -package io.github.magwas.inez.storage; - -import io.github.magwas.testing.IndirectlyTested; - -@IndirectlyTested -public class BridiStoreChangeListenersServiceStub {} diff --git a/inez.model/src/test/java/io/github/magwas/inez/storage/CreateSumtiServiceStub.java b/inez.model/src/test/java/io/github/magwas/inez/storage/CreateSumtiServiceStub.java deleted file mode 100644 index 02d6b9a..0000000 --- a/inez.model/src/test/java/io/github/magwas/inez/storage/CreateSumtiServiceStub.java +++ /dev/null @@ -1,6 +0,0 @@ -package io.github.magwas.inez.storage; - -import io.github.magwas.testing.IndirectlyTested; - -@IndirectlyTested -public class CreateSumtiServiceStub {} diff --git a/inez.model/src/test/java/io/github/magwas/inez/storage/DeleteBridiServiceStub.java b/inez.model/src/test/java/io/github/magwas/inez/storage/DeleteBridiServiceStub.java deleted file mode 100644 index 9610a94..0000000 --- a/inez.model/src/test/java/io/github/magwas/inez/storage/DeleteBridiServiceStub.java +++ /dev/null @@ -1,6 +0,0 @@ -package io.github.magwas.inez.storage; - -import io.github.magwas.testing.IndirectlyTested; - -@IndirectlyTested -public class DeleteBridiServiceStub {} diff --git a/inez.model/src/test/java/io/github/magwas/inez/storage/NotifyStoreChangeServiceStub.java b/inez.model/src/test/java/io/github/magwas/inez/storage/NotifyStoreChangeServiceStub.java deleted file mode 100644 index 4218ea2..0000000 --- a/inez.model/src/test/java/io/github/magwas/inez/storage/NotifyStoreChangeServiceStub.java +++ /dev/null @@ -1,6 +0,0 @@ -package io.github.magwas.inez.storage; - -import io.github.magwas.testing.IndirectlyTested; - -@IndirectlyTested -public class NotifyStoreChangeServiceStub {} diff --git a/inez.model/src/test/java/io/github/magwas/inez/storage/RemoveReferencesServiceStub.java b/inez.model/src/test/java/io/github/magwas/inez/storage/RemoveReferencesServiceStub.java deleted file mode 100644 index 9df413f..0000000 --- a/inez.model/src/test/java/io/github/magwas/inez/storage/RemoveReferencesServiceStub.java +++ /dev/null @@ -1,6 +0,0 @@ -package io.github.magwas.inez.storage; - -import io.github.magwas.testing.IndirectlyTested; - -@IndirectlyTested -public class RemoveReferencesServiceStub {} diff --git a/inez.model/src/test/java/io/github/magwas/inez/storage/RemoveReferencesTest.java b/inez.model/src/test/java/io/github/magwas/inez/storage/RemoveReferencesTest.java deleted file mode 100644 index 109e103..0000000 --- a/inez.model/src/test/java/io/github/magwas/inez/storage/RemoveReferencesTest.java +++ /dev/null @@ -1,29 +0,0 @@ -package io.github.magwas.inez.storage; - -import static org.mockito.Mockito.verify; - -import java.util.stream.IntStream; - -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; -import org.mockito.InjectMocks; - -import io.github.magwas.inez.BridiTestData; -import io.github.magwas.testing.TestBase; - -class RemoveReferencesTest extends TestBase implements BridiTestData { - - @InjectMocks - RemoveReferencesService removeReferences; - - @Test - @DisplayName("removes references from the BridiReferenceRepository\n" - + "- removes all the sumti references for the bridi") - void test() { - removeReferences.apply(SUMTI_IS_A_THING_ID, SUMTI_IS_A_THING_REFERENCES); - IntStream.range(0, SUMTI_IS_A_THING_REFERENCES.size() - 1) - .forEach(position -> verify(removeReferences.bridiReferenceRepository) - .deleteBybridiIdAndPositionAndSumtiId( - SUMTI_IS_A_THING_ID, position, SUMTI_IS_A_THING_REFERENCES.get(position))); - } -} diff --git a/inez.model/src/test/java/io/github/magwas/inez/storage/SaveBridiServiceStub.java b/inez.model/src/test/java/io/github/magwas/inez/storage/SaveBridiServiceStub.java deleted file mode 100644 index e018b3d..0000000 --- a/inez.model/src/test/java/io/github/magwas/inez/storage/SaveBridiServiceStub.java +++ /dev/null @@ -1,6 +0,0 @@ -package io.github.magwas.inez.storage; - -import io.github.magwas.testing.IndirectlyTested; - -@IndirectlyTested -public class SaveBridiServiceStub {} diff --git a/inez.model/src/test/java/io/github/magwas/inez/storage/repository/BridiStoreHistoryServiceStub.java b/inez.model/src/test/java/io/github/magwas/inez/storage/repository/BridiStoreHistoryServiceStub.java deleted file mode 100644 index 1f84840..0000000 --- a/inez.model/src/test/java/io/github/magwas/inez/storage/repository/BridiStoreHistoryServiceStub.java +++ /dev/null @@ -1,6 +0,0 @@ -package io.github.magwas.inez.storage.repository; - -import io.github.magwas.testing.IndirectlyTested; - -@IndirectlyTested -public class BridiStoreHistoryServiceStub {} diff --git a/inez.model/src/test/java/io/github/magwas/inez/storage/repository/BridiReferenceRepositoryStub.java b/inez.model/src/test/java/io/github/magwas/inez/storage/repository/tests/BridiReferenceRepositoryStub.java similarity index 79% rename from inez.model/src/test/java/io/github/magwas/inez/storage/repository/BridiReferenceRepositoryStub.java rename to inez.model/src/test/java/io/github/magwas/inez/storage/repository/tests/BridiReferenceRepositoryStub.java index 266b36d..4dcdbb9 100644 --- a/inez.model/src/test/java/io/github/magwas/inez/storage/repository/BridiReferenceRepositoryStub.java +++ b/inez.model/src/test/java/io/github/magwas/inez/storage/repository/tests/BridiReferenceRepositoryStub.java @@ -1,11 +1,12 @@ -package io.github.magwas.inez.storage.repository; +package io.github.magwas.inez.storage.repository.tests; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import java.util.Set; -import io.github.magwas.inez.storage.model.BridiReferenceTestData; +import io.github.magwas.inez.storage.model.tests.BridiReferenceTestData; +import io.github.magwas.inez.storage.repository.BridiReferenceRepository; public class BridiReferenceRepositoryStub implements BridiReferenceTestData { diff --git a/inez.model/src/test/java/io/github/magwas/inez/storage/repository/BridiStoreHistoryRepositoryStub.java b/inez.model/src/test/java/io/github/magwas/inez/storage/repository/tests/BridiStoreHistoryRepositoryStub.java similarity index 58% rename from inez.model/src/test/java/io/github/magwas/inez/storage/repository/BridiStoreHistoryRepositoryStub.java rename to inez.model/src/test/java/io/github/magwas/inez/storage/repository/tests/BridiStoreHistoryRepositoryStub.java index 40b5f6a..0351a4f 100644 --- a/inez.model/src/test/java/io/github/magwas/inez/storage/repository/BridiStoreHistoryRepositoryStub.java +++ b/inez.model/src/test/java/io/github/magwas/inez/storage/repository/tests/BridiStoreHistoryRepositoryStub.java @@ -1,7 +1,9 @@ -package io.github.magwas.inez.storage.repository; +package io.github.magwas.inez.storage.repository.tests; import static org.mockito.Mockito.mock; +import io.github.magwas.inez.storage.repository.BridiStoreHistoryRepository; + public class BridiStoreHistoryRepositoryStub { static BridiStoreHistoryRepository stub() { return mock(BridiStoreHistoryRepository.class); diff --git a/inez.model/src/test/java/io/github/magwas/inez/storage/repository/tests/BridiStoreHistoryServiceStub.java b/inez.model/src/test/java/io/github/magwas/inez/storage/repository/tests/BridiStoreHistoryServiceStub.java new file mode 100644 index 0000000..ed41541 --- /dev/null +++ b/inez.model/src/test/java/io/github/magwas/inez/storage/repository/tests/BridiStoreHistoryServiceStub.java @@ -0,0 +1,6 @@ +package io.github.magwas.inez.storage.repository.tests; + +import io.github.magwas.konveyor.testing.IndirectlyTested; + +@IndirectlyTested +public class BridiStoreHistoryServiceStub {} diff --git a/inez.model/src/test/java/io/github/magwas/inez/storage/repository/ProblemRepositoryStub.java b/inez.model/src/test/java/io/github/magwas/inez/storage/repository/tests/ProblemRepositoryStub.java similarity index 63% rename from inez.model/src/test/java/io/github/magwas/inez/storage/repository/ProblemRepositoryStub.java rename to inez.model/src/test/java/io/github/magwas/inez/storage/repository/tests/ProblemRepositoryStub.java index b76699a..f0d9e85 100644 --- a/inez.model/src/test/java/io/github/magwas/inez/storage/repository/ProblemRepositoryStub.java +++ b/inez.model/src/test/java/io/github/magwas/inez/storage/repository/tests/ProblemRepositoryStub.java @@ -1,9 +1,10 @@ -package io.github.magwas.inez.storage.repository; +package io.github.magwas.inez.storage.repository.tests; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import io.github.magwas.inez.InezProblemTestData; +import io.github.magwas.inez.storage.repository.ProblemRepository; +import io.github.magwas.inez.tests.InezProblemTestData; public class ProblemRepositoryStub implements InezProblemTestData { static ProblemRepository stub() { diff --git a/inez.model/src/test/java/io/github/magwas/inez/storage/tests/AddReferencesServiceStub.java b/inez.model/src/test/java/io/github/magwas/inez/storage/tests/AddReferencesServiceStub.java new file mode 100644 index 0000000..e72b909 --- /dev/null +++ b/inez.model/src/test/java/io/github/magwas/inez/storage/tests/AddReferencesServiceStub.java @@ -0,0 +1,6 @@ +package io.github.magwas.inez.storage.tests; + +import io.github.magwas.konveyor.testing.IndirectlyTested; + +@IndirectlyTested +public class AddReferencesServiceStub {} diff --git a/inez.model/src/test/java/io/github/magwas/inez/storage/AddReferencesServiceTest.java b/inez.model/src/test/java/io/github/magwas/inez/storage/tests/AddReferencesServiceTest.java similarity index 63% rename from inez.model/src/test/java/io/github/magwas/inez/storage/AddReferencesServiceTest.java rename to inez.model/src/test/java/io/github/magwas/inez/storage/tests/AddReferencesServiceTest.java index e41f0c6..9acbfd7 100644 --- a/inez.model/src/test/java/io/github/magwas/inez/storage/AddReferencesServiceTest.java +++ b/inez.model/src/test/java/io/github/magwas/inez/storage/tests/AddReferencesServiceTest.java @@ -1,4 +1,4 @@ -package io.github.magwas.inez.storage; +package io.github.magwas.inez.storage.tests; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.times; @@ -12,9 +12,12 @@ import org.mockito.ArgumentCaptor; import org.mockito.InjectMocks; -import io.github.magwas.inez.parse.IdTestData; +import io.github.magwas.inez.parse.tests.IdTestData; +import io.github.magwas.inez.storage.AddReferencesService; import io.github.magwas.inez.storage.model.BridiReference; -import io.github.magwas.testing.TestBase; +import io.github.magwas.inez.storage.repository.BridiReferenceRepository; +import io.github.magwas.konveyor.testing.TestBase; +import io.github.magwas.konveyor.testing.TestUtil; class AddReferencesServiceTest extends TestBase implements IdTestData { @@ -23,24 +26,25 @@ class AddReferencesServiceTest extends TestBase implements IdTestData { @Test @DisplayName("for null references does nothing") - void test() { + void test() throws IllegalAccessException { addReferences.apply(ALICE_ID, null); - verifyNoInteractions(addReferences.bridiReferenceRepository); + verifyNoInteractions(TestUtil.dependency(addReferences, BridiReferenceRepository.class)); } @Test @DisplayName("for empty references does nothing") - void test1() { + void test1() throws IllegalAccessException { addReferences.apply(ALICE_ID, List.of()); - verifyNoInteractions(addReferences.bridiReferenceRepository); + verifyNoInteractions(TestUtil.dependency(addReferences, BridiReferenceRepository.class)); } @Test @DisplayName("for each reference adds an entry to the bridireferencerepository") - void test2() { + void test2() throws IllegalAccessException { addReferences.apply(ALICE_ID, List.of(IS_A_ID, SUMTI_ID)); ArgumentCaptor argument = ArgumentCaptor.forClass(BridiReference.class); - verify(addReferences.bridiReferenceRepository, times(2)).save(argument.capture()); + verify(TestUtil.dependency(addReferences, BridiReferenceRepository.class), times(2)) + .save(argument.capture()); List values = argument.getAllValues(); assertEquals(ALICE_ID, values.get(0).bridiId()); assertEquals(ALICE_ID, values.get(1).bridiId()); diff --git a/inez.model/src/test/java/io/github/magwas/inez/storage/tests/AddReferencesTest.java b/inez.model/src/test/java/io/github/magwas/inez/storage/tests/AddReferencesTest.java new file mode 100644 index 0000000..2b920c2 --- /dev/null +++ b/inez.model/src/test/java/io/github/magwas/inez/storage/tests/AddReferencesTest.java @@ -0,0 +1,35 @@ +package io.github.magwas.inez.storage.tests; + +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoInteractions; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.mockito.InjectMocks; + +import io.github.magwas.inez.parse.tests.ReferenceTestData; +import io.github.magwas.inez.storage.AddReferencesService; +import io.github.magwas.inez.storage.model.tests.BridiReferenceTestData; +import io.github.magwas.inez.storage.repository.BridiReferenceRepository; +import io.github.magwas.konveyor.testing.TestBase; +import io.github.magwas.konveyor.testing.TestUtil; + +class AddReferencesTest extends TestBase implements BridiReferenceTestData, ReferenceTestData { + @InjectMocks + AddReferencesService addReferences; + + @Test + @DisplayName("adds all the references of the bridi to the repository") + void test() throws IllegalAccessException { + addReferences.apply(SUMTI_IS_A_THING_ID, SUMTI_IS_A_THING_REFERENCES); + BridiReferenceRepository dependency = TestUtil.dependency(addReferences, BridiReferenceRepository.class); + SUMTI_IS_A_THING_REFERENCELIST.forEach(x -> verify(dependency).save(x)); + } + + @Test + @DisplayName("if references is null, does nothing") + void test1() throws IllegalAccessException { + addReferences.apply(SUMTI_IS_A_THING_ID, null); + verifyNoInteractions(TestUtil.dependency(addReferences, BridiReferenceRepository.class)); + } +} diff --git a/inez.model/src/test/java/io/github/magwas/inez/storage/tests/BridiStoreChangeListenersServiceStub.java b/inez.model/src/test/java/io/github/magwas/inez/storage/tests/BridiStoreChangeListenersServiceStub.java new file mode 100644 index 0000000..3b4e022 --- /dev/null +++ b/inez.model/src/test/java/io/github/magwas/inez/storage/tests/BridiStoreChangeListenersServiceStub.java @@ -0,0 +1,6 @@ +package io.github.magwas.inez.storage.tests; + +import io.github.magwas.konveyor.testing.IndirectlyTested; + +@IndirectlyTested +public class BridiStoreChangeListenersServiceStub {} diff --git a/inez.model/src/test/java/io/github/magwas/inez/storage/BridiStoreEndToEndTest.java b/inez.model/src/test/java/io/github/magwas/inez/storage/tests/BridiStoreEndToEndTest.java similarity index 86% rename from inez.model/src/test/java/io/github/magwas/inez/storage/BridiStoreEndToEndTest.java rename to inez.model/src/test/java/io/github/magwas/inez/storage/tests/BridiStoreEndToEndTest.java index 985aa84..5593f31 100644 --- a/inez.model/src/test/java/io/github/magwas/inez/storage/BridiStoreEndToEndTest.java +++ b/inez.model/src/test/java/io/github/magwas/inez/storage/tests/BridiStoreEndToEndTest.java @@ -1,4 +1,4 @@ -package io.github.magwas.inez.storage; +package io.github.magwas.inez.storage.tests; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -14,12 +14,12 @@ import org.springframework.test.context.junit.jupiter.SpringExtension; import io.github.magwas.inez.Bridi; -import io.github.magwas.inez.BridiTestData; import io.github.magwas.inez.InezImpl; -import io.github.magwas.inez.TestConfig; -import io.github.magwas.inez.query.QueryProcessorTestData; -import io.github.magwas.runtime.LogUtil; -import io.github.magwas.testing.TestUtil; +import io.github.magwas.inez.query.tests.QueryProcessorTestData; +import io.github.magwas.inez.tests.BridiTestData; +import io.github.magwas.inez.tests.TestConfig; +import io.github.magwas.konveyor.runtime.LogUtil; +import io.github.magwas.konveyor.testing.TestUtil; @Tag("end-to-end") @ExtendWith(SpringExtension.class) diff --git a/inez.model/src/test/java/io/github/magwas/inez/storage/CreateBridiFromSumtiServiceStub.java b/inez.model/src/test/java/io/github/magwas/inez/storage/tests/CreateBridiFromSumtiServiceStub.java similarity index 75% rename from inez.model/src/test/java/io/github/magwas/inez/storage/CreateBridiFromSumtiServiceStub.java rename to inez.model/src/test/java/io/github/magwas/inez/storage/tests/CreateBridiFromSumtiServiceStub.java index 974b528..e6a41cb 100644 --- a/inez.model/src/test/java/io/github/magwas/inez/storage/CreateBridiFromSumtiServiceStub.java +++ b/inez.model/src/test/java/io/github/magwas/inez/storage/tests/CreateBridiFromSumtiServiceStub.java @@ -1,10 +1,11 @@ -package io.github.magwas.inez.storage; +package io.github.magwas.inez.storage.tests; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import io.github.magwas.inez.BridiTestData; -import io.github.magwas.inez.storage.model.SumtiTestData; +import io.github.magwas.inez.storage.CreateBridiFromSumtiService; +import io.github.magwas.inez.storage.model.tests.SumtiTestData; +import io.github.magwas.inez.tests.BridiTestData; public class CreateBridiFromSumtiServiceStub implements BridiTestData, SumtiTestData { public static CreateBridiFromSumtiService stub() { diff --git a/inez.model/src/test/java/io/github/magwas/inez/storage/CreateBridiFromSumtiTest.java b/inez.model/src/test/java/io/github/magwas/inez/storage/tests/CreateBridiFromSumtiTest.java similarity index 64% rename from inez.model/src/test/java/io/github/magwas/inez/storage/CreateBridiFromSumtiTest.java rename to inez.model/src/test/java/io/github/magwas/inez/storage/tests/CreateBridiFromSumtiTest.java index 6849c48..5fcbffc 100644 --- a/inez.model/src/test/java/io/github/magwas/inez/storage/CreateBridiFromSumtiTest.java +++ b/inez.model/src/test/java/io/github/magwas/inez/storage/tests/CreateBridiFromSumtiTest.java @@ -1,4 +1,4 @@ -package io.github.magwas.inez.storage; +package io.github.magwas.inez.storage.tests; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -6,9 +6,10 @@ import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; -import io.github.magwas.inez.BridiTestData; -import io.github.magwas.inez.storage.model.SumtiTestData; -import io.github.magwas.testing.TestBase; +import io.github.magwas.inez.storage.CreateBridiFromSumtiService; +import io.github.magwas.inez.storage.model.tests.SumtiTestData; +import io.github.magwas.inez.tests.BridiTestData; +import io.github.magwas.konveyor.testing.TestBase; class CreateBridiFromSumtiTest extends TestBase implements BridiTestData, SumtiTestData { diff --git a/inez.model/src/test/java/io/github/magwas/inez/storage/tests/CreateSumtiServiceStub.java b/inez.model/src/test/java/io/github/magwas/inez/storage/tests/CreateSumtiServiceStub.java new file mode 100644 index 0000000..44aa7e9 --- /dev/null +++ b/inez.model/src/test/java/io/github/magwas/inez/storage/tests/CreateSumtiServiceStub.java @@ -0,0 +1,6 @@ +package io.github.magwas.inez.storage.tests; + +import io.github.magwas.konveyor.testing.IndirectlyTested; + +@IndirectlyTested +public class CreateSumtiServiceStub {} diff --git a/inez.model/src/test/java/io/github/magwas/inez/storage/tests/DeleteBridiServiceStub.java b/inez.model/src/test/java/io/github/magwas/inez/storage/tests/DeleteBridiServiceStub.java new file mode 100644 index 0000000..eff0b8f --- /dev/null +++ b/inez.model/src/test/java/io/github/magwas/inez/storage/tests/DeleteBridiServiceStub.java @@ -0,0 +1,6 @@ +package io.github.magwas.inez.storage.tests; + +import io.github.magwas.konveyor.testing.IndirectlyTested; + +@IndirectlyTested +public class DeleteBridiServiceStub {} diff --git a/inez.model/src/test/java/io/github/magwas/inez/storage/DeleteBridiTest.java b/inez.model/src/test/java/io/github/magwas/inez/storage/tests/DeleteBridiTest.java similarity index 53% rename from inez.model/src/test/java/io/github/magwas/inez/storage/DeleteBridiTest.java rename to inez.model/src/test/java/io/github/magwas/inez/storage/tests/DeleteBridiTest.java index a7451d8..0d2c41f 100644 --- a/inez.model/src/test/java/io/github/magwas/inez/storage/DeleteBridiTest.java +++ b/inez.model/src/test/java/io/github/magwas/inez/storage/tests/DeleteBridiTest.java @@ -1,4 +1,4 @@ -package io.github.magwas.inez.storage; +package io.github.magwas.inez.storage.tests; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -11,9 +11,14 @@ import org.mockito.InjectMocks; import io.github.magwas.inez.BridiStoreOperation; -import io.github.magwas.inez.BridiTestData; -import io.github.magwas.inez.storage.model.SumtiTestData; -import io.github.magwas.testing.TestBase; +import io.github.magwas.inez.storage.DeleteBridiService; +import io.github.magwas.inez.storage.NotifyStoreChangeService; +import io.github.magwas.inez.storage.RemoveReferencesService; +import io.github.magwas.inez.storage.model.tests.SumtiTestData; +import io.github.magwas.inez.storage.repository.SumtiRepository; +import io.github.magwas.inez.tests.BridiTestData; +import io.github.magwas.konveyor.testing.TestBase; +import io.github.magwas.konveyor.testing.TestUtil; class DeleteBridiTest extends TestBase implements BridiTestData, SumtiTestData { @@ -34,22 +39,24 @@ void test3() { @Test @DisplayName("- the references are cleared") - void test() { + void test() throws IllegalAccessException { deleteBridi.apply(SUMTI_IS_A_THING); - verify(deleteBridi.removeReferences).apply(SUMTI_IS_A_THING_ID, SUMTI_IS_A_THING.references()); + verify(TestUtil.dependency(deleteBridi, RemoveReferencesService.class)) + .apply(SUMTI_IS_A_THING_ID, SUMTI_IS_A_THING.references()); } @Test @DisplayName("- the id and representation are cleared from the repository") - void test1() { + void test1() throws IllegalAccessException { deleteBridi.apply(SUMTI_IS_A_THING); - verify(deleteBridi.sumtiRepository).delete(SUMTI_IS_A_THING_SUMTI); + verify(TestUtil.dependency(deleteBridi, SumtiRepository.class)).delete(SUMTI_IS_A_THING_SUMTI); } @Test @DisplayName("- notifies about the store change") - void test2() { + void test2() throws IllegalAccessException { deleteBridi.apply(SUMTI_IS_A_THING); - verify(deleteBridi.notifyStoreChange).apply(BridiStoreOperation.DELETE, SUMTI_IS_A_THING, null); + verify(TestUtil.dependency(deleteBridi, NotifyStoreChangeService.class)) + .apply(BridiStoreOperation.DELETE, SUMTI_IS_A_THING, null); } } diff --git a/inez.model/src/test/java/io/github/magwas/inez/storage/FindAllByRepresentationTest.java b/inez.model/src/test/java/io/github/magwas/inez/storage/tests/FindAllByRepresentationTest.java similarity index 72% rename from inez.model/src/test/java/io/github/magwas/inez/storage/FindAllByRepresentationTest.java rename to inez.model/src/test/java/io/github/magwas/inez/storage/tests/FindAllByRepresentationTest.java index 989a247..8fd9b1e 100644 --- a/inez.model/src/test/java/io/github/magwas/inez/storage/FindAllByRepresentationTest.java +++ b/inez.model/src/test/java/io/github/magwas/inez/storage/tests/FindAllByRepresentationTest.java @@ -1,4 +1,4 @@ -package io.github.magwas.inez.storage; +package io.github.magwas.inez.storage.tests; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -9,8 +9,9 @@ import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; -import io.github.magwas.inez.BridiTestData; -import io.github.magwas.testing.TestBase; +import io.github.magwas.inez.storage.FindAllByRepresentationService; +import io.github.magwas.inez.tests.BridiTestData; +import io.github.magwas.konveyor.testing.TestBase; class FindAllByRepresentationTest extends TestBase implements BridiTestData { diff --git a/inez.model/src/test/java/io/github/magwas/inez/storage/FindAllIdByRepresentationTest.java b/inez.model/src/test/java/io/github/magwas/inez/storage/tests/FindAllIdByRepresentationTest.java similarity index 73% rename from inez.model/src/test/java/io/github/magwas/inez/storage/FindAllIdByRepresentationTest.java rename to inez.model/src/test/java/io/github/magwas/inez/storage/tests/FindAllIdByRepresentationTest.java index 516dec9..b76cfe9 100644 --- a/inez.model/src/test/java/io/github/magwas/inez/storage/FindAllIdByRepresentationTest.java +++ b/inez.model/src/test/java/io/github/magwas/inez/storage/tests/FindAllIdByRepresentationTest.java @@ -1,4 +1,4 @@ -package io.github.magwas.inez.storage; +package io.github.magwas.inez.storage.tests; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -9,8 +9,9 @@ import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; -import io.github.magwas.inez.parse.IdTestData; -import io.github.magwas.testing.TestBase; +import io.github.magwas.inez.parse.tests.IdTestData; +import io.github.magwas.inez.storage.FindAllIdByRepresentationService; +import io.github.magwas.konveyor.testing.TestBase; class FindAllIdByRepresentationTest extends TestBase implements IdTestData { @InjectMocks diff --git a/inez.model/src/test/java/io/github/magwas/inez/storage/FindBridiByIdServiceStub.java b/inez.model/src/test/java/io/github/magwas/inez/storage/tests/FindBridiByIdServiceStub.java similarity index 90% rename from inez.model/src/test/java/io/github/magwas/inez/storage/FindBridiByIdServiceStub.java rename to inez.model/src/test/java/io/github/magwas/inez/storage/tests/FindBridiByIdServiceStub.java index fdbe7d2..cc66b98 100644 --- a/inez.model/src/test/java/io/github/magwas/inez/storage/FindBridiByIdServiceStub.java +++ b/inez.model/src/test/java/io/github/magwas/inez/storage/tests/FindBridiByIdServiceStub.java @@ -1,12 +1,13 @@ -package io.github.magwas.inez.storage; +package io.github.magwas.inez.storage.tests; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import java.util.Optional; -import io.github.magwas.inez.BridiTestData; import io.github.magwas.inez.parse.ParserConstants; +import io.github.magwas.inez.storage.FindBridiByIdService; +import io.github.magwas.inez.tests.BridiTestData; public class FindBridiByIdServiceStub implements BridiTestData { public static FindBridiByIdService stub() { diff --git a/inez.model/src/test/java/io/github/magwas/inez/storage/FindBridiByIdTest.java b/inez.model/src/test/java/io/github/magwas/inez/storage/tests/FindBridiByIdTest.java similarity index 75% rename from inez.model/src/test/java/io/github/magwas/inez/storage/FindBridiByIdTest.java rename to inez.model/src/test/java/io/github/magwas/inez/storage/tests/FindBridiByIdTest.java index 24c7da2..294681d 100644 --- a/inez.model/src/test/java/io/github/magwas/inez/storage/FindBridiByIdTest.java +++ b/inez.model/src/test/java/io/github/magwas/inez/storage/tests/FindBridiByIdTest.java @@ -1,4 +1,4 @@ -package io.github.magwas.inez.storage; +package io.github.magwas.inez.storage.tests; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -8,8 +8,9 @@ import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; -import io.github.magwas.inez.BridiTestData; -import io.github.magwas.testing.TestBase; +import io.github.magwas.inez.storage.FindBridiByIdService; +import io.github.magwas.inez.tests.BridiTestData; +import io.github.magwas.konveyor.testing.TestBase; class FindBridiByIdTest extends TestBase implements BridiTestData { diff --git a/inez.model/src/test/java/io/github/magwas/inez/storage/GetBridiIdBySelbriAndSumtiIdsServiceStub.java b/inez.model/src/test/java/io/github/magwas/inez/storage/tests/GetBridiIdBySelbriAndSumtiIdsServiceStub.java similarity index 86% rename from inez.model/src/test/java/io/github/magwas/inez/storage/GetBridiIdBySelbriAndSumtiIdsServiceStub.java rename to inez.model/src/test/java/io/github/magwas/inez/storage/tests/GetBridiIdBySelbriAndSumtiIdsServiceStub.java index ab6e537..b18dfc4 100644 --- a/inez.model/src/test/java/io/github/magwas/inez/storage/GetBridiIdBySelbriAndSumtiIdsServiceStub.java +++ b/inez.model/src/test/java/io/github/magwas/inez/storage/tests/GetBridiIdBySelbriAndSumtiIdsServiceStub.java @@ -1,11 +1,12 @@ -package io.github.magwas.inez.storage; +package io.github.magwas.inez.storage.tests; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import java.util.stream.Stream; -import io.github.magwas.inez.parse.IdTestData; +import io.github.magwas.inez.parse.tests.IdTestData; +import io.github.magwas.inez.storage.GetBridiIdBySelbriAndSumtiIdsService; public class GetBridiIdBySelbriAndSumtiIdsServiceStub implements IdTestData { public static GetBridiIdBySelbriAndSumtiIdsService stub() { diff --git a/inez.model/src/test/java/io/github/magwas/inez/storage/GetBridiIdBySelbriAndSumtiIdsTest.java b/inez.model/src/test/java/io/github/magwas/inez/storage/tests/GetBridiIdBySelbriAndSumtiIdsTest.java similarity index 78% rename from inez.model/src/test/java/io/github/magwas/inez/storage/GetBridiIdBySelbriAndSumtiIdsTest.java rename to inez.model/src/test/java/io/github/magwas/inez/storage/tests/GetBridiIdBySelbriAndSumtiIdsTest.java index 9f4226f..b36492e 100644 --- a/inez.model/src/test/java/io/github/magwas/inez/storage/GetBridiIdBySelbriAndSumtiIdsTest.java +++ b/inez.model/src/test/java/io/github/magwas/inez/storage/tests/GetBridiIdBySelbriAndSumtiIdsTest.java @@ -1,4 +1,4 @@ -package io.github.magwas.inez.storage; +package io.github.magwas.inez.storage.tests; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -9,8 +9,9 @@ import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; -import io.github.magwas.inez.BridiTestData; -import io.github.magwas.testing.TestBase; +import io.github.magwas.inez.storage.GetBridiIdBySelbriAndSumtiIdsService; +import io.github.magwas.inez.tests.BridiTestData; +import io.github.magwas.konveyor.testing.TestBase; class GetBridiIdBySelbriAndSumtiIdsTest extends TestBase implements BridiTestData { diff --git a/inez.model/src/test/java/io/github/magwas/inez/storage/tests/NotifyStoreChangeServiceStub.java b/inez.model/src/test/java/io/github/magwas/inez/storage/tests/NotifyStoreChangeServiceStub.java new file mode 100644 index 0000000..f9a8266 --- /dev/null +++ b/inez.model/src/test/java/io/github/magwas/inez/storage/tests/NotifyStoreChangeServiceStub.java @@ -0,0 +1,6 @@ +package io.github.magwas.inez.storage.tests; + +import io.github.magwas.konveyor.testing.IndirectlyTested; + +@IndirectlyTested +public class NotifyStoreChangeServiceStub {} diff --git a/inez.model/src/test/java/io/github/magwas/inez/storage/tests/RemoveReferencesServiceStub.java b/inez.model/src/test/java/io/github/magwas/inez/storage/tests/RemoveReferencesServiceStub.java new file mode 100644 index 0000000..411198b --- /dev/null +++ b/inez.model/src/test/java/io/github/magwas/inez/storage/tests/RemoveReferencesServiceStub.java @@ -0,0 +1,6 @@ +package io.github.magwas.inez.storage.tests; + +import io.github.magwas.konveyor.testing.IndirectlyTested; + +@IndirectlyTested +public class RemoveReferencesServiceStub {} diff --git a/inez.model/src/test/java/io/github/magwas/inez/storage/tests/RemoveReferencesTest.java b/inez.model/src/test/java/io/github/magwas/inez/storage/tests/RemoveReferencesTest.java new file mode 100644 index 0000000..6d9b3eb --- /dev/null +++ b/inez.model/src/test/java/io/github/magwas/inez/storage/tests/RemoveReferencesTest.java @@ -0,0 +1,33 @@ +package io.github.magwas.inez.storage.tests; + +import static org.mockito.Mockito.verify; + +import java.util.stream.IntStream; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.mockito.InjectMocks; + +import io.github.magwas.inez.storage.RemoveReferencesService; +import io.github.magwas.inez.storage.repository.BridiReferenceRepository; +import io.github.magwas.inez.tests.BridiTestData; +import io.github.magwas.konveyor.testing.TestBase; +import io.github.magwas.konveyor.testing.TestUtil; + +class RemoveReferencesTest extends TestBase implements BridiTestData { + + @InjectMocks + RemoveReferencesService removeReferences; + + @Test + @DisplayName("removes references from the BridiReferenceRepository\n" + + "- removes all the sumti references for the bridi") + void test() throws IllegalAccessException { + removeReferences.apply(SUMTI_IS_A_THING_ID, SUMTI_IS_A_THING_REFERENCES); + BridiReferenceRepository bridiReferenceRepository = + TestUtil.dependency(removeReferences, BridiReferenceRepository.class); + IntStream.range(0, SUMTI_IS_A_THING_REFERENCES.size() - 1).forEach(position -> verify(bridiReferenceRepository) + .deleteBybridiIdAndPositionAndSumtiId( + SUMTI_IS_A_THING_ID, position, SUMTI_IS_A_THING_REFERENCES.get(position))); + } +} diff --git a/inez.model/src/test/java/io/github/magwas/inez/storage/tests/SaveBridiServiceStub.java b/inez.model/src/test/java/io/github/magwas/inez/storage/tests/SaveBridiServiceStub.java new file mode 100644 index 0000000..c3b4042 --- /dev/null +++ b/inez.model/src/test/java/io/github/magwas/inez/storage/tests/SaveBridiServiceStub.java @@ -0,0 +1,6 @@ +package io.github.magwas.inez.storage.tests; + +import io.github.magwas.konveyor.testing.IndirectlyTested; + +@IndirectlyTested +public class SaveBridiServiceStub {} diff --git a/inez.model/src/test/java/io/github/magwas/inez/storage/SaveBridiTest.java b/inez.model/src/test/java/io/github/magwas/inez/storage/tests/SaveBridiTest.java similarity index 51% rename from inez.model/src/test/java/io/github/magwas/inez/storage/SaveBridiTest.java rename to inez.model/src/test/java/io/github/magwas/inez/storage/tests/SaveBridiTest.java index 46790f8..c3cc434 100644 --- a/inez.model/src/test/java/io/github/magwas/inez/storage/SaveBridiTest.java +++ b/inez.model/src/test/java/io/github/magwas/inez/storage/tests/SaveBridiTest.java @@ -1,4 +1,4 @@ -package io.github.magwas.inez.storage; +package io.github.magwas.inez.storage.tests; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.verify; @@ -10,9 +10,12 @@ import org.mockito.InjectMocks; import io.github.magwas.inez.BridiStoreOperation; -import io.github.magwas.inez.BridiTestData; -import io.github.magwas.inez.storage.model.SumtiTestData; -import io.github.magwas.testing.TestBase; +import io.github.magwas.inez.storage.*; +import io.github.magwas.inez.storage.model.tests.SumtiTestData; +import io.github.magwas.inez.storage.repository.SumtiRepository; +import io.github.magwas.inez.tests.BridiTestData; +import io.github.magwas.konveyor.testing.TestBase; +import io.github.magwas.konveyor.testing.TestUtil; class SaveBridiTest extends TestBase implements BridiTestData, SumtiTestData { @@ -27,51 +30,56 @@ void test1() { @Test @DisplayName("- looks up the existing version of the sumti") - void test3() { + void test3() throws IllegalAccessException { saveBridi.apply(SUMTI_IS_A_THING_CHANGED); - verify(saveBridi.sumtiRepository).findById(SUMTI_IS_A_THING_ID); + verify(TestUtil.dependency(saveBridi, SumtiRepository.class)).findById(SUMTI_IS_A_THING_ID); } @Test @DisplayName("- if there was an existing version,\n" + " - then creates a bridi from it") - void test4() { + void test4() throws IllegalAccessException { saveBridi.apply(SUMTI_IS_A_THING_CHANGED); - verify(saveBridi.createBridiFromSumti).apply(SUMTI_IS_A_THING_SUMTI); + verify(TestUtil.dependency(saveBridi, CreateBridiFromSumtiService.class)) + .apply(SUMTI_IS_A_THING_SUMTI); } @Test @DisplayName(" - and cleans its references") - void test4_1() { + void test4_1() throws IllegalAccessException { saveBridi.apply(SUMTI_IS_A_THING_CHANGED); - verify(saveBridi.removeReferences).apply(SUMTI_IS_A_THING_ID, SUMTI_IS_A_THING.references()); + verify(TestUtil.dependency(saveBridi, RemoveReferencesService.class)) + .apply(SUMTI_IS_A_THING_ID, SUMTI_IS_A_THING.references()); } @Test @DisplayName("- stores the id and representation in the sumtiRepository") - void test() { + void test() throws IllegalAccessException { saveBridi.apply(SUMTI_IS_A_THING_CHANGED); - verify(saveBridi.sumtiRepository).save(SUMTI_IS_A_THING_CHANGED_SUMTI); + verify(TestUtil.dependency(saveBridi, SumtiRepository.class)).save(SUMTI_IS_A_THING_CHANGED_SUMTI); } @Test @DisplayName("- adds the references") - void test_1() { + void test_1() throws IllegalAccessException { saveBridi.apply(SUMTI_IS_A_THING_CHANGED); - verify(saveBridi.addReferences).apply(SUMTI_IS_A_THING_ID, SUMTI_IS_A_THING_CHANGED.references()); + verify(TestUtil.dependency(saveBridi, AddReferencesService.class)) + .apply(SUMTI_IS_A_THING_ID, SUMTI_IS_A_THING_CHANGED.references()); } @Test @DisplayName("- adds the save operation to the history with SAVE, the old and new bridi") - void test2() { + void test2() throws IllegalAccessException { saveBridi.apply(SUMTI_IS_A_THING_CHANGED); - verify(saveBridi.notifyStoreChange).apply(BridiStoreOperation.SAVE, SUMTI_IS_A_THING, SUMTI_IS_A_THING_CHANGED); + verify(TestUtil.dependency(saveBridi, NotifyStoreChangeService.class)) + .apply(BridiStoreOperation.SAVE, SUMTI_IS_A_THING, SUMTI_IS_A_THING_CHANGED); } @Test @DisplayName("- if there was no previous sumti, uses null in the history for it") - void test5() { + void test5() throws IllegalAccessException { saveBridi.apply(NONEXISTENT); - verify(saveBridi.notifyStoreChange).apply(BridiStoreOperation.SAVE, null, NONEXISTENT); + verify(TestUtil.dependency(saveBridi, NotifyStoreChangeService.class)) + .apply(BridiStoreOperation.SAVE, null, NONEXISTENT); } @Test diff --git a/inez.model/src/test/java/io/github/magwas/inez/InezImplStub.java b/inez.model/src/test/java/io/github/magwas/inez/tests/InezImplStub.java similarity index 64% rename from inez.model/src/test/java/io/github/magwas/inez/InezImplStub.java rename to inez.model/src/test/java/io/github/magwas/inez/tests/InezImplStub.java index 317079c..5025943 100644 --- a/inez.model/src/test/java/io/github/magwas/inez/InezImplStub.java +++ b/inez.model/src/test/java/io/github/magwas/inez/tests/InezImplStub.java @@ -1,7 +1,9 @@ -package io.github.magwas.inez; +package io.github.magwas.inez.tests; import static org.mockito.Mockito.mock; +import io.github.magwas.inez.InezImpl; + public class InezImplStub { public static InezImpl stub() { return mock(InezImpl.class); diff --git a/inez.model/src/test/java/io/github/magwas/inez/InezProblemTestData.java b/inez.model/src/test/java/io/github/magwas/inez/tests/InezProblemTestData.java similarity index 65% rename from inez.model/src/test/java/io/github/magwas/inez/InezProblemTestData.java rename to inez.model/src/test/java/io/github/magwas/inez/tests/InezProblemTestData.java index 7c2643a..67586c2 100644 --- a/inez.model/src/test/java/io/github/magwas/inez/InezProblemTestData.java +++ b/inez.model/src/test/java/io/github/magwas/inez/tests/InezProblemTestData.java @@ -1,8 +1,9 @@ -package io.github.magwas.inez; +package io.github.magwas.inez.tests; import java.util.List; -import io.github.magwas.inez.storage.model.SumtiTestData; +import io.github.magwas.inez.InezProblem; +import io.github.magwas.inez.storage.model.tests.SumtiTestData; public interface InezProblemTestData extends SumtiTestData { diff --git a/inez.model/src/test/java/io/github/magwas/inez/InezProblemsTest.java b/inez.model/src/test/java/io/github/magwas/inez/tests/InezProblemsTest.java similarity index 77% rename from inez.model/src/test/java/io/github/magwas/inez/InezProblemsTest.java rename to inez.model/src/test/java/io/github/magwas/inez/tests/InezProblemsTest.java index 0a0cfea..d5bae0d 100644 --- a/inez.model/src/test/java/io/github/magwas/inez/InezProblemsTest.java +++ b/inez.model/src/test/java/io/github/magwas/inez/tests/InezProblemsTest.java @@ -1,4 +1,4 @@ -package io.github.magwas.inez; +package io.github.magwas.inez.tests; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -6,7 +6,8 @@ import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; -import io.github.magwas.testing.TestBase; +import io.github.magwas.inez.InezImpl; +import io.github.magwas.konveyor.testing.TestBase; public class InezProblemsTest extends TestBase implements InezProblemTestData { diff --git a/inez.model/src/test/java/io/github/magwas/inez/TestConfig.java b/inez.model/src/test/java/io/github/magwas/inez/tests/TestConfig.java similarity index 83% rename from inez.model/src/test/java/io/github/magwas/inez/TestConfig.java rename to inez.model/src/test/java/io/github/magwas/inez/tests/TestConfig.java index c12c70f..32040b3 100644 --- a/inez.model/src/test/java/io/github/magwas/inez/TestConfig.java +++ b/inez.model/src/test/java/io/github/magwas/inez/tests/TestConfig.java @@ -1,11 +1,11 @@ -package io.github.magwas.inez; +package io.github.magwas.inez.tests; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; import org.springframework.data.map.repository.config.EnableMapRepositories; -import io.github.magwas.kodekonveyorannotations.Glue; +import io.github.magwas.konveyor.annotations.Glue; @Configuration @PropertySource("classpath:test.properties") diff --git a/inez.model/src/test/java/module-info.java b/inez.model/src/test/java/module-info.java new file mode 100644 index 0000000..c4884af --- /dev/null +++ b/inez.model/src/test/java/module-info.java @@ -0,0 +1,14 @@ +open module inez.model.test { + exports io.github.magwas.inez.tests; + exports io.github.magwas.inez.element.tests; + exports io.github.magwas.inez.storage.repository.tests; + exports io.github.magwas.inez.query.tests; + exports io.github.magwas.inez.storage.tests; + exports io.github.magwas.inez.storage.model.tests; + + requires transitive inez.model; + requires transitive inez.parser.test; + requires transitive spring.data.commons; + requires spring.test; + requires konveyor.testing; +} diff --git a/inez.parser/pom.xml b/inez.parser/pom.xml index 409c621..fbf422a 100644 --- a/inez.parser/pom.xml +++ b/inez.parser/pom.xml @@ -56,13 +56,18 @@ io.github.magwas - konveyor.base + konveyor.runtime ${version.konveyor} - runtime io.github.magwas - konveyor.base + konveyor.testing + ${version.konveyor} + test + + + io.github.magwas + konveyor.runtime ${version.konveyor} test-jar test diff --git a/inez.parser/src/main/java/io/github/magwas/inez/parse/CreateParserFromTokensService.java b/inez.parser/src/main/java/io/github/magwas/inez/parse/CreateParserFromTokensService.java index 06e8423..f200f66 100644 --- a/inez.parser/src/main/java/io/github/magwas/inez/parse/CreateParserFromTokensService.java +++ b/inez.parser/src/main/java/io/github/magwas/inez/parse/CreateParserFromTokensService.java @@ -6,13 +6,13 @@ import io.github.magwas.inez.parser.BridiLexer; import io.github.magwas.inez.parser.BridiParser; -import io.github.magwas.kodekonveyorannotations.Glue; +import io.github.magwas.konveyor.annotations.Glue; @Glue @Service public class CreateParserFromTokensService { - BridiParser apply(final String input) { + public BridiParser apply(final String input) { BridiLexer lexer = new BridiLexer(CharStreams.fromString(input)); CommonTokenStream tokens = new CommonTokenStream(lexer); BridiParser parser = new BridiParser(tokens); diff --git a/inez.parser/src/main/java/io/github/magwas/inez/parse/ParseTextService.java b/inez.parser/src/main/java/io/github/magwas/inez/parse/ParseTextService.java index 9de48fc..d2b8be4 100644 --- a/inez.parser/src/main/java/io/github/magwas/inez/parse/ParseTextService.java +++ b/inez.parser/src/main/java/io/github/magwas/inez/parse/ParseTextService.java @@ -17,7 +17,7 @@ import io.github.magwas.inez.parser.BridiParser.LiteralContext; import io.github.magwas.inez.parser.BridiParser.ParagraphContext; import io.github.magwas.inez.parser.BridiParser.TextReferenceContext; -import io.github.magwas.runtime.LogUtil; +import io.github.magwas.konveyor.runtime.LogUtil; @Service public class ParseTextService implements Function> { diff --git a/inez.parser/src/main/java/io/github/magwas/inez/parse/ThrowingErrorListener.java b/inez.parser/src/main/java/io/github/magwas/inez/parse/ThrowingErrorListener.java index fb21874..37a03e0 100644 --- a/inez.parser/src/main/java/io/github/magwas/inez/parse/ThrowingErrorListener.java +++ b/inez.parser/src/main/java/io/github/magwas/inez/parse/ThrowingErrorListener.java @@ -5,7 +5,7 @@ import org.antlr.v4.runtime.Recognizer; import org.antlr.v4.runtime.misc.ParseCancellationException; -import io.github.magwas.kodekonveyorannotations.Glue; +import io.github.magwas.konveyor.annotations.Glue; @Glue public class ThrowingErrorListener extends BaseErrorListener { diff --git a/inez.parser/src/main/java/module-info.java b/inez.parser/src/main/java/module-info.java new file mode 100644 index 0000000..544ffea --- /dev/null +++ b/inez.parser/src/main/java/module-info.java @@ -0,0 +1,7 @@ +open module inez.parser { + exports io.github.magwas.inez.parse; + exports io.github.magwas.inez.parser; + + requires transitive konveyor.runtime; + requires transitive org.antlr.antlr4.runtime; +} diff --git a/inez.parser/src/test/generators-java/io/github/magwas/inez/parse/IdTestDataGenerator.java b/inez.parser/src/test/generators-java/io/github/magwas/inez/parse/tests/IdTestDataGenerator.java similarity index 77% rename from inez.parser/src/test/generators-java/io/github/magwas/inez/parse/IdTestDataGenerator.java rename to inez.parser/src/test/generators-java/io/github/magwas/inez/parse/tests/IdTestDataGenerator.java index 08aa0c1..b5ce3c2 100644 --- a/inez.parser/src/test/generators-java/io/github/magwas/inez/parse/IdTestDataGenerator.java +++ b/inez.parser/src/test/generators-java/io/github/magwas/inez/parse/tests/IdTestDataGenerator.java @@ -1,11 +1,11 @@ -package io.github.magwas.inez.parse; +package io.github.magwas.inez.parse.tests; import java.text.MessageFormat; import java.util.List; import java.util.function.Supplier; import java.util.stream.Stream; -import io.github.magwas.runtime.GeneratorUtil; +import io.github.magwas.konveyor.runtime.GeneratorUtil; public class IdTestDataGenerator implements Supplier, TestDataGeneratorConstants { @@ -16,7 +16,9 @@ public StringBuilder get() { .map(s -> s.split(",")[0]).toList(); Stream generatedIds = GeneratorUtil.linesOf(REPRESENTATIONS) .map(s -> s.split(",")[0]).filter(x -> !definedIdlist.contains(x)); - StringBuilder builder = GeneratorUtil.testDataBoilerPlate("", + StringBuilder builder = GeneratorUtil.testDataBoilerPlate(""" + import io.github.magwas.inez.parse.IdUtil; + """, "RepresentationTestData"); GeneratorUtil.mapToCode(generatedIds, line -> { String[] parts = line.split(",", 2); diff --git a/inez.parser/src/test/generators-java/io/github/magwas/inez/parse/InputTestDataGenerator.java b/inez.parser/src/test/generators-java/io/github/magwas/inez/parse/tests/InputTestDataGenerator.java similarity index 79% rename from inez.parser/src/test/generators-java/io/github/magwas/inez/parse/InputTestDataGenerator.java rename to inez.parser/src/test/generators-java/io/github/magwas/inez/parse/tests/InputTestDataGenerator.java index ef89190..ac6c7f6 100644 --- a/inez.parser/src/test/generators-java/io/github/magwas/inez/parse/InputTestDataGenerator.java +++ b/inez.parser/src/test/generators-java/io/github/magwas/inez/parse/tests/InputTestDataGenerator.java @@ -1,8 +1,8 @@ -package io.github.magwas.inez.parse; +package io.github.magwas.inez.parse.tests; import java.util.function.Supplier; -import io.github.magwas.runtime.GeneratorUtil; +import io.github.magwas.konveyor.runtime.GeneratorUtil; public class InputTestDataGenerator implements Supplier, TestDataGeneratorConstants { diff --git a/inez.parser/src/test/generators-java/io/github/magwas/inez/parse/ParseTextServiceStubGenerator.java b/inez.parser/src/test/generators-java/io/github/magwas/inez/parse/tests/ParseTextServiceStubGenerator.java similarity index 68% rename from inez.parser/src/test/generators-java/io/github/magwas/inez/parse/ParseTextServiceStubGenerator.java rename to inez.parser/src/test/generators-java/io/github/magwas/inez/parse/tests/ParseTextServiceStubGenerator.java index 762049f..3c7c8fd 100644 --- a/inez.parser/src/test/generators-java/io/github/magwas/inez/parse/ParseTextServiceStubGenerator.java +++ b/inez.parser/src/test/generators-java/io/github/magwas/inez/parse/tests/ParseTextServiceStubGenerator.java @@ -1,9 +1,9 @@ -package io.github.magwas.inez.parse; +package io.github.magwas.inez.parse.tests; import java.text.MessageFormat; import java.util.function.Supplier; -import io.github.magwas.runtime.GeneratorUtil; +import io.github.magwas.konveyor.runtime.GeneratorUtil; public class ParseTextServiceStubGenerator implements Supplier, TestDataGeneratorConstants { @@ -11,8 +11,10 @@ public class ParseTextServiceStubGenerator @Override public StringBuilder get() { StringBuilder builder = GeneratorUtil.stubBoilerPlate(""" - import java.util.stream.Stream; - """, "ParserOutputTestData"); +import java.util.stream.Stream; +import io.github.magwas.inez.parse.ParseTextService; +import io.github.magwas.inez.parse.ParserConstants; +""", "ParserOutputTestData"); GeneratorUtil.linesOf(PARSE_TEXT_STUB_DATA).map(line -> { String[] splat = line.split(","); return MessageFormat.format(""" diff --git a/inez.parser/src/test/generators-java/io/github/magwas/inez/parse/ParserOutputTestDataGenerator.java b/inez.parser/src/test/generators-java/io/github/magwas/inez/parse/tests/ParserOutputTestDataGenerator.java similarity index 73% rename from inez.parser/src/test/generators-java/io/github/magwas/inez/parse/ParserOutputTestDataGenerator.java rename to inez.parser/src/test/generators-java/io/github/magwas/inez/parse/tests/ParserOutputTestDataGenerator.java index 47c443f..811edac 100644 --- a/inez.parser/src/test/generators-java/io/github/magwas/inez/parse/ParserOutputTestDataGenerator.java +++ b/inez.parser/src/test/generators-java/io/github/magwas/inez/parse/tests/ParserOutputTestDataGenerator.java @@ -1,9 +1,9 @@ -package io.github.magwas.inez.parse; +package io.github.magwas.inez.parse.tests; import java.text.MessageFormat; import java.util.function.Supplier; -import io.github.magwas.runtime.GeneratorUtil; +import io.github.magwas.konveyor.runtime.GeneratorUtil; public class ParserOutputTestDataGenerator implements Supplier, TestDataGeneratorConstants { @@ -11,8 +11,10 @@ public class ParserOutputTestDataGenerator @Override public StringBuilder get() { StringBuilder builder = GeneratorUtil.testDataBoilerPlate(""" - import java.util.Map; - """, "InputTestData", "ReferenceTestData"); +import java.util.Map; +import io.github.magwas.inez.parse.ParserOutput; +import io.github.magwas.inez.parse.ParserConstants; +""", "InputTestData", "ReferenceTestData"); GeneratorUtil.linesOf(OUTPUTS).map(line -> { String[] parts = line.split(",", 3); String name = parts[0]; diff --git a/inez.parser/src/test/generators-java/io/github/magwas/inez/parse/ReferenceTestDataGenerator.java b/inez.parser/src/test/generators-java/io/github/magwas/inez/parse/tests/ReferenceTestDataGenerator.java similarity index 68% rename from inez.parser/src/test/generators-java/io/github/magwas/inez/parse/ReferenceTestDataGenerator.java rename to inez.parser/src/test/generators-java/io/github/magwas/inez/parse/tests/ReferenceTestDataGenerator.java index 97f9060..f870ce1 100644 --- a/inez.parser/src/test/generators-java/io/github/magwas/inez/parse/ReferenceTestDataGenerator.java +++ b/inez.parser/src/test/generators-java/io/github/magwas/inez/parse/tests/ReferenceTestDataGenerator.java @@ -1,9 +1,9 @@ -package io.github.magwas.inez.parse; +package io.github.magwas.inez.parse.tests; import java.text.MessageFormat; import java.util.function.Supplier; -import io.github.magwas.runtime.GeneratorUtil; +import io.github.magwas.konveyor.runtime.GeneratorUtil; public class ReferenceTestDataGenerator implements Supplier, TestDataGeneratorConstants { @@ -11,8 +11,10 @@ public class ReferenceTestDataGenerator @Override public StringBuilder get() { StringBuilder builder = GeneratorUtil.testDataBoilerPlate(""" - import java.util.List; - """, "IdTestData", "InputTestData"); +import java.util.List; +import io.github.magwas.inez.parse.IdUtil; +import io.github.magwas.inez.parse.ParserConstants; +""", "IdTestData", "InputTestData"); GeneratorUtil.mapToCode(REFERENCES, line -> { String[] parts = line.split(",", 2); return MessageFormat.format(""" diff --git a/inez.parser/src/test/generators-java/io/github/magwas/inez/parse/RepresentationTestDataGenerator.java b/inez.parser/src/test/generators-java/io/github/magwas/inez/parse/tests/RepresentationTestDataGenerator.java similarity index 86% rename from inez.parser/src/test/generators-java/io/github/magwas/inez/parse/RepresentationTestDataGenerator.java rename to inez.parser/src/test/generators-java/io/github/magwas/inez/parse/tests/RepresentationTestDataGenerator.java index 656cd2c..5621e04 100644 --- a/inez.parser/src/test/generators-java/io/github/magwas/inez/parse/RepresentationTestDataGenerator.java +++ b/inez.parser/src/test/generators-java/io/github/magwas/inez/parse/tests/RepresentationTestDataGenerator.java @@ -1,9 +1,9 @@ -package io.github.magwas.inez.parse; +package io.github.magwas.inez.parse.tests; import java.text.MessageFormat; import java.util.function.Supplier; -import io.github.magwas.runtime.GeneratorUtil; +import io.github.magwas.konveyor.runtime.GeneratorUtil; public class RepresentationTestDataGenerator implements Supplier, TestDataGeneratorConstants { diff --git a/inez.parser/src/test/generators-java/io/github/magwas/inez/parse/TestDataGeneratorConstants.java b/inez.parser/src/test/generators-java/io/github/magwas/inez/parse/tests/TestDataGeneratorConstants.java similarity index 84% rename from inez.parser/src/test/generators-java/io/github/magwas/inez/parse/TestDataGeneratorConstants.java rename to inez.parser/src/test/generators-java/io/github/magwas/inez/parse/tests/TestDataGeneratorConstants.java index d4194e6..75bd962 100644 --- a/inez.parser/src/test/generators-java/io/github/magwas/inez/parse/TestDataGeneratorConstants.java +++ b/inez.parser/src/test/generators-java/io/github/magwas/inez/parse/tests/TestDataGeneratorConstants.java @@ -1,6 +1,6 @@ -package io.github.magwas.inez.parse; +package io.github.magwas.inez.parse.tests; -import io.github.magwas.testing.TestUtil; +import io.github.magwas.konveyor.testing.TestUtil; public interface TestDataGeneratorConstants { String REPRESENTATIONS = TestUtil.loadResourceAsString("representations"); diff --git a/inez.parser/src/test/java/io/github/magwas/inez/parse/CreateParserFromTokensServiceStub.java b/inez.parser/src/test/java/io/github/magwas/inez/parse/tests/CreateParserFromTokensServiceStub.java similarity index 86% rename from inez.parser/src/test/java/io/github/magwas/inez/parse/CreateParserFromTokensServiceStub.java rename to inez.parser/src/test/java/io/github/magwas/inez/parse/tests/CreateParserFromTokensServiceStub.java index d9da6a6..0c36244 100644 --- a/inez.parser/src/test/java/io/github/magwas/inez/parse/CreateParserFromTokensServiceStub.java +++ b/inez.parser/src/test/java/io/github/magwas/inez/parse/tests/CreateParserFromTokensServiceStub.java @@ -1,4 +1,4 @@ -package io.github.magwas.inez.parse; +package io.github.magwas.inez.parse.tests; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; @@ -8,10 +8,11 @@ import org.antlr.v4.runtime.tree.ParseTree; +import io.github.magwas.inez.parse.CreateParserFromTokensService; import io.github.magwas.inez.parser.BridiParser; import io.github.magwas.inez.parser.BridiParser.BridiContext; import io.github.magwas.inez.parser.BridiParser.ParagraphContext; -import io.github.magwas.kodekonveyorannotations.Glue; +import io.github.magwas.konveyor.annotations.Glue; @Glue public class CreateParserFromTokensServiceStub implements ParserOutputTestData { diff --git a/inez.parser/src/test/java/io/github/magwas/inez/parse/ParseTextTest.java b/inez.parser/src/test/java/io/github/magwas/inez/parse/tests/ParseTextTest.java similarity index 93% rename from inez.parser/src/test/java/io/github/magwas/inez/parse/ParseTextTest.java rename to inez.parser/src/test/java/io/github/magwas/inez/parse/tests/ParseTextTest.java index 2562595..1554f89 100644 --- a/inez.parser/src/test/java/io/github/magwas/inez/parse/ParseTextTest.java +++ b/inez.parser/src/test/java/io/github/magwas/inez/parse/tests/ParseTextTest.java @@ -1,4 +1,4 @@ -package io.github.magwas.inez.parse; +package io.github.magwas.inez.parse.tests; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -12,7 +12,9 @@ import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; -import io.github.magwas.testing.TestBase; +import io.github.magwas.inez.parse.ParseTextService; +import io.github.magwas.inez.parse.ParserOutput; +import io.github.magwas.konveyor.testing.TestBase; @Tag("unit") class ParseTextTest extends TestBase implements ParserOutputTestData { diff --git a/inez.parser/src/test/java/module-info.java b/inez.parser/src/test/java/module-info.java new file mode 100644 index 0000000..44563f3 --- /dev/null +++ b/inez.parser/src/test/java/module-info.java @@ -0,0 +1,6 @@ +open module inez.parser.test { + exports io.github.magwas.inez.parse.tests; + + requires transitive inez.parser; + requires transitive konveyor.testing; +} diff --git a/inez.ui/pom.xml b/inez.ui/pom.xml index fb00f4a..47f863b 100644 --- a/inez.ui/pom.xml +++ b/inez.ui/pom.xml @@ -51,13 +51,12 @@ io.github.magwas - konveyor.base + konveyor.runtime ${version.konveyor} - runtime io.github.magwas - konveyor.base + konveyor.runtime ${version.konveyor} test-jar test diff --git a/inez.ui/src/main/java/module-info.java b/inez.ui/src/main/java/module-info.java index f62a88d..d59033d 100644 --- a/inez.ui/src/main/java/module-info.java +++ b/inez.ui/src/main/java/module-info.java @@ -7,7 +7,7 @@ requires spring.core; requires spring.data.keyvalue; requires spring.data.commons; - requires konveyor.base; + requires konveyor.runtime; requires javafx.base; requires javafx.graphics; diff --git a/inez.ui/src/test/java/io/github/magwas/inez/ui/EmpptyTest.java b/inez.ui/src/test/java/io/github/magwas/inez/ui/tests/EmpptyTest.java similarity index 81% rename from inez.ui/src/test/java/io/github/magwas/inez/ui/EmpptyTest.java rename to inez.ui/src/test/java/io/github/magwas/inez/ui/tests/EmpptyTest.java index 1f2ebd9..4aaf981 100644 --- a/inez.ui/src/test/java/io/github/magwas/inez/ui/EmpptyTest.java +++ b/inez.ui/src/test/java/io/github/magwas/inez/ui/tests/EmpptyTest.java @@ -1,4 +1,4 @@ -package io.github.magwas.inez.ui; +package io.github.magwas.inez.ui.tests; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/inez.ui/tools/javaRun b/inez.ui/tools/javaRun index f3d50a6..5e08423 100755 --- a/inez.ui/tools/javaRun +++ b/inez.ui/tools/javaRun @@ -1,3 +1 @@ -mv -f target/dependency/konveyor.base-runtime.jar target/dependency/konveyor.base.jar -rm -f target/dependency/inez.model-tests.jar target/dependency/konveyor.base-tests.jar target/dependency/asm.jar java --module-path /usr/local/lib/javafx-sdk-21.0.8/lib:target/classes:target/dependency/ -cp target/dependency:../inez.parser/target/inez.parser-0.0.1.jar --add-modules javafx.controls,javafx.fxml -m io.github.magwas.inez.ui/io.github.magwas.inez.ui.UIMain diff --git a/pom.xml b/pom.xml index d5b1c28..55de899 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ io.github.magwas konveyor.parent - 0.5.3 + 0.5.5 inez 0.0.1 @@ -50,6 +50,6 @@ true - 0.5.3 + 0.5.5 From 7197224ad76ebdd4d3f7ff1f51a04593e64966ca Mon Sep 17 00:00:00 2001 From: Arpad Magosanyi Date: Sun, 26 Oct 2025 21:22:34 +0100 Subject: [PATCH 2/2] bumped up konveyor version --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 55de899..58378c9 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ io.github.magwas konveyor.parent - 0.5.5 + 0.5.7 inez 0.0.1 @@ -50,6 +50,6 @@ true - 0.5.5 + 0.5.7