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/01/21 19:04:43 UTC
[isis-app-simpleapp] branch jdo updated: fixes tests for jdo
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch jdo
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
The following commit(s) were added to refs/heads/jdo by this push:
new 9a908cf fixes tests for jdo
9a908cf is described below
commit 9a908cfd328887dfcac44590039a793071a866d5
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Jan 21 19:04:19 2021 +0000
fixes tests for jdo
---
.../src/main/java/domainapp/modules/simple/SimpleModule.java | 8 ++++----
.../modules/simple/integtests/SimpleModuleIntegTestAbstract.java | 3 ++-
webapp/src/main/java/domainapp/webapp/AppManifest.java | 3 ++-
.../domainapp/webapp/integtests/ApplicationIntegTestAbstract.java | 3 ++-
4 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java b/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java
index a5fd57f..cba0618 100644
--- a/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java
+++ b/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java
@@ -7,8 +7,8 @@ import org.springframework.context.annotation.Import;
import org.springframework.validation.annotation.Validated;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
-import org.apache.isis.testing.fixtures.applib.teardown.TeardownFixtureAbstract;
import org.apache.isis.testing.fixtures.applib.modules.ModuleWithFixtures;
+import org.apache.isis.testing.fixtures.applib.teardown.jdo.TeardownFixtureJdoAbstract;
import lombok.Data;
@@ -24,7 +24,7 @@ public class SimpleModule implements ModuleWithFixtures {
@Override
public FixtureScript getTeardownFixture() {
- return new TeardownFixtureAbstract() {
+ return new TeardownFixtureJdoAbstract() {
@Override
protected void execute(ExecutionContext executionContext) {
deleteFrom(SimpleObject.class);
@@ -34,10 +34,10 @@ public class SimpleModule implements ModuleWithFixtures {
public static class PropertyDomainEvent<S,T>
extends org.apache.isis.applib.events.domain.PropertyDomainEvent<S,T> {}
-
+
public static class CollectionDomainEvent<S,T>
extends org.apache.isis.applib.events.domain.CollectionDomainEvent<S,T> {}
-
+
public static class ActionDomainEvent<S>
extends org.apache.isis.applib.events.domain.ActionDomainEvent<S> {}
diff --git a/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java b/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java
index 6e76bd2..37507ca 100644
--- a/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java
+++ b/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java
@@ -7,6 +7,7 @@ import org.springframework.test.context.TestPropertySource;
import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
+import org.apache.isis.persistence.jdo.datanucleus.IsisModuleJdoDatanucleus;
import org.apache.isis.persistence.jdo.integration.IsisModuleJdoIntegration;
import org.apache.isis.security.bypass.IsisModuleSecurityBypass;
import org.apache.isis.testing.fixtures.applib.IsisIntegrationTestAbstractWithFixtures;
@@ -29,7 +30,7 @@ public abstract class SimpleModuleIntegTestAbstract extends IsisIntegrationTestA
@Import({
IsisModuleCoreRuntimeServices.class,
IsisModuleSecurityBypass.class,
- IsisModuleJdoIntegration.class,
+ IsisModuleJdoDatanucleus.class,
IsisModuleTestingFixturesApplib.class,
SimpleModule.class
diff --git a/webapp/src/main/java/domainapp/webapp/AppManifest.java b/webapp/src/main/java/domainapp/webapp/AppManifest.java
index 262063d..c130030 100644
--- a/webapp/src/main/java/domainapp/webapp/AppManifest.java
+++ b/webapp/src/main/java/domainapp/webapp/AppManifest.java
@@ -8,6 +8,7 @@ import org.springframework.context.annotation.PropertySources;
import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
import org.apache.isis.extensions.flyway.impl.IsisModuleExtFlywayImpl;
+import org.apache.isis.persistence.jdo.datanucleus.IsisModuleJdoDatanucleus;
import org.apache.isis.persistence.jdo.integration.IsisModuleJdoIntegration;
import org.apache.isis.security.shiro.IsisModuleSecurityShiro;
import org.apache.isis.testing.fixtures.applib.IsisModuleTestingFixturesApplib;
@@ -23,7 +24,7 @@ import domainapp.webapp.custom.CustomModule;
@Import({
IsisModuleCoreRuntimeServices.class,
IsisModuleSecurityShiro.class,
- IsisModuleJdoIntegration.class,
+ IsisModuleJdoDatanucleus.class,
IsisModuleViewerRestfulObjectsJaxrsResteasy4.class,
IsisModuleViewerWicketViewer.class,
diff --git a/webapp/src/test/java/domainapp/webapp/integtests/ApplicationIntegTestAbstract.java b/webapp/src/test/java/domainapp/webapp/integtests/ApplicationIntegTestAbstract.java
index 1d37d79..229a087 100644
--- a/webapp/src/test/java/domainapp/webapp/integtests/ApplicationIntegTestAbstract.java
+++ b/webapp/src/test/java/domainapp/webapp/integtests/ApplicationIntegTestAbstract.java
@@ -8,6 +8,7 @@ import org.springframework.test.context.TestPropertySource;
import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
+import org.apache.isis.persistence.jdo.datanucleus.IsisModuleJdoDatanucleus;
import org.apache.isis.persistence.jdo.integration.IsisModuleJdoIntegration;
import org.apache.isis.security.bypass.IsisModuleSecurityBypass;
import org.apache.isis.testing.fixtures.applib.IsisModuleTestingFixturesApplib;
@@ -38,7 +39,7 @@ public abstract class ApplicationIntegTestAbstract extends IsisIntegrationTestAb
@Configuration
@Import({
IsisModuleCoreRuntimeServices.class,
- IsisModuleJdoIntegration.class,
+ IsisModuleJdoDatanucleus.class,
IsisModuleSecurityBypass.class,
IsisModuleTestingFixturesApplib.class,