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/21 16:10:36 UTC
[isis] branch master updated: ISIS-2033: move jdo isis legacy reg.
tests to their own module
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 63cb0cb ISIS-2033: move jdo isis legacy reg. tests to their own module
63cb0cb is described below
commit 63cb0cb8e0b40480f6c6e3e01cb593a5ed6c9609
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Dec 21 17:10:22 2020 +0100
ISIS-2033: move jdo isis legacy reg. tests to their own module
---
.../isis/testdomain/rest/RestServiceTest.java | 4 +-
.../isis/testdomain/wrapper/WrapperAsyncTest.java | 4 +-
regressiontests/legacy/pom.xml | 44 ++++++++++++++++++++++
.../conf/Configuration_usingJdoIsis.java | 0
.../jdo/isis/JdoIsisCommandPublishingTest.java} | 5 ++-
.../isis/JdoIsisEntityChangesPublishingTest.java} | 4 +-
...JdoIsisEntityPropertyChangePublishingTest.java} | 5 ++-
.../jdo/isis/JdoIsisExecutionPublishingTest.java} | 5 ++-
.../jdo/isis/DomainModelTest_jdoIsisMixins.java | 0
.../isis/JdoIsisEntityChangePublishingTest.java | 4 +-
.../jdo/isis/JdoIsisEntityInjectingTest.java | 0
.../jdo/isis/JdoIsisBootstrappingTest.java | 0
.../JdoIsisBootstrappingTest_usingFixtures.java | 0
.../persistence/jdo/isis/JdoIsisQueryTest.java | 0
.../jdo/isis/JdoIsisTimestampingTest.java | 0
...actionRollbackTest_usingTransactionService.java | 0
...TransactionRollbackTest_usingTransactional.java | 0
.../isis/JdoIsisTransactionScopeListenerTest.java | 2 +-
.../wrapper/jdo/isis/JdoIsisWrapperSyncTest.java | 0
regressiontests/pom.xml | 22 -----------
.../conf/Configuration_usingJdoAndShiro.java | 8 +++-
.../interaction}/InteractionBoundaryProbe.java | 2 +-
.../util/interaction}/InteractionTestAbstract.java | 2 +-
.../testdomain/interact/ActionInteractionTest.java | 2 +-
.../testdomain/interact/NewParameterModelTest.java | 2 +-
.../testdomain/interact/PropertyBindingTest.java | 2 +-
.../interact/PropertyInteractionTest.java | 2 +-
.../interact/ScalarParamNegotiationTest.java | 2 +-
.../JdoSpringTransactionScopeListenerTest.java | 2 +-
29 files changed, 76 insertions(+), 47 deletions(-)
diff --git a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/rest/RestServiceTest.java b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/rest/RestServiceTest.java
index b475420..277da82 100644
--- a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/rest/RestServiceTest.java
+++ b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/rest/RestServiceTest.java
@@ -33,7 +33,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
import org.apache.isis.core.config.presets.IsisPresets;
-import org.apache.isis.testdomain.conf.Configuration_usingJdoIsis;
+import org.apache.isis.testdomain.conf.Configuration_usingJdoSpring;
import org.apache.isis.testdomain.jdo.entities.JdoBook;
import org.apache.isis.testdomain.util.rest.RestEndpointService;
import org.apache.isis.viewer.restfulobjects.jaxrsresteasy4.IsisModuleViewerRestfulObjectsJaxrsResteasy4;
@@ -45,7 +45,7 @@ import lombok.val;
webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@TestPropertySource(IsisPresets.UseLog4j2Test)
@Import({
- Configuration_usingJdoIsis.class,
+ Configuration_usingJdoSpring.class,
IsisModuleViewerRestfulObjectsJaxrsResteasy4.class
})
class RestServiceTest {
diff --git a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/wrapper/WrapperAsyncTest.java b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/wrapper/WrapperAsyncTest.java
index 170da14..a5b32ae 100644
--- a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/wrapper/WrapperAsyncTest.java
+++ b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/wrapper/WrapperAsyncTest.java
@@ -47,7 +47,7 @@ import org.apache.isis.applib.services.factory.FactoryService;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.core.config.presets.IsisPresets;
-import org.apache.isis.testdomain.conf.Configuration_usingJdoIsis;
+import org.apache.isis.testdomain.conf.Configuration_usingJdoSpring;
import org.apache.isis.testdomain.jdo.JdoInventoryManager;
import org.apache.isis.testdomain.jdo.JdoTestDomainPersona;
import org.apache.isis.testdomain.jdo.entities.JdoProduct;
@@ -61,7 +61,7 @@ import lombok.val;
@SpringBootTest(
classes = {
- Configuration_usingJdoIsis.class,
+ Configuration_usingJdoSpring.class,
WrapperAsyncTest.ActionDomainEventListener.class
}
)
diff --git a/regressiontests/legacy/pom.xml b/regressiontests/legacy/pom.xml
new file mode 100644
index 0000000..9b6d18f
--- /dev/null
+++ b/regressiontests/legacy/pom.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 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. -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.isis.regressiontests</groupId>
+ <artifactId>isis-regressiontests</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>isis-regressiontests-legacy</artifactId>
+
+ <name>Apache Isis - Regression Tests (legacy)</name>
+
+ <dependencies>
+ <!-- isis-regressiontests-stable has the domain to test against -->
+ <dependency>
+ <groupId>org.apache.isis.regressiontests</groupId>
+ <artifactId>isis-regressiontests-stable</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.legacy</groupId>
+ <artifactId>isis-legacy-jdo-datanucleus</artifactId>
+ </dependency>
+
+
+ </dependencies>
+
+</project>
diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdoIsis.java b/regressiontests/legacy/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdoIsis.java
similarity index 100%
rename from regressiontests/stable/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdoIsis.java
rename to regressiontests/legacy/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdoIsis.java
diff --git a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/applayer/publishing/CommandPublishingTest.java b/regressiontests/legacy/src/test/java/org/apache/isis/testdomain/applayer/publishing/jdo/isis/JdoIsisCommandPublishingTest.java
similarity index 95%
rename from regressiontests/incubating/src/test/java/org/apache/isis/testdomain/applayer/publishing/CommandPublishingTest.java
rename to regressiontests/legacy/src/test/java/org/apache/isis/testdomain/applayer/publishing/jdo/isis/JdoIsisCommandPublishingTest.java
index 43edd8d..b623a68 100644
--- a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/applayer/publishing/CommandPublishingTest.java
+++ b/regressiontests/legacy/src/test/java/org/apache/isis/testdomain/applayer/publishing/jdo/isis/JdoIsisCommandPublishingTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.testdomain.applayer.publishing;
+package org.apache.isis.testdomain.applayer.publishing.jdo.isis;
import java.util.List;
import java.util.Objects;
@@ -37,6 +37,7 @@ import org.apache.isis.schema.cmd.v2.CommandDto;
import org.apache.isis.schema.cmd.v2.PropertyDto;
import org.apache.isis.testdomain.applayer.ApplicationLayerTestFactory;
import org.apache.isis.testdomain.applayer.ApplicationLayerTestFactory.VerificationStage;
+import org.apache.isis.testdomain.applayer.publishing.CommandSubscriberForTesting;
import org.apache.isis.testdomain.applayer.publishing.conf.Configuration_usingCommandPublishing;
import org.apache.isis.testdomain.conf.Configuration_usingJdoIsis;
import org.apache.isis.testdomain.util.CollectionAssertions;
@@ -59,7 +60,7 @@ import lombok.val;
@TestPropertySource({
IsisPresets.UseLog4j2Test
})
-class CommandPublishingTest extends IsisIntegrationTestAbstract {
+class JdoIsisCommandPublishingTest extends IsisIntegrationTestAbstract {
@Inject private ApplicationLayerTestFactory testFactory;
@Inject private KVStoreForTesting kvStore;
diff --git a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/applayer/publishing/EntityChangesPublishingTest.java b/regressiontests/legacy/src/test/java/org/apache/isis/testdomain/applayer/publishing/jdo/isis/JdoIsisEntityChangesPublishingTest.java
similarity index 96%
rename from regressiontests/incubating/src/test/java/org/apache/isis/testdomain/applayer/publishing/EntityChangesPublishingTest.java
rename to regressiontests/legacy/src/test/java/org/apache/isis/testdomain/applayer/publishing/jdo/isis/JdoIsisEntityChangesPublishingTest.java
index 05078f9..94ed007 100644
--- a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/applayer/publishing/EntityChangesPublishingTest.java
+++ b/regressiontests/legacy/src/test/java/org/apache/isis/testdomain/applayer/publishing/jdo/isis/JdoIsisEntityChangesPublishingTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.testdomain.applayer.publishing;
+package org.apache.isis.testdomain.applayer.publishing.jdo.isis;
import java.util.List;
@@ -59,7 +59,7 @@ import static org.apache.isis.testdomain.applayer.publishing.EntityChangesSubscr
@TestPropertySource({
IsisPresets.UseLog4j2Test
})
-class EntityChangesPublishingTest extends IsisIntegrationTestAbstract {
+class JdoIsisEntityChangesPublishingTest extends IsisIntegrationTestAbstract {
@Inject private ApplicationLayerTestFactory testFactory;
@Inject private KVStoreForTesting kvStore;
diff --git a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/applayer/publishing/EntityPropertyChangePublishingTest.java b/regressiontests/legacy/src/test/java/org/apache/isis/testdomain/applayer/publishing/jdo/isis/JdoIsisEntityPropertyChangePublishingTest.java
similarity index 93%
rename from regressiontests/incubating/src/test/java/org/apache/isis/testdomain/applayer/publishing/EntityPropertyChangePublishingTest.java
rename to regressiontests/legacy/src/test/java/org/apache/isis/testdomain/applayer/publishing/jdo/isis/JdoIsisEntityPropertyChangePublishingTest.java
index 8b26d26..4837a3d 100644
--- a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/applayer/publishing/EntityPropertyChangePublishingTest.java
+++ b/regressiontests/legacy/src/test/java/org/apache/isis/testdomain/applayer/publishing/jdo/isis/JdoIsisEntityPropertyChangePublishingTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.testdomain.applayer.publishing;
+package org.apache.isis.testdomain.applayer.publishing.jdo.isis;
import java.util.List;
@@ -34,6 +34,7 @@ import org.apache.isis.commons.collections.Can;
import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.testdomain.applayer.ApplicationLayerTestFactory;
import org.apache.isis.testdomain.applayer.ApplicationLayerTestFactory.VerificationStage;
+import org.apache.isis.testdomain.applayer.publishing.EntityPropertyChangeSubscriberForTesting;
import org.apache.isis.testdomain.applayer.publishing.conf.Configuration_usingEntityPropertyChangePublishing;
import org.apache.isis.testdomain.conf.Configuration_usingJdoIsis;
import org.apache.isis.testdomain.util.CollectionAssertions;
@@ -55,7 +56,7 @@ import lombok.val;
IsisPresets.UseLog4j2Test
})
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
-class EntityPropertyChangePublishingTest extends IsisIntegrationTestAbstract {
+class JdoIsisEntityPropertyChangePublishingTest extends IsisIntegrationTestAbstract {
@Inject private ApplicationLayerTestFactory testFactory;
@Inject private KVStoreForTesting kvStore;
diff --git a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/applayer/publishing/ExecutionPublishingTest.java b/regressiontests/legacy/src/test/java/org/apache/isis/testdomain/applayer/publishing/jdo/isis/JdoIsisExecutionPublishingTest.java
similarity index 96%
rename from regressiontests/incubating/src/test/java/org/apache/isis/testdomain/applayer/publishing/ExecutionPublishingTest.java
rename to regressiontests/legacy/src/test/java/org/apache/isis/testdomain/applayer/publishing/jdo/isis/JdoIsisExecutionPublishingTest.java
index 1cca090..4fb73a3 100644
--- a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/applayer/publishing/ExecutionPublishingTest.java
+++ b/regressiontests/legacy/src/test/java/org/apache/isis/testdomain/applayer/publishing/jdo/isis/JdoIsisExecutionPublishingTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.testdomain.applayer.publishing;
+package org.apache.isis.testdomain.applayer.publishing.jdo.isis;
import java.util.List;
import java.util.Objects;
@@ -36,6 +36,7 @@ import org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.testdomain.applayer.ApplicationLayerTestFactory;
import org.apache.isis.testdomain.applayer.ApplicationLayerTestFactory.VerificationStage;
+import org.apache.isis.testdomain.applayer.publishing.ExecutionSubscriberForTesting;
import org.apache.isis.testdomain.applayer.publishing.conf.Configuration_usingExecutionPublishing;
import org.apache.isis.testdomain.conf.Configuration_usingJdoIsis;
import org.apache.isis.testdomain.util.CollectionAssertions;
@@ -58,7 +59,7 @@ import lombok.val;
@TestPropertySource({
IsisPresets.UseLog4j2Test
})
-class ExecutionPublishingTest extends IsisIntegrationTestAbstract {
+class JdoIsisExecutionPublishingTest extends IsisIntegrationTestAbstract {
@Inject private ApplicationLayerTestFactory testFactory;
@Inject private KVStoreForTesting kvStore;
diff --git a/regressiontests/stable/src/test/java/org/apache/isis/testdomain/domainmodel/jdo/isis/DomainModelTest_jdoIsisMixins.java b/regressiontests/legacy/src/test/java/org/apache/isis/testdomain/domainmodel/jdo/isis/DomainModelTest_jdoIsisMixins.java
similarity index 100%
rename from regressiontests/stable/src/test/java/org/apache/isis/testdomain/domainmodel/jdo/isis/DomainModelTest_jdoIsisMixins.java
rename to regressiontests/legacy/src/test/java/org/apache/isis/testdomain/domainmodel/jdo/isis/DomainModelTest_jdoIsisMixins.java
diff --git a/regressiontests/stable/src/test/java/org/apache/isis/testdomain/entitychangetracking/jdo/isis/JdoIsisEntityChangePublishingTest.java b/regressiontests/legacy/src/test/java/org/apache/isis/testdomain/entitychangetracking/jdo/isis/JdoIsisEntityChangePublishingTest.java
similarity index 97%
rename from regressiontests/stable/src/test/java/org/apache/isis/testdomain/entitychangetracking/jdo/isis/JdoIsisEntityChangePublishingTest.java
rename to regressiontests/legacy/src/test/java/org/apache/isis/testdomain/entitychangetracking/jdo/isis/JdoIsisEntityChangePublishingTest.java
index dbc60ae..2e9267a 100644
--- a/regressiontests/stable/src/test/java/org/apache/isis/testdomain/entitychangetracking/jdo/isis/JdoIsisEntityChangePublishingTest.java
+++ b/regressiontests/legacy/src/test/java/org/apache/isis/testdomain/entitychangetracking/jdo/isis/JdoIsisEntityChangePublishingTest.java
@@ -33,13 +33,13 @@ import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.testdomain.applayer.publishing.EntityPropertyChangeSubscriberForTesting;
import org.apache.isis.testdomain.applayer.publishing.conf.Configuration_usingEntityChangesPublishing;
import org.apache.isis.testdomain.applayer.publishing.conf.Configuration_usingEntityPropertyChangePublishing;
-import org.apache.isis.testdomain.commons.InteractionBoundaryProbe;
-import org.apache.isis.testdomain.commons.InteractionTestAbstract;
import org.apache.isis.testdomain.conf.Configuration_usingJdoIsis;
import org.apache.isis.testdomain.jdo.JdoInventoryManager;
import org.apache.isis.testdomain.jdo.JdoTestDomainPersona;
import org.apache.isis.testdomain.jdo.entities.JdoBook;
import org.apache.isis.testdomain.jdo.entities.JdoProduct;
+import org.apache.isis.testdomain.util.interaction.InteractionBoundaryProbe;
+import org.apache.isis.testdomain.util.interaction.InteractionTestAbstract;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
import lombok.val;
diff --git a/regressiontests/stable/src/test/java/org/apache/isis/testdomain/injecting/jdo/isis/JdoIsisEntityInjectingTest.java b/regressiontests/legacy/src/test/java/org/apache/isis/testdomain/injecting/jdo/isis/JdoIsisEntityInjectingTest.java
similarity index 100%
rename from regressiontests/stable/src/test/java/org/apache/isis/testdomain/injecting/jdo/isis/JdoIsisEntityInjectingTest.java
rename to regressiontests/legacy/src/test/java/org/apache/isis/testdomain/injecting/jdo/isis/JdoIsisEntityInjectingTest.java
diff --git a/regressiontests/stable/src/test/java/org/apache/isis/testdomain/persistence/jdo/isis/JdoIsisBootstrappingTest.java b/regressiontests/legacy/src/test/java/org/apache/isis/testdomain/persistence/jdo/isis/JdoIsisBootstrappingTest.java
similarity index 100%
rename from regressiontests/stable/src/test/java/org/apache/isis/testdomain/persistence/jdo/isis/JdoIsisBootstrappingTest.java
rename to regressiontests/legacy/src/test/java/org/apache/isis/testdomain/persistence/jdo/isis/JdoIsisBootstrappingTest.java
diff --git a/regressiontests/stable/src/test/java/org/apache/isis/testdomain/persistence/jdo/isis/JdoIsisBootstrappingTest_usingFixtures.java b/regressiontests/legacy/src/test/java/org/apache/isis/testdomain/persistence/jdo/isis/JdoIsisBootstrappingTest_usingFixtures.java
similarity index 100%
rename from regressiontests/stable/src/test/java/org/apache/isis/testdomain/persistence/jdo/isis/JdoIsisBootstrappingTest_usingFixtures.java
rename to regressiontests/legacy/src/test/java/org/apache/isis/testdomain/persistence/jdo/isis/JdoIsisBootstrappingTest_usingFixtures.java
diff --git a/regressiontests/stable/src/test/java/org/apache/isis/testdomain/persistence/jdo/isis/JdoIsisQueryTest.java b/regressiontests/legacy/src/test/java/org/apache/isis/testdomain/persistence/jdo/isis/JdoIsisQueryTest.java
similarity index 100%
rename from regressiontests/stable/src/test/java/org/apache/isis/testdomain/persistence/jdo/isis/JdoIsisQueryTest.java
rename to regressiontests/legacy/src/test/java/org/apache/isis/testdomain/persistence/jdo/isis/JdoIsisQueryTest.java
diff --git a/regressiontests/stable/src/test/java/org/apache/isis/testdomain/timestamping/jdo/isis/JdoIsisTimestampingTest.java b/regressiontests/legacy/src/test/java/org/apache/isis/testdomain/timestamping/jdo/isis/JdoIsisTimestampingTest.java
similarity index 100%
rename from regressiontests/stable/src/test/java/org/apache/isis/testdomain/timestamping/jdo/isis/JdoIsisTimestampingTest.java
rename to regressiontests/legacy/src/test/java/org/apache/isis/testdomain/timestamping/jdo/isis/JdoIsisTimestampingTest.java
diff --git a/regressiontests/stable/src/test/java/org/apache/isis/testdomain/transactions/jdo/isis/JdoIsisTransactionRollbackTest_usingTransactionService.java b/regressiontests/legacy/src/test/java/org/apache/isis/testdomain/transactions/jdo/isis/JdoIsisTransactionRollbackTest_usingTransactionService.java
similarity index 100%
rename from regressiontests/stable/src/test/java/org/apache/isis/testdomain/transactions/jdo/isis/JdoIsisTransactionRollbackTest_usingTransactionService.java
rename to regressiontests/legacy/src/test/java/org/apache/isis/testdomain/transactions/jdo/isis/JdoIsisTransactionRollbackTest_usingTransactionService.java
diff --git a/regressiontests/stable/src/test/java/org/apache/isis/testdomain/transactions/jdo/isis/JdoIsisTransactionRollbackTest_usingTransactional.java b/regressiontests/legacy/src/test/java/org/apache/isis/testdomain/transactions/jdo/isis/JdoIsisTransactionRollbackTest_usingTransactional.java
similarity index 100%
rename from regressiontests/stable/src/test/java/org/apache/isis/testdomain/transactions/jdo/isis/JdoIsisTransactionRollbackTest_usingTransactional.java
rename to regressiontests/legacy/src/test/java/org/apache/isis/testdomain/transactions/jdo/isis/JdoIsisTransactionRollbackTest_usingTransactional.java
diff --git a/regressiontests/stable/src/test/java/org/apache/isis/testdomain/transactions/jdo/isis/JdoIsisTransactionScopeListenerTest.java b/regressiontests/legacy/src/test/java/org/apache/isis/testdomain/transactions/jdo/isis/JdoIsisTransactionScopeListenerTest.java
similarity index 98%
rename from regressiontests/stable/src/test/java/org/apache/isis/testdomain/transactions/jdo/isis/JdoIsisTransactionScopeListenerTest.java
rename to regressiontests/legacy/src/test/java/org/apache/isis/testdomain/transactions/jdo/isis/JdoIsisTransactionScopeListenerTest.java
index 7ab5828..020d0c7 100644
--- a/regressiontests/stable/src/test/java/org/apache/isis/testdomain/transactions/jdo/isis/JdoIsisTransactionScopeListenerTest.java
+++ b/regressiontests/legacy/src/test/java/org/apache/isis/testdomain/transactions/jdo/isis/JdoIsisTransactionScopeListenerTest.java
@@ -31,10 +31,10 @@ import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.services.xactn.TransactionService;
import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.core.runtime.iactn.InteractionFactory;
-import org.apache.isis.testdomain.commons.InteractionBoundaryProbe;
import org.apache.isis.testdomain.conf.Configuration_usingJdoIsis;
import org.apache.isis.testdomain.jdo.JdoTestDomainPersona;
import org.apache.isis.testdomain.jdo.entities.JdoBook;
+import org.apache.isis.testdomain.util.interaction.InteractionBoundaryProbe;
import org.apache.isis.testdomain.util.kv.KVStoreForTesting;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
diff --git a/regressiontests/stable/src/test/java/org/apache/isis/testdomain/wrapper/jdo/isis/JdoIsisWrapperSyncTest.java b/regressiontests/legacy/src/test/java/org/apache/isis/testdomain/wrapper/jdo/isis/JdoIsisWrapperSyncTest.java
similarity index 100%
rename from regressiontests/stable/src/test/java/org/apache/isis/testdomain/wrapper/jdo/isis/JdoIsisWrapperSyncTest.java
rename to regressiontests/legacy/src/test/java/org/apache/isis/testdomain/wrapper/jdo/isis/JdoIsisWrapperSyncTest.java
diff --git a/regressiontests/pom.xml b/regressiontests/pom.xml
index 662420a..625c1c5 100644
--- a/regressiontests/pom.xml
+++ b/regressiontests/pom.xml
@@ -362,28 +362,6 @@
<artifactId>isis-mavendeps-jdo</artifactId>
<type>pom</type>
</dependency>
-
-<!-- <dependency> -->
-<!-- <groupId>org.apache.isis.persistence</groupId> -->
-<!-- <artifactId>isis-persistence-jpa-integration</artifactId> -->
-<!-- </dependency> -->
-<!-- <dependency> -->
-<!-- <groupId>org.apache.isis.persistence</groupId> -->
-<!-- <artifactId>isis-persistence-jdo-integration</artifactId> -->
-<!-- </dependency> -->
-<!-- <dependency> -->
-<!-- <groupId>org.apache.isis.persistence</groupId> -->
-<!-- <artifactId>isis-persistence-jdo-datanucleus</artifactId> -->
-<!-- </dependency> -->
-<!-- <dependency> -->
-<!-- <groupId>org.apache.isis.persistence</groupId> -->
-<!-- <artifactId>isis-persistence-jdo-spring</artifactId> -->
-<!-- </dependency> -->
-
- <dependency>
- <groupId>org.apache.isis.legacy</groupId>
- <artifactId>isis-legacy-jdo-datanucleus</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.isis.testing</groupId>
diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdoAndShiro.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdoAndShiro.java
index 2db0d6c..30582ca 100644
--- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdoAndShiro.java
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdoAndShiro.java
@@ -32,7 +32,9 @@ import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
import org.apache.isis.extensions.secman.api.permission.PermissionsEvaluationService;
import org.apache.isis.extensions.secman.api.permission.PermissionsEvaluationServiceAllowBeatsVeto;
-import org.apache.isis.legacy.jdo.datanucleus.IsisModuleJdoDataNucleus5;
+import org.apache.isis.persistence.jdo.datanucleus.IsisModuleJdoProviderDataNucleus;
+import org.apache.isis.persistence.jdo.integration.IsisModuleJdoIntegration;
+import org.apache.isis.persistence.jdo.spring.IsisModuleJdoSpring;
import org.apache.isis.security.shiro.IsisModuleSecurityShiro;
import org.apache.isis.testdomain.jdo.JdoTestDomainModule;
import org.apache.isis.testdomain.util.kv.KVStoreForTesting;
@@ -42,7 +44,9 @@ import org.apache.isis.testing.fixtures.applib.IsisModuleTestingFixturesApplib;
@Import({
IsisModuleCoreRuntimeServices.class,
IsisModuleSecurityShiro.class,
- IsisModuleJdoDataNucleus5.class,
+ IsisModuleJdoIntegration.class,
+ IsisModuleJdoSpring.class,
+ IsisModuleJdoProviderDataNucleus.class,
IsisModuleTestingFixturesApplib.class,
KVStoreForTesting.class, // Helper for JUnit Tests
})
diff --git a/regressiontests/stable/src/test/java/org/apache/isis/testdomain/commons/InteractionBoundaryProbe.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/util/interaction/InteractionBoundaryProbe.java
similarity index 98%
rename from regressiontests/stable/src/test/java/org/apache/isis/testdomain/commons/InteractionBoundaryProbe.java
rename to regressiontests/stable/src/main/java/org/apache/isis/testdomain/util/interaction/InteractionBoundaryProbe.java
index c30bee1..dac6bbf 100644
--- a/regressiontests/stable/src/test/java/org/apache/isis/testdomain/commons/InteractionBoundaryProbe.java
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/util/interaction/InteractionBoundaryProbe.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.testdomain.commons;
+package org.apache.isis.testdomain.util.interaction;
import java.util.function.Supplier;
diff --git a/regressiontests/stable/src/test/java/org/apache/isis/testdomain/commons/InteractionTestAbstract.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/util/interaction/InteractionTestAbstract.java
similarity index 99%
rename from regressiontests/stable/src/test/java/org/apache/isis/testdomain/commons/InteractionTestAbstract.java
rename to regressiontests/stable/src/main/java/org/apache/isis/testdomain/util/interaction/InteractionTestAbstract.java
index 8e2034d..50713d3 100644
--- a/regressiontests/stable/src/test/java/org/apache/isis/testdomain/commons/InteractionTestAbstract.java
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/util/interaction/InteractionTestAbstract.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.testdomain.commons;
+package org.apache.isis.testdomain.util.interaction;
import java.util.Collections;
import java.util.List;
diff --git a/regressiontests/stable/src/test/java/org/apache/isis/testdomain/interact/ActionInteractionTest.java b/regressiontests/stable/src/test/java/org/apache/isis/testdomain/interact/ActionInteractionTest.java
index e3cb14a..a163d3b 100644
--- a/regressiontests/stable/src/test/java/org/apache/isis/testdomain/interact/ActionInteractionTest.java
+++ b/regressiontests/stable/src/test/java/org/apache/isis/testdomain/interact/ActionInteractionTest.java
@@ -30,7 +30,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.core.config.presets.IsisPresets;
-import org.apache.isis.testdomain.commons.InteractionTestAbstract;
import org.apache.isis.testdomain.conf.Configuration_headless;
import org.apache.isis.testdomain.model.interaction.Configuration_usingInteractionDomain;
import org.apache.isis.testdomain.model.interaction.DemoEnum;
@@ -38,6 +37,7 @@ import org.apache.isis.testdomain.model.interaction.InteractionDemo;
import org.apache.isis.testdomain.model.interaction.InteractionDemo_biArgEnabled;
import org.apache.isis.testdomain.model.interaction.InteractionDemo_multiEnum;
import org.apache.isis.testdomain.model.interaction.InteractionDemo_multiInt;
+import org.apache.isis.testdomain.util.interaction.InteractionTestAbstract;
import org.apache.isis.viewer.common.model.decorator.disable.DisablingUiModel;
import lombok.val;
diff --git a/regressiontests/stable/src/test/java/org/apache/isis/testdomain/interact/NewParameterModelTest.java b/regressiontests/stable/src/test/java/org/apache/isis/testdomain/interact/NewParameterModelTest.java
index d3ce481..047fc35 100644
--- a/regressiontests/stable/src/test/java/org/apache/isis/testdomain/interact/NewParameterModelTest.java
+++ b/regressiontests/stable/src/test/java/org/apache/isis/testdomain/interact/NewParameterModelTest.java
@@ -34,12 +34,12 @@ import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.core.metamodel.facets.all.describedas.DescribedAsFacet;
import org.apache.isis.core.metamodel.facets.objectvalue.maxlen.MaxLengthFacet;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.testdomain.commons.InteractionTestAbstract;
import org.apache.isis.testdomain.conf.Configuration_headless;
import org.apache.isis.testdomain.model.interaction.Configuration_usingInteractionDomain;
import org.apache.isis.testdomain.model.interaction.InteractionDemo_biArgEnabled;
import org.apache.isis.testdomain.model.interaction.InteractionNpmDemo;
import org.apache.isis.testdomain.model.interaction.InteractionNpmDemo_biArgEnabled;
+import org.apache.isis.testdomain.util.interaction.InteractionTestAbstract;
import lombok.val;
diff --git a/regressiontests/stable/src/test/java/org/apache/isis/testdomain/interact/PropertyBindingTest.java b/regressiontests/stable/src/test/java/org/apache/isis/testdomain/interact/PropertyBindingTest.java
index d0eb840..1ec1d41 100644
--- a/regressiontests/stable/src/test/java/org/apache/isis/testdomain/interact/PropertyBindingTest.java
+++ b/regressiontests/stable/src/test/java/org/apache/isis/testdomain/interact/PropertyBindingTest.java
@@ -31,10 +31,10 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.core.metamodel.interactions.managed.PropertyNegotiationModel;
-import org.apache.isis.testdomain.commons.InteractionTestAbstract;
import org.apache.isis.testdomain.conf.Configuration_headless;
import org.apache.isis.testdomain.model.interaction.Configuration_usingInteractionDomain;
import org.apache.isis.testdomain.model.interaction.InteractionDemo;
+import org.apache.isis.testdomain.util.interaction.InteractionTestAbstract;
import lombok.val;
diff --git a/regressiontests/stable/src/test/java/org/apache/isis/testdomain/interact/PropertyInteractionTest.java b/regressiontests/stable/src/test/java/org/apache/isis/testdomain/interact/PropertyInteractionTest.java
index 67cac5c..ea17404 100644
--- a/regressiontests/stable/src/test/java/org/apache/isis/testdomain/interact/PropertyInteractionTest.java
+++ b/regressiontests/stable/src/test/java/org/apache/isis/testdomain/interact/PropertyInteractionTest.java
@@ -31,10 +31,10 @@ import org.apache.isis.applib.annotation.Where;
import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.core.metamodel.facets.objectvalue.labelat.LabelAtFacet;
import org.apache.isis.core.metamodel.facets.objectvalue.multiline.MultiLineFacet;
-import org.apache.isis.testdomain.commons.InteractionTestAbstract;
import org.apache.isis.testdomain.conf.Configuration_headless;
import org.apache.isis.testdomain.model.interaction.Configuration_usingInteractionDomain;
import org.apache.isis.testdomain.model.interaction.InteractionDemo;
+import org.apache.isis.testdomain.util.interaction.InteractionTestAbstract;
import lombok.val;
diff --git a/regressiontests/stable/src/test/java/org/apache/isis/testdomain/interact/ScalarParamNegotiationTest.java b/regressiontests/stable/src/test/java/org/apache/isis/testdomain/interact/ScalarParamNegotiationTest.java
index 323fc94..8b7ddb5 100644
--- a/regressiontests/stable/src/test/java/org/apache/isis/testdomain/interact/ScalarParamNegotiationTest.java
+++ b/regressiontests/stable/src/test/java/org/apache/isis/testdomain/interact/ScalarParamNegotiationTest.java
@@ -30,11 +30,11 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.core.metamodel.interactions.managed.ParameterNegotiationModel;
-import org.apache.isis.testdomain.commons.InteractionTestAbstract;
import org.apache.isis.testdomain.conf.Configuration_headless;
import org.apache.isis.testdomain.model.interaction.Configuration_usingInteractionDomain;
import org.apache.isis.testdomain.model.interaction.InteractionDemo;
import org.apache.isis.testdomain.model.interaction.InteractionDemo_negotiate.Params.NumberRange;
+import org.apache.isis.testdomain.util.interaction.InteractionTestAbstract;
import lombok.val;
diff --git a/regressiontests/stable/src/test/java/org/apache/isis/testdomain/transactions/jdo/spring/JdoSpringTransactionScopeListenerTest.java b/regressiontests/stable/src/test/java/org/apache/isis/testdomain/transactions/jdo/spring/JdoSpringTransactionScopeListenerTest.java
index 75cd737..ddeeb51 100644
--- a/regressiontests/stable/src/test/java/org/apache/isis/testdomain/transactions/jdo/spring/JdoSpringTransactionScopeListenerTest.java
+++ b/regressiontests/stable/src/test/java/org/apache/isis/testdomain/transactions/jdo/spring/JdoSpringTransactionScopeListenerTest.java
@@ -32,10 +32,10 @@ import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.services.xactn.TransactionService;
import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.core.runtime.iactn.InteractionFactory;
-import org.apache.isis.testdomain.commons.InteractionBoundaryProbe;
import org.apache.isis.testdomain.conf.Configuration_usingJdoSpring;
import org.apache.isis.testdomain.jdo.JdoTestDomainPersona;
import org.apache.isis.testdomain.jdo.entities.JdoBook;
+import org.apache.isis.testdomain.util.interaction.InteractionBoundaryProbe;
import org.apache.isis.testdomain.util.kv.KVStoreForTesting;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;