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 2019/12/12 14:17:13 UTC
[isis] branch master updated: ISIS-2224: fixes smoketests
complaining about missing properties
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 96d445b ISIS-2224: fixes smoketests complaining about missing properties
96d445b is described below
commit 96d445bd5c743f335ba53f4e9627b3798100203f
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Dec 12 15:17:03 2019 +0100
ISIS-2224: fixes smoketests complaining about missing properties
---
.../apache/isis/testdomain/bootstrapping/AutoConfigurationTest.java | 3 +++
.../isis/testdomain/bootstrapping/SpringServiceInjectOrderTest.java | 3 +++
.../isis/testdomain/bootstrapping/SpringServiceProvisioningTest.java | 3 +++
.../apache/isis/testdomain/domainmodel/AnnotationSyntesizerTest.java | 4 +++-
.../isis/testdomain/domainmodel/DomainModelTest_usingBadDomain.java | 3 +++
.../isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java | 5 ++++-
6 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/AutoConfigurationTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/AutoConfigurationTest.java
index 23df658..f3209a1 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/AutoConfigurationTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/AutoConfigurationTest.java
@@ -32,6 +32,7 @@ import org.springframework.test.context.TestPropertySource;
import org.apache.isis.commons.internal.environment.IsisSystemEnvironment;
import org.apache.isis.config.beans.IsisBeanFactoryPostProcessorForSpring;
import org.apache.isis.config.beans.IsisBeanTypeRegistryHolder;
+import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.metamodel.context.MetaModelContexts;
//import org.apache.isis.testdomain.Incubating;
import org.apache.isis.testdomain.Smoketest;
@@ -62,6 +63,8 @@ import lombok.val;
})
@TestPropertySource({
//IsisPresets.DebugDiscovery
+ IsisPresets.SilenceMetaModel,
+ IsisPresets.SilenceProgrammingModel
})
//@Incubating("under construction, not tested with surefire yet")
class AutoConfigurationTest {
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceInjectOrderTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceInjectOrderTest.java
index 4c23c60..b4e4a5b 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceInjectOrderTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceInjectOrderTest.java
@@ -40,6 +40,7 @@ import org.springframework.test.context.TestPropertySource;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.services.message.MessageService;
+import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.runtime.services.message.MessageServiceDefault;
//import org.apache.isis.testdomain.Incubating;
import org.apache.isis.testdomain.Smoketest;
@@ -72,6 +73,8 @@ import lombok.val;
})
@TestPropertySource({
//IsisPresets.DebugDiscovery
+ IsisPresets.SilenceMetaModel,
+ IsisPresets.SilenceProgrammingModel
})
//@Incubating("with development work on 'v2' the reference list of services constantly changes")
class SpringServiceInjectOrderTest {
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceProvisioningTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceProvisioningTest.java
index 5c87a06..921a875 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceProvisioningTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceProvisioningTest.java
@@ -35,6 +35,7 @@ import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.commons.internal.environment.IsisSystemEnvironment;
import org.apache.isis.commons.internal.ioc.ManagedBeanAdapter;
import org.apache.isis.commons.internal.resources._Resources;
+import org.apache.isis.config.presets.IsisPresets;
//import org.apache.isis.testdomain.Incubating;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingJdo;
@@ -58,6 +59,8 @@ import lombok.val;
})
@TestPropertySource({
//IsisPresets.DebugDiscovery
+ IsisPresets.SilenceMetaModel,
+ IsisPresets.SilenceProgrammingModel
})
//@Incubating("with development work on 'v2' the reference list of services constantly changes")
class SpringServiceProvisioningTest {
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/AnnotationSyntesizerTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/AnnotationSyntesizerTest.java
index 45c22cb..bce8f3c 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/AnnotationSyntesizerTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/AnnotationSyntesizerTest.java
@@ -30,6 +30,7 @@ import org.apache.isis.applib.events.domain.ActionDomainEvent;
import org.apache.isis.applib.services.jaxb.JaxbService;
import org.apache.isis.applib.services.metamodel.MetaModelService;
import org.apache.isis.commons.internal.reflection._Annotations;
+import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.schema.metamodel.v1.DomainClassDto;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_headless;
@@ -55,7 +56,8 @@ import lombok.val;
@TestPropertySource({
//IsisPresets.DebugMetaModel,
//IsisPresets.DebugProgrammingModel,
-
+ IsisPresets.SilenceMetaModel,
+ IsisPresets.SilenceProgrammingModel
})
class AnnotationSyntesizerTest {
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain.java
index 20d6ab2..450b2c3 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain.java
@@ -28,6 +28,7 @@ import org.springframework.test.context.TestPropertySource;
import org.apache.isis.commons.internal.environment.IsisSystemEnvironment;
import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.config.metamodel.specloader.IntrospectionMode;
+import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.integtestsupport.validate.ValidateDomainModel;
import org.apache.isis.metamodel.spec.DomainModelException;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
@@ -57,6 +58,8 @@ import lombok.val;
@TestPropertySource({
//IsisPresets.DebugMetaModel,
//IsisPresets.DebugProgrammingModel,
+ IsisPresets.SilenceMetaModel,
+ IsisPresets.SilenceProgrammingModel
})
//@Incubating("does not work, when executed in sequence with other smoketests")
class DomainModelTest_usingBadDomain {
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
index 6911dfb..9086d53 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
@@ -24,6 +24,7 @@ import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.TestPropertySource;
+import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.integtestsupport.validate.ValidateDomainModel;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
import org.apache.isis.metamodel.specloader.specimpl.IntrospectionState;
@@ -53,7 +54,9 @@ import lombok.val;
})
@TestPropertySource({
//IsisPresets.DebugMetaModel,
- //IsisPresets.DebugProgrammingModel,
+ //IsisPresets.DebugProgrammingModel,
+ IsisPresets.SilenceMetaModel,
+ IsisPresets.SilenceProgrammingModel
})
//@Transactional
class DomainModelTest_usingGoodDomain {