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/09/29 06:25:53 UTC
[isis-app-demo] 13/23: renames SimpleObject_persona to
PetOwner_persona
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 1cbb684ad3f1b082f0b2d2b37841c8555c7b4459
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Sep 29 07:03:07 2021 +0100
renames SimpleObject_persona to PetOwner_persona
---
.../modules/simple/integtests/tests/PetOwner_IntegTest.java | 4 ++--
.../modules/simple/integtests/tests/PetOwners_IntegTest.java | 8 ++++----
.../fixture/{SimpleObject_persona.java => PetOwner_persona.java} | 6 +++---
.../webapp/application/fixture/scenarios/DomainAppDemo.java | 4 ++--
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/module-pets-tests/src/test/java/domainapp/modules/simple/integtests/tests/PetOwner_IntegTest.java b/module-pets-tests/src/test/java/domainapp/modules/simple/integtests/tests/PetOwner_IntegTest.java
index 7fab3b6..f5660dd 100644
--- a/module-pets-tests/src/test/java/domainapp/modules/simple/integtests/tests/PetOwner_IntegTest.java
+++ b/module-pets-tests/src/test/java/domainapp/modules/simple/integtests/tests/PetOwner_IntegTest.java
@@ -12,7 +12,7 @@ import org.apache.isis.applib.services.wrapper.DisabledException;
import org.apache.isis.applib.services.wrapper.InvalidException;
import domainapp.modules.simple.dom.so.PetOwner;
-import domainapp.modules.simple.fixture.SimpleObject_persona;
+import domainapp.modules.simple.fixture.PetOwner_persona;
import domainapp.modules.simple.integtests.SimpleModuleIntegTestAbstract;
@Transactional
@@ -23,7 +23,7 @@ public class PetOwner_IntegTest extends SimpleModuleIntegTestAbstract {
@BeforeEach
public void setUp() {
// given
- petOwner = fixtureScripts.runPersona(SimpleObject_persona.FOO);
+ petOwner = fixtureScripts.runPersona(PetOwner_persona.FOO);
}
diff --git a/module-pets-tests/src/test/java/domainapp/modules/simple/integtests/tests/PetOwners_IntegTest.java b/module-pets-tests/src/test/java/domainapp/modules/simple/integtests/tests/PetOwners_IntegTest.java
index 0c15972..b570c58 100644
--- a/module-pets-tests/src/test/java/domainapp/modules/simple/integtests/tests/PetOwners_IntegTest.java
+++ b/module-pets-tests/src/test/java/domainapp/modules/simple/integtests/tests/PetOwners_IntegTest.java
@@ -17,7 +17,7 @@ import org.apache.isis.testing.unittestsupport.applib.matchers.ThrowableMatchers
import domainapp.modules.simple.dom.so.PetOwner;
import domainapp.modules.simple.dom.so.PetOwners;
-import domainapp.modules.simple.fixture.SimpleObject_persona;
+import domainapp.modules.simple.fixture.PetOwner_persona;
import domainapp.modules.simple.integtests.SimpleModuleIntegTestAbstract;
@Transactional
@@ -33,14 +33,14 @@ public class PetOwners_IntegTest extends SimpleModuleIntegTestAbstract {
public void happyCase() {
// given
- fixtureScripts.run(new SimpleObject_persona.PersistAll());
+ fixtureScripts.run(new PetOwner_persona.PersistAll());
transactionService.flushTransaction();
// when
final List<PetOwner> all = wrap(menu).listAll();
// then
- assertThat(all).hasSize(SimpleObject_persona.values().length);
+ assertThat(all).hasSize(PetOwner_persona.values().length);
}
@Test
@@ -71,7 +71,7 @@ public class PetOwners_IntegTest extends SimpleModuleIntegTestAbstract {
public void whenAlreadyExists() {
// given
- fixtureScripts.runPersona(SimpleObject_persona.FIZZ);
+ fixtureScripts.runPersona(PetOwner_persona.FIZZ);
transactionService.flushTransaction();
// expect
diff --git a/module-pets/src/main/java/domainapp/modules/simple/fixture/SimpleObject_persona.java b/module-pets/src/main/java/domainapp/modules/simple/fixture/PetOwner_persona.java
similarity index 89%
rename from module-pets/src/main/java/domainapp/modules/simple/fixture/SimpleObject_persona.java
rename to module-pets/src/main/java/domainapp/modules/simple/fixture/PetOwner_persona.java
index f385997..c20b083 100644
--- a/module-pets/src/main/java/domainapp/modules/simple/fixture/SimpleObject_persona.java
+++ b/module-pets/src/main/java/domainapp/modules/simple/fixture/PetOwner_persona.java
@@ -11,7 +11,7 @@ import domainapp.modules.simple.dom.so.PetOwners;
import lombok.AllArgsConstructor;
@AllArgsConstructor
-public enum SimpleObject_persona
+public enum PetOwner_persona
implements PersonaWithBuilderScript<SimpleObjectBuilder>, PersonaWithFinder<PetOwner> {
FOO("Foo"),
@@ -39,10 +39,10 @@ implements PersonaWithBuilderScript<SimpleObjectBuilder>, PersonaWithFinder<PetO
}
public static class PersistAll
- extends PersonaEnumPersistAll<SimpleObject_persona, PetOwner> {
+ extends PersonaEnumPersistAll<PetOwner_persona, PetOwner> {
public PersistAll() {
- super(SimpleObject_persona.class);
+ super(PetOwner_persona.class);
}
}
}
diff --git a/webapp/src/main/java/domainapp/webapp/application/fixture/scenarios/DomainAppDemo.java b/webapp/src/main/java/domainapp/webapp/application/fixture/scenarios/DomainAppDemo.java
index 3b18a98..c8a92fa 100644
--- a/webapp/src/main/java/domainapp/webapp/application/fixture/scenarios/DomainAppDemo.java
+++ b/webapp/src/main/java/domainapp/webapp/application/fixture/scenarios/DomainAppDemo.java
@@ -5,14 +5,14 @@ import javax.inject.Inject;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.apache.isis.testing.fixtures.applib.modules.ModuleWithFixturesService;
-import domainapp.modules.simple.fixture.SimpleObject_persona;
+import domainapp.modules.simple.fixture.PetOwner_persona;
public class DomainAppDemo extends FixtureScript {
@Override
protected void execute(final ExecutionContext ec) {
ec.executeChildren(this, moduleWithFixturesService.getTeardownFixture());
- ec.executeChild(this, new SimpleObject_persona.PersistAll());
+ ec.executeChild(this, new PetOwner_persona.PersistAll());
}
@Inject ModuleWithFixturesService moduleWithFixturesService;