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 2020/01/03 18:23:03 UTC
[isis] branch master updated: ISIS-2247: adds
IsisPresets.UseLog4j2Test
This is an automated email from the ASF dual-hosted git repository.
danhaywood 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 74d37b8 ISIS-2247: adds IsisPresets.UseLog4j2Test
74d37b8 is described below
commit 74d37b86a77ad7b443086dec37d86097281f3713
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 3 17:40:41 2020 +0000
ISIS-2247: adds IsisPresets.UseLog4j2Test
---
.../org/apache/isis/config/presets/IsisPresets.java | 1 +
.../isis/config/presets/UseLog4j2Test.properties | 18 ++++++++++++++++++
.../isis/testdomain/auditing/AuditerServiceTest.java | 4 +++-
.../bootstrapping/AutoConfigurationTest.java | 3 ++-
.../testdomain/bootstrapping/JdoBootstrappingTest.java | 10 +++++-----
.../bootstrapping/SpringServiceInjectOrderTest.java | 4 ++--
.../bootstrapping/SpringServiceProvisioningTest.java | 4 ++--
.../isis/testdomain/commandexecution/WrapperTest.java | 9 +++++----
.../org/apache/isis/testdomain/config/FooTest.java | 6 ++++--
.../isis/testdomain/config/IsisConfigBeanTest.java | 11 ++++++-----
.../config/IsisConfigBeanTest_usingHeadless.java | 10 +++++-----
.../isis/testdomain/ldap/LdapEmbeddedServerTest.java | 6 ++++--
.../testdomain/publishing/PublisherServiceTest.java | 4 ++--
.../apache/isis/testdomain/rest/RestServiceTest.java | 7 +++----
.../apache/isis/testdomain/shiro/ShiroLdapTest.java | 9 ++++-----
.../shiro/ShiroSecmanLdap_restfulStressTest.java | 1 +
.../apache/isis/testdomain/shiro/ShiroSecmanTest.java | 6 +++---
.../transactions/TransactionRollbackTest.java | 7 +++----
.../TransactionRollbackTest_usingTransactional.java | 7 +++----
.../excel/integtests/ExcelModuleIntegTestAbstract.java | 4 ++--
.../integtests/FakeDataModuleIntegTestAbstract.java | 4 ++--
21 files changed, 80 insertions(+), 55 deletions(-)
diff --git a/core/config/src/main/java/org/apache/isis/config/presets/IsisPresets.java b/core/config/src/main/java/org/apache/isis/config/presets/IsisPresets.java
index a556c36..b008a6f 100644
--- a/core/config/src/main/java/org/apache/isis/config/presets/IsisPresets.java
+++ b/core/config/src/main/java/org/apache/isis/config/presets/IsisPresets.java
@@ -46,6 +46,7 @@ public final class IsisPresets {
public static final String SilenceMetaModel = "classpath:/org/apache/isis/config/presets/SilenceMetaModel.properties";
public static final String SilenceWicket = "classpath:/org/apache/isis/config/presets/SilenceWicket.properties";
+ public static final String UseLog4j2Test = "classpath:/org/apache/isis/config/presets/UseLog4j2Test.properties";
/**
* @deprecated seems no longer required anyway
diff --git a/core/config/src/main/java/org/apache/isis/config/presets/UseLog4j2Test.properties b/core/config/src/main/java/org/apache/isis/config/presets/UseLog4j2Test.properties
new file mode 100644
index 0000000..df0c635
--- /dev/null
+++ b/core/config/src/main/java/org/apache/isis/config/presets/UseLog4j2Test.properties
@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+logging.config=log4j2-test.xml
\ No newline at end of file
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/auditing/AuditerServiceTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/auditing/AuditerServiceTest.java
index 382782d..110dbf2 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/auditing/AuditerServiceTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/auditing/AuditerServiceTest.java
@@ -31,6 +31,7 @@ import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.stereotype.Service;
import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.TestPropertySources;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.support.TransactionTemplate;
@@ -64,7 +65,8 @@ import lombok.extern.log4j.Log4j2;
"logging.config=log4j2-test.xml",
})
@TestPropertySource({
- IsisPresets.SilenceWicket // just to have any config properties at all
+ IsisPresets.SilenceWicket
+ ,IsisPresets.UseLog4j2Test
})
@Incubating("inconsitent state when run in a test batch")
//@Transactional //XXX this test is non transactional
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 f3209a1..e230773 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
@@ -64,7 +64,8 @@ import lombok.val;
@TestPropertySource({
//IsisPresets.DebugDiscovery
IsisPresets.SilenceMetaModel,
- IsisPresets.SilenceProgrammingModel
+ IsisPresets.SilenceProgrammingModel,
+ IsisPresets.UseLog4j2Test,
})
//@Incubating("under construction, not tested with surefire yet")
class AutoConfigurationTest {
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest.java
index 48e2eec..a3e3cba 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest.java
@@ -24,6 +24,7 @@ import java.util.Set;
import javax.inject.Inject;
+import org.apache.isis.config.presets.IsisPresets;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.MethodOrderer;
@@ -32,6 +33,7 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.annotation.Rollback;
+import org.springframework.test.context.TestPropertySource;
import org.springframework.transaction.annotation.Transactional;
import org.apache.isis.applib.services.repository.RepositoryService;
@@ -50,11 +52,9 @@ import lombok.val;
@SpringBootTest(
classes = {
Configuration_usingJdo.class,
- },
- properties = {
- "logging.config=log4j2-test.xml",
- //IsisPresets.DebugPersistence,
- })
+ }
+)
+@TestPropertySource(IsisPresets.UseLog4j2Test)
@Transactional @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
class JdoBootstrappingTest {
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 b4e4a5b..4ef0824 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
@@ -67,14 +67,14 @@ import lombok.val;
SpringServiceInjectOrderTest.DummyService.class
},
properties = {
- "logging.config=log4j2-test.xml",
// "isis.reflector.introspector.parallelize=false",
// "logging.level.org.apache.isis.metamodel.specloader.specimpl.ObjectSpecificationAbstract=TRACE"
})
@TestPropertySource({
//IsisPresets.DebugDiscovery
IsisPresets.SilenceMetaModel,
- IsisPresets.SilenceProgrammingModel
+ IsisPresets.SilenceProgrammingModel,
+ IsisPresets.UseLog4j2Test
})
//@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 d27b66a..3a3f1c8 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
@@ -54,14 +54,14 @@ import lombok.val;
Configuration_usingJdo.class,
},
properties = {
- "logging.config=log4j2-test.xml",
// "isis.reflector.introspector.parallelize=false",
// "logging.level.org.apache.isis.metamodel.specloader.specimpl.ObjectSpecificationAbstract=TRACE"
})
@TestPropertySource({
//IsisPresets.DebugDiscovery
IsisPresets.SilenceMetaModel,
- IsisPresets.SilenceProgrammingModel
+ IsisPresets.SilenceProgrammingModel,
+ IsisPresets.UseLog4j2Test,
})
//@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/commandexecution/WrapperTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/commandexecution/WrapperTest.java
index d9c69f0..7b30f8a 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/commandexecution/WrapperTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/commandexecution/WrapperTest.java
@@ -26,6 +26,7 @@ import java.util.concurrent.TimeUnit;
import javax.inject.Inject;
+import org.apache.isis.config.presets.IsisPresets;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
@@ -43,6 +44,7 @@ import org.apache.isis.testdomain.conf.Configuration_usingJdo;
import org.apache.isis.testdomain.jdo.InventoryManager;
import org.apache.isis.testdomain.jdo.JdoTestDomainPersona;
import org.apache.isis.testdomain.jdo.Product;
+import org.springframework.test.context.TestPropertySource;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -57,10 +59,9 @@ import lombok.extern.log4j.Log4j2;
classes = {
Configuration_usingJdo.class,
WrapperTest.ActionDomainEventListener.class
- },
- properties = {
- "logging.config=log4j2-test.xml",
- })
+ }
+)
+@TestPropertySource(IsisPresets.UseLog4j2Test)
@Incubating("inconsitent state when run in a test batch")
class WrapperTest {
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/FooTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/FooTest.java
index 0494cb2..516ab3e 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/FooTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/FooTest.java
@@ -24,6 +24,7 @@ import java.util.Map;
import javax.inject.Inject;
import javax.inject.Named;
+import org.apache.isis.config.presets.IsisPresets;
import org.junit.jupiter.api.Test;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -32,6 +33,7 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.apache.isis.testdomain.Smoketest;
+import org.springframework.test.context.TestPropertySource;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -43,13 +45,13 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
FooTest.Setup.class
},
properties = {
- "logging.config=log4j2-test.xml",
-
+
"foo.flag=true",
"foo.uuid=${random.uuid}",
"foo.random-schema=test_${random.uuid}",
"foo.ConnectionURL=jdbc:h2:mem:test"
})
+@TestPropertySource(IsisPresets.UseLog4j2Test)
@EnableConfigurationProperties(FooProperties.class)
class FooTest {
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/IsisConfigBeanTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/IsisConfigBeanTest.java
index 86a4805..353a8ac 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/IsisConfigBeanTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/IsisConfigBeanTest.java
@@ -20,6 +20,7 @@ package org.apache.isis.testdomain.config;
import javax.inject.Inject;
+import org.apache.isis.config.presets.IsisPresets;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.TestPropertySource;
@@ -35,13 +36,13 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
@SpringBootTest(
classes = {
IsisModuleConfig.class
- },
- properties = {
- "logging.config=log4j2-test.xml",
- })
+ }
+ )
@TestPropertySource({
- "classpath:/application-config-test.properties"
+ "classpath:/application-config-test.properties",
+ IsisPresets.UseLog4j2Test
})
+
class IsisConfigBeanTest {
@Inject private IsisConfiguration isisConfiguration;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/IsisConfigBeanTest_usingHeadless.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/IsisConfigBeanTest_usingHeadless.java
index c2792db..a78f7c7 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/IsisConfigBeanTest_usingHeadless.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/IsisConfigBeanTest_usingHeadless.java
@@ -20,6 +20,7 @@ package org.apache.isis.testdomain.config;
import javax.inject.Inject;
+import org.apache.isis.config.presets.IsisPresets;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.TestPropertySource;
@@ -35,12 +36,11 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
@SpringBootTest(
classes = {
Configuration_headless.class
- },
- properties = {
- "logging.config=log4j2-test.xml",
- })
+ }
+)
@TestPropertySource({
- "classpath:/application-config-test.properties"
+ "classpath:/application-config-test.properties",
+ IsisPresets.UseLog4j2Test
})
class IsisConfigBeanTest_usingHeadless {
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/ldap/LdapEmbeddedServerTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/ldap/LdapEmbeddedServerTest.java
index 7b75b20..19dd8ce 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/ldap/LdapEmbeddedServerTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/ldap/LdapEmbeddedServerTest.java
@@ -25,11 +25,13 @@ import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
+import org.apache.isis.config.presets.IsisPresets;
import org.junit.jupiter.api.Test;
import org.junit.runners.model.InitializationError;
import org.springframework.boot.test.context.SpringBootTest;
import org.apache.isis.testdomain.Smoketest;
+import org.springframework.test.context.TestPropertySource;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.fail;
@@ -38,9 +40,9 @@ import lombok.val;
@Smoketest
@SpringBootTest(
- classes = {LdapServerService.class},
- properties = {"logging.config=log4j2-test.xml" }
+ classes = {LdapServerService.class}
)
+@TestPropertySource(IsisPresets.UseLog4j2Test)
class LdapEmbeddedServerTest {
@Inject LdapServerService ldapServerService;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/publishing/PublisherServiceTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/publishing/PublisherServiceTest.java
index 61a1560..857a7a2 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/publishing/PublisherServiceTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/publishing/PublisherServiceTest.java
@@ -65,13 +65,13 @@ import lombok.val;
PublisherServiceTest.PublisherServiceProbe.class
},
properties = {
- "logging.config=log4j2-test.xml",
"logging.level.org.apache.isis.incubator.IsisPlatformTransactionManagerForJdo=DEBUG",
// "isis.reflector.introspector.parallelize=false",
// "logging.level.org.apache.isis.metamodel.specloader.specimpl.ObjectSpecificationAbstract=TRACE"
})
@TestPropertySource({
- IsisPresets.SilenceWicket // just to have any config properties at all
+ IsisPresets.SilenceWicket, // just to have any config properties at all
+ IsisPresets.UseLog4j2Test
})
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
@Incubating("inconsitent state when run in a test batch")
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/rest/RestServiceTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/rest/RestServiceTest.java
index 940f9b8..4018ff3 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/rest/RestServiceTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/rest/RestServiceTest.java
@@ -21,6 +21,7 @@ package org.apache.isis.testdomain.rest;
import javax.inject.Inject;
import javax.xml.bind.JAXBException;
+import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.viewer.restfulobjects.jaxrsresteasy4.IsisModuleRestfulObjectsJaxrsResteasy4;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
@@ -30,6 +31,7 @@ import org.springframework.context.annotation.Import;
import org.apache.isis.testdomain.conf.Configuration_usingJdo;
import org.apache.isis.testdomain.jdo.Book;
import org.apache.isis.viewer.restfulobjects.viewer.IsisModuleRestfulObjectsViewer;
+import org.springframework.test.context.TestPropertySource;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -40,11 +42,8 @@ import lombok.val;
@SpringBootTest(
classes = {RestEndpointService.class},
- properties = {
- "logging.config=log4j2-test.xml",
- ""
- },
webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@TestPropertySource(IsisPresets.UseLog4j2Test)
@Import({
Configuration_usingJdo.class,
IsisModuleRestfulObjectsJaxrsResteasy4.class
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroLdapTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroLdapTest.java
index dc94a10..0c06395 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroLdapTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroLdapTest.java
@@ -20,6 +20,7 @@ package org.apache.isis.testdomain.shiro;
import javax.inject.Inject;
+import org.apache.isis.config.presets.IsisPresets;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authc.AuthenticationException;
import org.apache.shiro.authc.AuthenticationToken;
@@ -36,6 +37,7 @@ import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingJdoAndShiro;
import org.apache.isis.testdomain.ldap.LdapConstants;
import org.apache.isis.testdomain.ldap.LdapServerService;
+import org.springframework.test.context.TestPropertySource;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@@ -49,15 +51,12 @@ import lombok.extern.log4j.Log4j2;
@SpringBootTest(
classes = {
Configuration_usingJdoAndShiro.class,
- },
- properties = {
- "logging.config=log4j2-test.xml",
- //IsisPresets.DebugPersistence,
})
@Import({
LdapServerService.class,
})
-@Incubating("inconsitent state when run in a test batch")
+@TestPropertySource(IsisPresets.UseLog4j2Test)
+@Incubating("inconsistent state when run in a test batch")
@Log4j2
class ShiroLdapTest extends AbstractShiroTest {
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java
index 0964153..c54aa21 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java
@@ -45,6 +45,7 @@ import org.apache.isis.testdomain.jdo.JdoTestDomainPersona;
import org.apache.isis.testdomain.ldap.LdapServerService;
import org.apache.isis.testdomain.rest.RestEndpointService;
import org.apache.isis.viewer.restfulobjects.viewer.IsisModuleRestfulObjectsViewer;
+import org.springframework.test.context.TestPropertySource;
import static java.time.Duration.ofMillis;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanTest.java
index 341e0af..21c2f85 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanTest.java
@@ -20,6 +20,7 @@ package org.apache.isis.testdomain.shiro;
import javax.inject.Inject;
+import org.apache.isis.config.presets.IsisPresets;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authc.AuthenticationToken;
import org.apache.shiro.authc.CredentialsException;
@@ -39,6 +40,7 @@ import org.apache.isis.extensions.secman.shiro.IsisModuleSecmanRealmShiro;
import org.apache.isis.testdomain.Incubating;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingJdoAndShiro;
+import org.springframework.test.context.TestPropertySource;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@@ -51,9 +53,6 @@ import lombok.val;
@SpringBootTest(
classes = {
Configuration_usingJdoAndShiro.class,
- },
- properties = {
- "logging.config=log4j2-test.xml",
})
@Import({
// Security Manager Extension (secman)
@@ -62,6 +61,7 @@ import lombok.val;
IsisModuleSecmanPersistenceJdo.class,
IsisModuleSecmanEncryptionJbcrypt.class,
})
+@TestPropertySource(IsisPresets.UseLog4j2Test)
@Incubating("does not work with surefire")
class ShiroSecmanTest extends AbstractShiroTest {
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest.java
index 75cd1a4..f4d3371 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest.java
@@ -20,6 +20,7 @@ package org.apache.isis.testdomain.transactions;
import javax.inject.Inject;
+import org.apache.isis.config.presets.IsisPresets;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
@@ -32,6 +33,7 @@ import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingJdo;
import org.apache.isis.testdomain.jdo.Book;
import org.apache.isis.testdomain.jdo.JdoTestDomainPersona;
+import org.springframework.test.context.TestPropertySource;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -40,11 +42,8 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
@SpringBootTest(
classes = {
Configuration_usingJdo.class,
- },
- properties = {
- "logging.config=log4j2-test.xml",
- //IsisPresets.DebugPersistence,
})
+@TestPropertySource(IsisPresets.UseLog4j2Test)
class TransactionRollbackTest {
@Inject FixtureScripts fixtureScripts;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest_usingTransactional.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest_usingTransactional.java
index a11927d..3a26f6a 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest_usingTransactional.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest_usingTransactional.java
@@ -20,12 +20,14 @@ package org.apache.isis.testdomain.transactions;
import javax.inject.Inject;
+import org.apache.isis.config.presets.IsisPresets;
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.annotation.Commit;
+import org.springframework.test.context.TestPropertySource;
import org.springframework.transaction.annotation.Transactional;
import org.apache.isis.applib.services.repository.RepositoryService;
@@ -46,12 +48,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
@SpringBootTest(
classes = {
Configuration_usingJdo.class,
- },
- properties = {
- "logging.config=log4j2-test.xml",
- //IsisPresets.DebugPersistence,
})
@Transactional
+@TestPropertySource(IsisPresets.UseLog4j2Test)
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
class TransactionRollbackTest_usingTransactional {
diff --git a/extensions/lib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/ExcelModuleIntegTestAbstract.java b/extensions/lib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/ExcelModuleIntegTestAbstract.java
index 8bb0600..3345d2c 100644
--- a/extensions/lib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/ExcelModuleIntegTestAbstract.java
+++ b/extensions/lib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/ExcelModuleIntegTestAbstract.java
@@ -16,9 +16,9 @@ import org.springframework.test.context.ContextConfiguration;
import org.springframework.transaction.annotation.Transactional;
@SpringBootTest(
- classes = ExcelModuleIntegTestAbstract.AppManifest.class,
- properties = {"logging.config=log4j2-test.xml" }
+ classes = ExcelModuleIntegTestAbstract.AppManifest.class
)
+@TestPropertySource(IsisPresets.UseLog4j2Test)
@ContextConfiguration
@Transactional
public abstract class ExcelModuleIntegTestAbstract extends IsisIntegrationTestAbstractWithFixtures {
diff --git a/extensions/testing/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/FakeDataModuleIntegTestAbstract.java b/extensions/testing/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/FakeDataModuleIntegTestAbstract.java
index 3221164..51da384 100644
--- a/extensions/testing/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/FakeDataModuleIntegTestAbstract.java
+++ b/extensions/testing/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/FakeDataModuleIntegTestAbstract.java
@@ -17,9 +17,9 @@ import org.springframework.test.context.ContextConfiguration;
import org.springframework.transaction.annotation.Transactional;
@SpringBootTest(
- classes = FakeDataModuleIntegTestAbstract.AppManifest.class,
- properties = {"logging.config=log4j2-test.xml"}
+ classes = FakeDataModuleIntegTestAbstract.AppManifest.class
)
+@TestPropertySource(IsisPresets.UseLog4j2Test)
@ContextConfiguration
@Transactional
public abstract class FakeDataModuleIntegTestAbstract extends IsisIntegrationTestAbstractWithFixtures {