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 13:27:23 UTC
[isis] branch master updated: ISIS-2224: remove debug logging,
activate smoketests profile in CI
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 4aad702 ISIS-2224: remove debug logging, activate smoketests profile in CI
4aad702 is described below
commit 4aad7023118cda9605f65e0e98c3bf79b181cb10
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Dec 12 14:27:13 2019 +0100
ISIS-2224: remove debug logging, activate smoketests profile in CI
---
.github/workflows/ci-build-core-no-push.yml | 3 +++
.../org/apache/isis/testdomain/auditing/AuditerServiceTest.java | 3 +--
.../isis/testdomain/bootstrapping/AutoConfigurationTest.java | 3 +--
.../isis/testdomain/bootstrapping/JdoBootstrappingTest.java | 9 ++++-----
.../bootstrapping/JdoBootstrappingTest_usingFixtures.java | 3 +--
.../testdomain/bootstrapping/SpringServiceInjectOrderTest.java | 3 +--
.../testdomain/bootstrapping/SpringServiceProvisioningTest.java | 5 ++---
.../org/apache/isis/testdomain/config/IsisConfigBeanTest.java | 2 +-
.../isis/testdomain/domainmodel/AnnotationSyntesizerTest.java | 5 ++---
.../testdomain/domainmodel/DomainModelTest_usingBadDomain.java | 5 ++---
.../testdomain/domainmodel/DomainModelTest_usingGoodDomain.java | 5 ++---
.../org/apache/isis/testdomain/ldap/LdapEmbeddedServerTest.java | 6 +++---
.../java/org/apache/isis/testdomain/shiro/ShiroLdapTest.java | 5 +++--
.../org/apache/isis/testdomain/shiro/ShiroSecmanLdapTest.java | 5 +----
.../isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java | 2 +-
.../java/org/apache/isis/testdomain/shiro/ShiroSimpleTest.java | 8 ++++----
.../isis/testdomain/transactions/TransactionRollbackTest.java | 3 +--
.../transactions/TransactionRollbackTest_usingTransactional.java | 3 +--
18 files changed, 34 insertions(+), 44 deletions(-)
diff --git a/.github/workflows/ci-build-core-no-push.yml b/.github/workflows/ci-build-core-no-push.yml
index 33055db..7029e20 100644
--- a/.github/workflows/ci-build-core-no-push.yml
+++ b/.github/workflows/ci-build-core-no-push.yml
@@ -60,6 +60,9 @@ jobs:
- name: Build Core
shell: bash
run: bash $CI_SCRIPTS_PATH/build-core.sh
+ env:
+ # also build and run smoketests
+ MVN_ADDITIONAL_OPTS: -Dsmoketests-module
# FOR DEBUG USE
# - name: Dump GitHub context
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 c212602..7fa85c2 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
@@ -39,7 +39,6 @@ import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.applib.services.wrapper.WrapperFactory.ExecutionMode;
-import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
import org.apache.isis.testdomain.Incubating;
import org.apache.isis.testdomain.Smoketest;
@@ -62,7 +61,7 @@ import lombok.extern.log4j.Log4j2;
"logging.config=log4j2-test.xml",
})
@TestPropertySource({
- IsisPresets.DebugPersistence
+ //IsisPresets.DebugPersistence
})
@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 851f08b..23df658 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
@@ -30,7 +30,6 @@ import org.springframework.stereotype.Component;
import org.springframework.test.context.TestPropertySource;
import org.apache.isis.commons.internal.environment.IsisSystemEnvironment;
-import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.config.beans.IsisBeanFactoryPostProcessorForSpring;
import org.apache.isis.config.beans.IsisBeanTypeRegistryHolder;
import org.apache.isis.metamodel.context.MetaModelContexts;
@@ -62,7 +61,7 @@ import lombok.val;
// "logging.level.org.apache.isis.metamodel.specloader.specimpl.ObjectSpecificationAbstract=TRACE"
})
@TestPropertySource({
- IsisPresets.DebugDiscovery
+ //IsisPresets.DebugDiscovery
})
//@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 d65c321..48e2eec 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
@@ -18,9 +18,6 @@
*/
package org.apache.isis.testdomain.bootstrapping;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
import java.sql.SQLException;
import java.util.HashSet;
import java.util.Set;
@@ -38,13 +35,15 @@ import org.springframework.test.annotation.Rollback;
import org.springframework.transaction.annotation.Transactional;
import org.apache.isis.applib.services.repository.RepositoryService;
-import org.apache.isis.config.presets.IsisPresets;
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.Inventory;
import org.apache.isis.testdomain.jdo.Product;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import lombok.val;
@Smoketest
@@ -54,7 +53,7 @@ import lombok.val;
},
properties = {
"logging.config=log4j2-test.xml",
- IsisPresets.DebugPersistence,
+ //IsisPresets.DebugPersistence,
})
@Transactional @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
class JdoBootstrappingTest {
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest_usingFixtures.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest_usingFixtures.java
index a52f2a8..7a4a63a 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest_usingFixtures.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest_usingFixtures.java
@@ -26,7 +26,6 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.transaction.annotation.Transactional;
import org.apache.isis.applib.services.repository.RepositoryService;
-import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.config.beans.IsisBeanFactoryPostProcessorForSpring;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
import org.apache.isis.testdomain.Smoketest;
@@ -47,7 +46,7 @@ import lombok.val;
},
properties = {
"logging.config=log4j2-debug-persistence.xml",
- IsisPresets.DebugPersistence,
+ //IsisPresets.DebugPersistence,
})
@Transactional
class JdoBootstrappingTest_usingFixtures {
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 f9945e8..4c23c60 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,7 +40,6 @@ 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,7 +71,7 @@ import lombok.val;
// "logging.level.org.apache.isis.metamodel.specloader.specimpl.ObjectSpecificationAbstract=TRACE"
})
@TestPropertySource({
- IsisPresets.DebugDiscovery
+ //IsisPresets.DebugDiscovery
})
//@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 c2e98eb..5c87a06 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
@@ -25,7 +25,6 @@ import java.util.stream.Collectors;
import javax.inject.Inject;
-import org.apache.isis.commons.internal.environment.IsisSystemEnvironment;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
@@ -33,9 +32,9 @@ import org.springframework.test.context.TestPropertySource;
import org.apache.isis.applib.services.registry.ServiceRegistry;
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,7 +57,7 @@ import lombok.val;
// "logging.level.org.apache.isis.metamodel.specloader.specimpl.ObjectSpecificationAbstract=TRACE"
})
@TestPropertySource({
- IsisPresets.DebugDiscovery
+ //IsisPresets.DebugDiscovery
})
//@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/config/IsisConfigBeanTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/config/IsisConfigBeanTest.java
index e1d5305..86a4805 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
@@ -24,8 +24,8 @@ import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.TestPropertySource;
-import org.apache.isis.config.IsisModuleConfig;
import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.IsisModuleConfig;
import org.apache.isis.testdomain.Smoketest;
import static org.junit.jupiter.api.Assertions.assertNotNull;
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 04b9be4..45c22cb 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,7 +30,6 @@ 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;
@@ -54,8 +53,8 @@ import lombok.val;
"isis.reflector.introspector.mode=FULL"
})
@TestPropertySource({
- IsisPresets.DebugMetaModel,
- IsisPresets.DebugProgrammingModel,
+ //IsisPresets.DebugMetaModel,
+ //IsisPresets.DebugProgrammingModel,
})
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 794de40..20d6ab2 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
@@ -27,10 +27,9 @@ 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.presets.IsisPresets;
+import org.apache.isis.config.metamodel.specloader.IntrospectionMode;
import org.apache.isis.integtestsupport.validate.ValidateDomainModel;
import org.apache.isis.metamodel.spec.DomainModelException;
-import org.apache.isis.config.metamodel.specloader.IntrospectionMode;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_headless;
@@ -57,7 +56,7 @@ import lombok.val;
})
@TestPropertySource({
//IsisPresets.DebugMetaModel,
- IsisPresets.DebugProgrammingModel,
+ //IsisPresets.DebugProgrammingModel,
})
//@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 e784728..6911dfb 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,7 +24,6 @@ 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,8 +52,8 @@ import lombok.val;
"isis.reflector.validator.explicitObjectType=FALSE", // does not override any of the imports
})
@TestPropertySource({
- IsisPresets.DebugMetaModel,
- IsisPresets.DebugProgrammingModel,
+ //IsisPresets.DebugMetaModel,
+ //IsisPresets.DebugProgrammingModel,
})
//@Transactional
class DomainModelTest_usingGoodDomain {
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 d4f2960..7b75b20 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
@@ -18,9 +18,6 @@
*/
package org.apache.isis.testdomain.ldap;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.fail;
-
import java.util.Hashtable;
import javax.inject.Inject;
@@ -34,6 +31,9 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.apache.isis.testdomain.Smoketest;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
import lombok.val;
@Smoketest
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 3156cc8..dc94a10 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
@@ -31,7 +31,7 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Import;
import org.apache.isis.applib.services.inject.ServiceInjector;
-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_usingJdoAndShiro;
import org.apache.isis.testdomain.ldap.LdapConstants;
@@ -52,11 +52,12 @@ import lombok.extern.log4j.Log4j2;
},
properties = {
"logging.config=log4j2-test.xml",
- IsisPresets.DebugPersistence,
+ //IsisPresets.DebugPersistence,
})
@Import({
LdapServerService.class,
})
+@Incubating("inconsitent 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/ShiroSecmanLdapTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdapTest.java
index 5c3bca6..846cbfd 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdapTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdapTest.java
@@ -32,7 +32,6 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Import;
import org.apache.isis.applib.services.inject.ServiceInjector;
-import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
import org.apache.isis.extensions.secman.api.role.ApplicationRoleRepository;
@@ -64,7 +63,7 @@ import lombok.val;
properties = {
//"logging.config=log4j2-test.xml",
"logging.config=log4j2-debug-persistence.xml",
- IsisPresets.DebugPersistence,
+ //IsisPresets.DebugPersistence,
"isis.persistor.datanucleus.impl.datanucleus.schema.autoCreateDatabase=true",
})
@Import({
@@ -91,8 +90,6 @@ class ShiroSecmanLdapTest extends AbstractShiroTest {
@BeforeEach
void beforeEach() {
- org.apache.isis.extensions.shirorealmldap.realm.IsisLdapContextFactory f;
-
setSecurityManager(serviceInjector, "classpath:shiro-secman-ldap.ini");
// given
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 d90e177..0964153 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
@@ -20,7 +20,6 @@ package org.apache.isis.testdomain.shiro;
import javax.inject.Inject;
-import org.apache.isis.viewer.restfulobjects.viewer.IsisModuleRestfulObjectsViewer;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
@@ -45,6 +44,7 @@ import org.apache.isis.testdomain.conf.Configuration_usingJdoAndShiro;
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 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/ShiroSimpleTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSimpleTest.java
index 338bdf3..fe0d0f7 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSimpleTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSimpleTest.java
@@ -18,10 +18,6 @@
*/
package org.apache.isis.testdomain.shiro;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authc.AuthenticationToken;
import org.apache.shiro.authc.UsernamePasswordToken;
@@ -36,6 +32,10 @@ import org.mockito.Mockito;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.testdomain.Smoketest;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import lombok.val;
@Smoketest
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 664fd76..75cd1a4 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
@@ -27,7 +27,6 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.services.xactn.TransactionService;
import org.apache.isis.commons.internal.exceptions._Exceptions;
-import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingJdo;
@@ -44,7 +43,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
},
properties = {
"logging.config=log4j2-test.xml",
- IsisPresets.DebugPersistence,
+ //IsisPresets.DebugPersistence,
})
class TransactionRollbackTest {
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 ba65fdf..a11927d 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
@@ -29,7 +29,6 @@ import org.springframework.test.annotation.Commit;
import org.springframework.transaction.annotation.Transactional;
import org.apache.isis.applib.services.repository.RepositoryService;
-import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingJdo;
@@ -50,7 +49,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
},
properties = {
"logging.config=log4j2-test.xml",
- IsisPresets.DebugPersistence,
+ //IsisPresets.DebugPersistence,
})
@Transactional
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)