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 2022/07/31 21:22:47 UTC
[isis-app-simpleapp] branch jdo-SNAPSHOT updated (f73a418 -> f3428f0)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch jdo-SNAPSHOT
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
from f73a418 uses datanucleus.schema.generated-database.mode rather than 'auto-create-tables'
add ee25597 ISIS-2965: fixes integ test for M8
add 93e6696 updates for latest
new 59134c0 Merge branch 'jpa-SNAPSHOT' into jdo-SNAPSHOT
new f3428f0 fixing integ tests (wip)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.run/SimpleApp.run.xml | 10 ++++
README.adoc | 2 +-
.../integtests/tests/SimpleObjects_IntegTest.java | 44 +++++++++++++----
.../domainapp/modules/simple/SimpleModule.java | 5 +-
.../dom/so/SimpleObject#others.columnOrder.txt | 2 -
.../modules/simple/dom/so/SimpleObject.layout.xml | 55 ++++++++++++----------
.../main/java/domainapp/webapp/AppManifest.java | 5 ++
.../src/main/resources/static/css/application.css | 3 ++
8 files changed, 86 insertions(+), 40 deletions(-)
create mode 100644 .run/SimpleApp.run.xml
delete mode 100644 module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject#others.columnOrder.txt
[isis-app-simpleapp] 02/02: fixing integ tests (wip)
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch jdo-SNAPSHOT
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
commit f3428f0c7a1ea1a797513fc7abbe4d291718dc7d
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Jul 31 22:22:39 2022 +0100
fixing integ tests (wip)
---
.../modules/simple/integtests/tests/SimpleObjects_IntegTest.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/module-simple-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObjects_IntegTest.java b/module-simple-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObjects_IntegTest.java
index bad136d..748edd9 100644
--- a/module-simple-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObjects_IntegTest.java
+++ b/module-simple-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObjects_IntegTest.java
@@ -4,6 +4,7 @@ import java.util.List;
import java.util.Optional;
import javax.inject.Inject;
+import javax.jdo.JDOFatalDataStoreException;
import javax.persistence.RollbackException;
import org.assertj.core.api.Assertions;
@@ -23,6 +24,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
import org.apache.isis.applib.services.iactnlayer.InteractionService;
import org.apache.isis.applib.services.xactn.TransactionService;
import org.apache.isis.commons.functional.Try;
+import org.apache.isis.persistence.jdo.spring.exceptions.JdoResourceFailureException;
import org.apache.isis.testing.unittestsupport.applib.matchers.ThrowableMatchers;
import lombok.val;
@@ -106,8 +108,8 @@ public class SimpleObjects_IntegTest extends SimpleModuleIntegTestAbstract {
assertThat(attempt.isFailure()).isTrue();
val failureIfAny = attempt.getFailure();
assertThat(failureIfAny).isPresent();
- assertThat(failureIfAny.get()).isInstanceOf(TransactionSystemException.class);
- assertThat(failureIfAny.get().getCause()).isInstanceOf(RollbackException.class);
+ assertThat(failureIfAny.get()).isInstanceOf(JdoResourceFailureException.class);
+ assertThat(failureIfAny.get()).hasMessageContaining("rollback-only");
}
[isis-app-simpleapp] 01/02: Merge branch 'jpa-SNAPSHOT' into jdo-SNAPSHOT
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch jdo-SNAPSHOT
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
commit 59134c0fc998f4eacb099a62e8c6494bf8656e54
Merge: f73a418 93e6696
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Jul 31 22:11:52 2022 +0100
Merge branch 'jpa-SNAPSHOT' into jdo-SNAPSHOT
.run/SimpleApp.run.xml | 10 ++++
README.adoc | 2 +-
.../integtests/tests/SimpleObjects_IntegTest.java | 42 +++++++++++++----
.../domainapp/modules/simple/SimpleModule.java | 5 +-
.../dom/so/SimpleObject#others.columnOrder.txt | 2 -
.../modules/simple/dom/so/SimpleObject.layout.xml | 55 ++++++++++++----------
.../main/java/domainapp/webapp/AppManifest.java | 5 ++
.../src/main/resources/static/css/application.css | 3 ++
8 files changed, 84 insertions(+), 40 deletions(-)
diff --cc webapp/src/main/java/domainapp/webapp/AppManifest.java
index 8b66964,cfbfcda..557bda8
--- a/webapp/src/main/java/domainapp/webapp/AppManifest.java
+++ b/webapp/src/main/java/domainapp/webapp/AppManifest.java
@@@ -22,9 -24,12 +24,12 @@@ import domainapp.webapp.quartz.QuartzMo
@Configuration
@Import({
+ IsisModuleApplibMixins.class,
+ IsisModuleApplibChangeAndExecutionLoggers.class,
+
IsisModuleCoreRuntimeServices.class,
IsisModuleSecurityShiro.class,
- IsisModulePersistenceJpaEclipselink.class,
+ IsisModulePersistenceJdoDatanucleus.class,
IsisModuleViewerRestfulObjectsJaxrsResteasy4.class,
IsisModuleViewerWicketViewer.class,