You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2021/10/05 13:53:10 UTC
[isis-app-demo] 02/07: moves fixture classes
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/isis-app-demo.git
commit a0fb00de6ec1c3dd81cc15bcddea831603582f7a
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Oct 5 13:52:47 2021 +0100
moves fixture classes
---
.../petclinic/modules/pets/integtests/tests/PetOwner_IntegTest.java | 3 +--
.../petclinic/modules/pets/integtests/tests/PetOwners_IntegTest.java | 2 +-
.../java/petclinic/modules/pets/fixture/{ => pet}/PetBuilder.java | 3 ++-
.../java/petclinic/modules/pets/fixture/{ => pet}/Pet_persona.java | 3 ++-
.../modules/pets/fixture/{ => petowner}/PetOwnerBuilder.java | 2 +-
.../modules/pets/fixture/{ => petowner}/PetOwner_persona.java | 2 +-
.../petclinic/webapp/application/fixture/scenarios/PetClinicDemo.java | 4 ++--
7 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/module-pets-tests/src/test/java/petclinic/modules/pets/integtests/tests/PetOwner_IntegTest.java b/module-pets-tests/src/test/java/petclinic/modules/pets/integtests/tests/PetOwner_IntegTest.java
index e3a114b..f7285d2 100644
--- a/module-pets-tests/src/test/java/petclinic/modules/pets/integtests/tests/PetOwner_IntegTest.java
+++ b/module-pets-tests/src/test/java/petclinic/modules/pets/integtests/tests/PetOwner_IntegTest.java
@@ -8,12 +8,11 @@ import org.springframework.transaction.annotation.Transactional;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertThrows;
-import org.apache.isis.applib.services.wrapper.DisabledException;
import org.apache.isis.applib.services.wrapper.HiddenException;
import org.apache.isis.applib.services.wrapper.InvalidException;
import petclinic.modules.pets.dom.petowner.PetOwner;
-import petclinic.modules.pets.fixture.PetOwner_persona;
+import petclinic.modules.pets.fixture.petowner.PetOwner_persona;
import petclinic.modules.pets.integtests.PetsModuleIntegTestAbstract;
@Transactional
diff --git a/module-pets-tests/src/test/java/petclinic/modules/pets/integtests/tests/PetOwners_IntegTest.java b/module-pets-tests/src/test/java/petclinic/modules/pets/integtests/tests/PetOwners_IntegTest.java
index 8606eb3..be4b927 100644
--- a/module-pets-tests/src/test/java/petclinic/modules/pets/integtests/tests/PetOwners_IntegTest.java
+++ b/module-pets-tests/src/test/java/petclinic/modules/pets/integtests/tests/PetOwners_IntegTest.java
@@ -17,7 +17,7 @@ import org.apache.isis.testing.unittestsupport.applib.matchers.ThrowableMatchers
import petclinic.modules.pets.dom.petowner.PetOwner;
import petclinic.modules.pets.dom.petowner.PetOwners;
-import petclinic.modules.pets.fixture.PetOwner_persona;
+import petclinic.modules.pets.fixture.petowner.PetOwner_persona;
import petclinic.modules.pets.integtests.PetsModuleIntegTestAbstract;
@Transactional
diff --git a/module-pets/src/main/java/petclinic/modules/pets/fixture/PetBuilder.java b/module-pets/src/main/java/petclinic/modules/pets/fixture/pet/PetBuilder.java
similarity index 92%
rename from module-pets/src/main/java/petclinic/modules/pets/fixture/PetBuilder.java
rename to module-pets/src/main/java/petclinic/modules/pets/fixture/pet/PetBuilder.java
index 358d96c..d4031c1 100644
--- a/module-pets/src/main/java/petclinic/modules/pets/fixture/PetBuilder.java
+++ b/module-pets/src/main/java/petclinic/modules/pets/fixture/pet/PetBuilder.java
@@ -1,4 +1,4 @@
-package petclinic.modules.pets.fixture;
+package petclinic.modules.pets.fixture.pet;
import javax.inject.Inject;
@@ -13,6 +13,7 @@ import petclinic.modules.pets.dom.petowner.PetOwner;
import petclinic.modules.pets.dom.petowner.PetOwner_addPet;
import petclinic.modules.pets.dom.pet.PetRepository;
import petclinic.modules.pets.dom.pet.PetSpecies;
+import petclinic.modules.pets.fixture.petowner.PetOwner_persona;
@Accessors(chain = true)
public class PetBuilder extends BuilderScriptWithResult<Pet> {
diff --git a/module-pets/src/main/java/petclinic/modules/pets/fixture/Pet_persona.java b/module-pets/src/main/java/petclinic/modules/pets/fixture/pet/Pet_persona.java
similarity index 95%
rename from module-pets/src/main/java/petclinic/modules/pets/fixture/Pet_persona.java
rename to module-pets/src/main/java/petclinic/modules/pets/fixture/pet/Pet_persona.java
index 670286e..23d2b30 100644
--- a/module-pets/src/main/java/petclinic/modules/pets/fixture/Pet_persona.java
+++ b/module-pets/src/main/java/petclinic/modules/pets/fixture/pet/Pet_persona.java
@@ -1,4 +1,4 @@
-package petclinic.modules.pets.fixture;
+package petclinic.modules.pets.fixture.pet;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.testing.fixtures.applib.personas.PersonaWithBuilderScript;
@@ -12,6 +12,7 @@ import petclinic.modules.pets.dom.pet.Pet;
import petclinic.modules.pets.dom.petowner.PetOwner;
import petclinic.modules.pets.dom.pet.PetRepository;
import petclinic.modules.pets.dom.pet.PetSpecies;
+import petclinic.modules.pets.fixture.petowner.PetOwner_persona;
@AllArgsConstructor
public enum Pet_persona
diff --git a/module-pets/src/main/java/petclinic/modules/pets/fixture/PetOwnerBuilder.java b/module-pets/src/main/java/petclinic/modules/pets/fixture/petowner/PetOwnerBuilder.java
similarity index 94%
rename from module-pets/src/main/java/petclinic/modules/pets/fixture/PetOwnerBuilder.java
rename to module-pets/src/main/java/petclinic/modules/pets/fixture/petowner/PetOwnerBuilder.java
index 4440c66..00bab41 100644
--- a/module-pets/src/main/java/petclinic/modules/pets/fixture/PetOwnerBuilder.java
+++ b/module-pets/src/main/java/petclinic/modules/pets/fixture/petowner/PetOwnerBuilder.java
@@ -1,4 +1,4 @@
-package petclinic.modules.pets.fixture;
+package petclinic.modules.pets.fixture.petowner;
import javax.inject.Inject;
diff --git a/module-pets/src/main/java/petclinic/modules/pets/fixture/PetOwner_persona.java b/module-pets/src/main/java/petclinic/modules/pets/fixture/petowner/PetOwner_persona.java
similarity index 96%
rename from module-pets/src/main/java/petclinic/modules/pets/fixture/PetOwner_persona.java
rename to module-pets/src/main/java/petclinic/modules/pets/fixture/petowner/PetOwner_persona.java
index 1e10732..ce7cc4c 100644
--- a/module-pets/src/main/java/petclinic/modules/pets/fixture/PetOwner_persona.java
+++ b/module-pets/src/main/java/petclinic/modules/pets/fixture/petowner/PetOwner_persona.java
@@ -1,4 +1,4 @@
-package petclinic.modules.pets.fixture;
+package petclinic.modules.pets.fixture.petowner;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.testing.fixtures.applib.personas.PersonaWithBuilderScript;
diff --git a/webapp/src/main/java/petclinic/webapp/application/fixture/scenarios/PetClinicDemo.java b/webapp/src/main/java/petclinic/webapp/application/fixture/scenarios/PetClinicDemo.java
index f39d62f..78c4889 100644
--- a/webapp/src/main/java/petclinic/webapp/application/fixture/scenarios/PetClinicDemo.java
+++ b/webapp/src/main/java/petclinic/webapp/application/fixture/scenarios/PetClinicDemo.java
@@ -5,8 +5,8 @@ import javax.inject.Inject;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.apache.isis.testing.fixtures.applib.modules.ModuleWithFixturesService;
-import petclinic.modules.pets.fixture.PetOwner_persona;
-import petclinic.modules.pets.fixture.Pet_persona;
+import petclinic.modules.pets.fixture.petowner.PetOwner_persona;
+import petclinic.modules.pets.fixture.pet.Pet_persona;
public class PetClinicDemo extends FixtureScript {