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 2020/12/04 14:09:25 UTC
[isis] branch master updated: ISIS-2464: fixes regression tests
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 5210d48 ISIS-2464: fixes regression tests
5210d48 is described below
commit 5210d482d6e0881b2bb3ed24d0a9aa16b8291c05
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Dec 4 15:08:00 2020 +0100
ISIS-2464: fixes regression tests
---
.../IsisPlatformTransactionManagerForJdo.java | 23 ++++++++++------------
.../bootstrapping/JdoBootstrappingTest.java | 3 ++-
.../JdoBootstrappingTest_usingFixtures.java | 3 ++-
.../injecting/JdoEntityInjectingTest.java | 3 ++-
.../testdomain/timestamping/TimestampingTest.java | 3 ++-
...TransactionRollbackTest_usingTransactional.java | 3 ++-
6 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPlatformTransactionManagerForJdo.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPlatformTransactionManagerForJdo.java
index c8858d0..9c3e566 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPlatformTransactionManagerForJdo.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPlatformTransactionManagerForJdo.java
@@ -87,22 +87,19 @@ public class IsisPlatformTransactionManagerForJdo extends AbstractPlatformTransa
if(!isInInteraction) {
-// if(Utils.isJUnitTest()) {
-//
-// val authenticationSession = isisInteractionTracker.currentAuthenticationSession()
-// .orElseGet(InitialisationSession::new);
-//
-// log.debug("open new session authenticationSession={}", authenticationSession);
-// isisInteractionFactory.openInteraction(authenticationSession);
-//
-// return IsisTransactionObject.of(transactionBeforeBegin, IsisInteractionScopeType.TEST_SCOPED);
-//
-// } else {
+ if(Utils.isJUnitTest()) {
throw _Exceptions.illegalState("No IsisInteraction available. "
- + "Transactions are expected to be nested within the life-cycle of an IsisInteraction.");
+ + "Transactions are expected to be within scope of an InteractionSession."
+ + "\n"
+ + "Possible solution: Make sure your JUnit test extends IsisIntegrationTestAbstract.");
-// }
+ } else {
+
+ throw _Exceptions.illegalState("No IsisInteraction available. "
+ + "Transactions are expected to be within scope of an InteractionSession.");
+
+ }
}
diff --git a/regressiontests/stable/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest.java b/regressiontests/stable/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest.java
index db58df8..5ccdb62 100644
--- a/regressiontests/stable/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest.java
+++ b/regressiontests/stable/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest.java
@@ -44,6 +44,7 @@ import org.apache.isis.testdomain.conf.Configuration_usingJdo;
import org.apache.isis.testdomain.jdo.entities.JdoBook;
import org.apache.isis.testdomain.jdo.entities.JdoInventory;
import org.apache.isis.testdomain.jdo.entities.JdoProduct;
+import org.apache.isis.testing.integtestsupport.applib.IsisIntegrationTestAbstract;
import lombok.val;
@@ -54,7 +55,7 @@ import lombok.val;
)
@TestPropertySource(IsisPresets.UseLog4j2Test)
@Transactional @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
-class JdoBootstrappingTest {
+class JdoBootstrappingTest extends IsisIntegrationTestAbstract {
@Inject private RepositoryService repository;
//@Inject private TransactionService transactionService;
diff --git a/regressiontests/stable/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest_usingFixtures.java b/regressiontests/stable/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest_usingFixtures.java
index 46c9c96..1ea3469 100644
--- a/regressiontests/stable/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest_usingFixtures.java
+++ b/regressiontests/stable/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest_usingFixtures.java
@@ -34,6 +34,7 @@ import org.apache.isis.testdomain.conf.Configuration_usingJdo;
import org.apache.isis.testdomain.jdo.JdoTestDomainPersona;
import org.apache.isis.testdomain.jdo.entities.JdoInventory;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
+import org.apache.isis.testing.integtestsupport.applib.IsisIntegrationTestAbstract;
import lombok.val;
@@ -47,7 +48,7 @@ import lombok.val;
//IsisPresets.DebugPersistence,
})
@Transactional
-class JdoBootstrappingTest_usingFixtures {
+class JdoBootstrappingTest_usingFixtures extends IsisIntegrationTestAbstract {
@Inject private FixtureScripts fixtureScripts;
@Inject private RepositoryService repository;
diff --git a/regressiontests/stable/src/test/java/org/apache/isis/testdomain/injecting/JdoEntityInjectingTest.java b/regressiontests/stable/src/test/java/org/apache/isis/testdomain/injecting/JdoEntityInjectingTest.java
index 47f41ef..ac3733d 100644
--- a/regressiontests/stable/src/test/java/org/apache/isis/testdomain/injecting/JdoEntityInjectingTest.java
+++ b/regressiontests/stable/src/test/java/org/apache/isis/testdomain/injecting/JdoEntityInjectingTest.java
@@ -43,6 +43,7 @@ import org.apache.isis.testdomain.jdo.entities.JdoBook;
import org.apache.isis.testdomain.jdo.entities.JdoProduct;
import org.apache.isis.testdomain.util.kv.KVStoreForTesting;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
+import org.apache.isis.testing.integtestsupport.applib.IsisIntegrationTestAbstract;
import lombok.val;
import lombok.extern.log4j.Log4j2;
@@ -55,7 +56,7 @@ import lombok.extern.log4j.Log4j2;
@TestPropertySource(IsisPresets.UseLog4j2Test)
@Transactional @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
@Log4j2
-class JdoEntityInjectingTest {
+class JdoEntityInjectingTest extends IsisIntegrationTestAbstract {
@Inject private FixtureScripts fixtureScripts;
@Inject private RepositoryService repository;
diff --git a/regressiontests/stable/src/test/java/org/apache/isis/testdomain/timestamping/TimestampingTest.java b/regressiontests/stable/src/test/java/org/apache/isis/testdomain/timestamping/TimestampingTest.java
index c6e6e2c..7eca44b 100644
--- a/regressiontests/stable/src/test/java/org/apache/isis/testdomain/timestamping/TimestampingTest.java
+++ b/regressiontests/stable/src/test/java/org/apache/isis/testdomain/timestamping/TimestampingTest.java
@@ -33,6 +33,7 @@ import org.apache.isis.testdomain.jdo.JdoTestDomainPersona;
import org.apache.isis.testdomain.jdo.entities.JdoProduct;
import org.apache.isis.testdomain.jdo.entities.JdoProductComment;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
+import org.apache.isis.testing.integtestsupport.applib.IsisIntegrationTestAbstract;
import lombok.val;
@@ -45,7 +46,7 @@ import lombok.val;
// IsisPresets.DebugPersistence,
})
@Transactional
-class TimestampingTest {
+class TimestampingTest extends IsisIntegrationTestAbstract {
@Inject private FixtureScripts fixtureScripts;
@Inject private RepositoryService repository;
diff --git a/regressiontests/stable/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest_usingTransactional.java b/regressiontests/stable/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest_usingTransactional.java
index e853bda..95f9065 100644
--- a/regressiontests/stable/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest_usingTransactional.java
+++ b/regressiontests/stable/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest_usingTransactional.java
@@ -37,6 +37,7 @@ import org.apache.isis.testdomain.conf.Configuration_usingJdo;
import org.apache.isis.testdomain.jdo.JdoTestDomainPersona;
import org.apache.isis.testdomain.jdo.entities.JdoBook;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
+import org.apache.isis.testing.integtestsupport.applib.IsisIntegrationTestAbstract;
/**
* These tests use the {@code @Transactional} annotation as provided by Spring.
@@ -50,7 +51,7 @@ import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
@Transactional
@TestPropertySource(IsisPresets.UseLog4j2Test)
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
-class TransactionRollbackTest_usingTransactional {
+class TransactionRollbackTest_usingTransactional extends IsisIntegrationTestAbstract {
@Inject private FixtureScripts fixtureScripts;
@Inject private RepositoryService repository;