You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2022/08/14 11:10:11 UTC
[isis] branch master updated: ISIS-3120: adds JUnit test: validate demo domain (JDO)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 24dc5ba164 ISIS-3120: adds JUnit test: validate demo domain (JDO)
24dc5ba164 is described below
commit 24dc5ba164de7c55c7b2a83a6fc623811fb238a1
Author: andi-huber <ah...@apache.org>
AuthorDate: Sun Aug 14 13:10:05 2022 +0200
ISIS-3120: adds JUnit test: validate demo domain (JDO)
---
examples/demo/domain-tests/pom.xml | 1 -
...guration_usingJpa.java => Configuration_usingJdo.java} | 13 ++++++-------
.../dom/domain/tests/conf/Configuration_usingJpa.java | 1 -
...ectionTestJpa.java => DomainIntrospectionTestJdo.java} | 15 +++++----------
.../dom/domain/tests/DomainIntrospectionTestJpa.java | 7 +------
5 files changed, 12 insertions(+), 25 deletions(-)
diff --git a/examples/demo/domain-tests/pom.xml b/examples/demo/domain-tests/pom.xml
index 62c3af4f22..bb93a7385f 100644
--- a/examples/demo/domain-tests/pom.xml
+++ b/examples/demo/domain-tests/pom.xml
@@ -67,7 +67,6 @@
<!-- DEMO DOMAIN ADDITIONAL DEPENDENCIES -->
- <!-- TODO: this should be pulled in by eg. -->
<dependency>
<groupId>org.apache.isis.valuetypes</groupId>
<artifactId>isis-valuetypes-asciidoc-ui</artifactId>
diff --git a/examples/demo/domain-tests/src/main/java/demoapp/dom/domain/tests/conf/Configuration_usingJpa.java b/examples/demo/domain-tests/src/main/java/demoapp/dom/domain/tests/conf/Configuration_usingJdo.java
similarity index 85%
copy from examples/demo/domain-tests/src/main/java/demoapp/dom/domain/tests/conf/Configuration_usingJpa.java
copy to examples/demo/domain-tests/src/main/java/demoapp/dom/domain/tests/conf/Configuration_usingJdo.java
index ef51df013e..62252cd3b4 100644
--- a/examples/demo/domain-tests/src/main/java/demoapp/dom/domain/tests/conf/Configuration_usingJpa.java
+++ b/examples/demo/domain-tests/src/main/java/demoapp/dom/domain/tests/conf/Configuration_usingJdo.java
@@ -27,27 +27,26 @@ 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.persistence.jpa.eclipselink.IsisModulePersistenceJpaEclipselink;
+import org.apache.isis.persistence.jdo.datanucleus.IsisModulePersistenceJdoDatanucleus;
import org.apache.isis.testing.fixtures.applib.IsisModuleTestingFixturesApplib;
-import demoapp.web.DemoAppManifestJpa;
+import demoapp.web.DemoAppManifestJdo;
@SpringBootConfiguration
@EnableAutoConfiguration
@Import({
IsisModuleCoreRuntimeServices.class,
- IsisModulePersistenceJpaEclipselink.class,
+ IsisModulePersistenceJdoDatanucleus.class,
IsisModuleTestingFixturesApplib.class,
// demo domain
- DemoAppManifestJpa.class,
- //DemoModuleJpa.class,
+ DemoAppManifestJdo.class,
})
@PropertySources({
@PropertySource(IsisPresets.NoTranslations),
@PropertySource(IsisPresets.H2InMemory_withUniqueSchema),
})
-@Profile("demo-jpa")
-public class Configuration_usingJpa {
+@Profile("demo-jdo")
+public class Configuration_usingJdo {
}
diff --git a/examples/demo/domain-tests/src/main/java/demoapp/dom/domain/tests/conf/Configuration_usingJpa.java b/examples/demo/domain-tests/src/main/java/demoapp/dom/domain/tests/conf/Configuration_usingJpa.java
index ef51df013e..3e9004e59f 100644
--- a/examples/demo/domain-tests/src/main/java/demoapp/dom/domain/tests/conf/Configuration_usingJpa.java
+++ b/examples/demo/domain-tests/src/main/java/demoapp/dom/domain/tests/conf/Configuration_usingJpa.java
@@ -41,7 +41,6 @@ import demoapp.web.DemoAppManifestJpa;
// demo domain
DemoAppManifestJpa.class,
- //DemoModuleJpa.class,
})
@PropertySources({
@PropertySource(IsisPresets.NoTranslations),
diff --git a/examples/demo/domain-tests/src/test/java/demoapp/dom/domain/tests/DomainIntrospectionTestJpa.java b/examples/demo/domain-tests/src/test/java/demoapp/dom/domain/tests/DomainIntrospectionTestJdo.java
similarity index 88%
copy from examples/demo/domain-tests/src/test/java/demoapp/dom/domain/tests/DomainIntrospectionTestJpa.java
copy to examples/demo/domain-tests/src/test/java/demoapp/dom/domain/tests/DomainIntrospectionTestJdo.java
index 1ca7992a97..bdb775ddfb 100644
--- a/examples/demo/domain-tests/src/test/java/demoapp/dom/domain/tests/DomainIntrospectionTestJpa.java
+++ b/examples/demo/domain-tests/src/test/java/demoapp/dom/domain/tests/DomainIntrospectionTestJdo.java
@@ -35,16 +35,16 @@ import org.apache.isis.testing.integtestsupport.applib.validate.DomainModelValid
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.fail;
-import demoapp.dom.domain.tests.conf.Configuration_usingJpa;
+import demoapp.dom.domain.tests.conf.Configuration_usingJdo;
import lombok.val;
@SpringBootTest(
classes = {
- Configuration_usingJpa.class,
+ Configuration_usingJdo.class,
},
properties = {
"isis.core.meta-model.introspector.mode=FULL",
- "isis.core.config.configuration-property-visibility-policy=ALWAYS_SHOW",
+ //"isis.core.config.configuration-property-visibility-policy=ALWAYS_SHOW",
"isis.applib.annotation.domain-object.editing=TRUE",
"isis.core.meta-model.validator.explicit-object-type=FALSE", // does not override any of the imports
"logging.level.DependentArgUtils=DEBUG"
@@ -53,8 +53,8 @@ import lombok.val;
IsisPresets.SilenceMetaModel,
IsisPresets.SilenceProgrammingModel
})
-@ActiveProfiles(profiles = "demo-jpa")
-class DomainIntrospectionTestJpa {
+@ActiveProfiles(profiles = "demo-jdo")
+class DomainIntrospectionTestJdo {
//@Inject private MetaModelService metaModelService;
//@Inject private JaxbService jaxbService;
@@ -67,18 +67,13 @@ class DomainIntrospectionTestJpa {
@Test
void domain_shouldPassValidation() {
- //debug();
assertFalse(specificationLoader.snapshotSpecifications().isEmpty());
val validateDomainModel = new DomainModelValidator(serviceRegistry);
-
- // guard against left overs from shared context
val validationFailures = validateDomainModel.getFailures().stream()
- .filter(f->!f.getOrigin().getClassName().contains("bad"))
.collect(Collectors.toSet());
if(!validationFailures.isEmpty()) {
-
fail(String.format("%d problems found:\n%s",
validationFailures.size(),
validationFailures.stream()
diff --git a/examples/demo/domain-tests/src/test/java/demoapp/dom/domain/tests/DomainIntrospectionTestJpa.java b/examples/demo/domain-tests/src/test/java/demoapp/dom/domain/tests/DomainIntrospectionTestJpa.java
index 1ca7992a97..886fd23cc7 100644
--- a/examples/demo/domain-tests/src/test/java/demoapp/dom/domain/tests/DomainIntrospectionTestJpa.java
+++ b/examples/demo/domain-tests/src/test/java/demoapp/dom/domain/tests/DomainIntrospectionTestJpa.java
@@ -44,7 +44,7 @@ import lombok.val;
},
properties = {
"isis.core.meta-model.introspector.mode=FULL",
- "isis.core.config.configuration-property-visibility-policy=ALWAYS_SHOW",
+ //"isis.core.config.configuration-property-visibility-policy=ALWAYS_SHOW",
"isis.applib.annotation.domain-object.editing=TRUE",
"isis.core.meta-model.validator.explicit-object-type=FALSE", // does not override any of the imports
"logging.level.DependentArgUtils=DEBUG"
@@ -67,18 +67,13 @@ class DomainIntrospectionTestJpa {
@Test
void domain_shouldPassValidation() {
- //debug();
assertFalse(specificationLoader.snapshotSpecifications().isEmpty());
val validateDomainModel = new DomainModelValidator(serviceRegistry);
-
- // guard against left overs from shared context
val validationFailures = validateDomainModel.getFailures().stream()
- .filter(f->!f.getOrigin().getClassName().contains("bad"))
.collect(Collectors.toSet());
if(!validationFailures.isEmpty()) {
-
fail(String.format("%d problems found:\n%s",
validationFailures.size(),
validationFailures.stream()