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/10/02 11:22:02 UTC
[isis] branch v2 updated: ISIS-2158: more workarounds to fix
running a batch of smoketests
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/v2 by this push:
new 25a8449 ISIS-2158: more workarounds to fix running a batch of smoketests
25a8449 is described below
commit 25a8449a17d018b6ca8f740fea5d0c7995644e68
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Oct 2 13:21:55 2019 +0200
ISIS-2158: more workarounds to fix running a batch of smoketests
---
.../java/org/apache/isis/commons/internal/ioc/spring/_Spring.java | 8 ++++++++
.../isis/testdomain/bootstrapping/AutoConfigurationTest.java | 7 +------
.../org/apache/isis/testdomain/commandexecution/WrapperTest.java | 3 ---
.../testdomain/domainmodel/DomainModelTest_usingBadDomain.java | 6 ++++++
4 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/spring/_Spring.java b/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/spring/_Spring.java
index 971df2e..22883a8 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/spring/_Spring.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/ioc/spring/_Spring.java
@@ -79,6 +79,12 @@ public class _Spring {
public static void init(ApplicationContext context) {
_Context.putSingleton(ApplicationContext.class, context);
}
+
+ /** JUnit support */
+ public static void reinit(ApplicationContext applicationContext) {
+ _Context.remove(ApplicationContext.class);
+ _Spring.init(applicationContext);
+ }
public static ApplicationContext context() {
return _Context.getElseFail(ApplicationContext.class);
@@ -255,4 +261,6 @@ public class _Spring {
}
+
+
}
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 dd15641..28ca3da 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
@@ -27,12 +27,9 @@ import javax.inject.Inject;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
-import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
import org.springframework.beans.factory.config.BeanPostProcessor;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
import org.springframework.stereotype.Component;
import org.springframework.test.context.TestPropertySource;
@@ -95,9 +92,7 @@ class AutoConfigurationTest {
@BeforeEach
void beforeEach() {
assertNotNull(applicationContext);
- if(!_Spring.isContextAvailable()) {
- _Spring.init(applicationContext);
- }
+ _Spring.reinit(applicationContext);
}
@Test
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 67c76fd..f1868b3 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
@@ -58,9 +58,6 @@ import lombok.val;
},
properties = {
"logging.config=log4j2-test.xml",
- // "logging.level.org.apache.isis.jdo.persistence.IsisPlatformTransactionManagerForJdo=DEBUG",
- // "logging.level.org.apache.isis.jdo.persistence.PersistenceSession5=DEBUG",
- // "logging.level.org.apache.isis.jdo.persistence.IsisTransactionJdo=DEBUG",
})
class WrapperTest {
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 2e0725e..cba7341 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
@@ -20,10 +20,13 @@ package org.apache.isis.testdomain.domainmodel;
import javax.inject.Inject;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.ApplicationContext;
import org.springframework.test.context.TestPropertySource;
+import org.apache.isis.commons.internal.ioc.spring._Spring;
import org.apache.isis.commons.internal.plugins.environment.IsisSystemEnvironment;
import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.config.IsisPresets;
@@ -39,6 +42,7 @@ import org.apache.isis.testdomain.model.bad.OrphanedActionSupport;
import org.apache.isis.testdomain.model.bad.OrphanedCollectionSupport;
import org.apache.isis.testdomain.model.bad.OrphanedPropertySupport;
+import static org.junit.Assert.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -63,6 +67,8 @@ class DomainModelTest_usingBadDomain {
@Inject private IsisConfiguration configuration;
@Inject private IsisSystemEnvironment isisSystemEnvironment;
+ @Inject private ApplicationContext applicationContext;
+
@Test
void fullIntrospection_shouldBeEnabledByThisTestClass() {