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/10 18:35:30 UTC
[isis] 05/14: ISIS-2259: updates packages for
isis-core-unittestsupport
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
commit 57763d66e07408725e5e2ae5194228b8b9ee62d8
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 15:48:08 2020 +0000
ISIS-2259: updates packages for isis-core-unittestsupport
---
.../modules/ROOT/partials/component-nav.adoc | 4 ++--
.../pages/what-is-apache-isis/screencasts.adoc | 2 +-
.../toc/modules/relnotes/pages/rn-1.12.0.adoc | 2 +-
antora/playbooks/site-security.yml | 10 +++++----
antora/playbooks/site.yml | 20 +++++++++--------
.../ExceptionRecognizerCompositeTest.java | 2 +-
.../services/i18n/TranslatableStringTest.java | 2 +-
.../applib/util/ObjectContractsTest_compareTo.java | 2 +-
.../ObjectContractsTest_equals_and_hashCode.java | 2 +-
.../applib/util/schema/CommonDtoUtils_Test.java | 2 +-
.../schema/CommonDtoUtils_setValueOn_Test.java | 2 +-
.../config/IsisConfiguration_createSubsetTest.java | 4 ++--
.../core/config/IsisConfiguration_primingTest.java | 2 +-
.../config/IsisConfiguration_specialCharTest.java | 4 ++--
.../config/IsisConfiguration_whitespaceTest.java | 4 ++--
.../BidirectionalRelationshipContractTestAll.java | 2 +-
.../unittestsupport/bidir/ChildDomainObject.java | 2 +-
.../bidir/InstantiatorForChildDomainObject.java | 2 +-
.../unittestsupport/bidir/ParentDomainObject.java | 2 +-
.../unittestsupport/bidir/PeerDomainObject.java | 2 +-
.../bidir/PeerDomainObjectForTesting.java | 2 +-
.../comparable/CategorizedDomainObject.java | 2 +-
...mainObjectComparableContractTest_compareTo.java | 2 +-
.../files/FilesTest_deleteFiles.java | 2 +-
...ectServiceMethodMustBeFinalContractTestAll.java | 2 +-
.../unittestsupport/inject/SomeDomainObject.java | 2 +-
.../unittestsupport/inject/SomeService.java | 2 +-
.../CollaboratingUsingConstructorInjection.java | 2 +-
.../CollaboratingUsingSetterInjection.java | 2 +-
.../unittestsupport/jmocking/Collaborator.java | 2 +-
.../ImposteriserTestUsingCodegenPlugin.java | 2 +-
...IsisActionsTest_returnNewTransientInstance.java | 2 +-
.../jmocking/JMockActionsTest_returnArgument.java | 2 +-
.../jmocking/JMockActionsTest_returnEach.java | 2 +-
.../jmocking/JUnitRuleMockery2Test.java | 2 +-
..._autoWiring_constructorInjection_happyCase.java | 2 +-
...y2Test_autoWiring_sadCase_noClassUnderTest.java | 2 +-
...est_autoWiring_sadCase_twoClassesUnderTest.java | 2 +-
...2Test_autoWiring_setterInjection_happyCase.java | 2 +-
...RuleMockery2Test_mockAnnotatedWithAllowing.java | 2 +-
...RuleMockery2Test_mockAnnotatedWithChecking.java | 2 +-
...RuleMockery2Test_mockAnnotatedWithIgnoring.java | 2 +-
...kery2Test_mockAnnotatedWithNever_happyCase.java | 2 +-
...ockery2Test_mockAnnotatedWithNever_sadCase.java | 2 +-
...ockery2Test_mockAnnotatedWithOne_happyCase.java | 2 +-
...eMockery2Test_mockAnnotatedWithOne_sadCase.java | 2 +-
.../sortedsets/SomeDomainObject.java | 2 +-
.../sortedsets/SortedSetsContractTestAll.java | 2 +-
...lueTypeContractTestAbstract_BigIntegerTest.java | 2 +-
.../ValueTypeContractTestAbstract_ColorTest.java | 2 +-
.../ValueTypeContractTestAbstract_StringTest.java | 2 +-
.../system/ObjectActionLayoutXmlDefaultTest.java | 4 ++--
.../system/OneToManyAssociationDefaultTest.java | 4 ++--
.../core/runtimeservices/i18n/po/PoReaderTest.java | 2 +-
.../wrapper/WrapperFactoryDefaultTest.java | 2 +-
.../unit-test-support/partials/module-nav.adoc | 1 -
.../nav.adoc | 0
.../pages/about.adoc | 8 +++----
.../pages/unit-test-support/contract-tests.adoc | 0
.../pages/unit-test-support/jmock-extensions.adoc | 0
.../unit-test-support/maven-configuration.adoc | 0
.../soap-fake-server-junit-rule.adoc | 0
.../unittestsupport/partials/module-nav.adoc | 1 +
.../AbstractApplyToAllContractTest.java | 4 ++--
...irectionalRelationshipContractTestAbstract.java | 25 ++++++++++------------
.../{ => core}/unittestsupport/bidir/Child.java | 2 +-
.../unittestsupport/bidir/Instantiator.java | 2 +-
.../unittestsupport/bidir/InstantiatorMap.java | 2 +-
.../unittestsupport/bidir/InstantiatorSimple.java | 2 +-
.../unittestsupport/bidir/Instantiators.java | 2 +-
.../{ => core}/unittestsupport/bidir/Parent.java | 2 +-
.../ComparableContractTest_compareTo.java | 2 +-
.../comparable/ComparableContractTester.java | 2 +-
.../config/IsisConfigurationLegacy.java | 2 +-
.../unittestsupport/config/internal/_Config.java | 4 ++--
.../config/internal/_Config_Instance.java | 4 ++--
.../config/internal/_Config_LifecycleResource.java | 4 ++--
.../config/internal/_Config_Parsers.java | 2 +-
.../config/internal/_Config_trim.java | 2 +-
.../{ => core}/unittestsupport/files/Files.java | 2 +-
...rviceMethodMustBeFinalContractTestAbstract.java | 4 ++--
.../unittestsupport/jaxb/JaxbMatchers.java | 2 +-
.../jmocking/ImposteriserUsingCodegenPlugin.java | 2 +-
.../unittestsupport/jmocking/Imposterisers.java | 2 +-
.../jmocking/InjectIntoJMockAction.java | 2 +-
.../unittestsupport/jmocking/IsisActions.java | 2 +-
.../unittestsupport/jmocking/JMockActions.java | 2 +-
.../jmocking/JUnitRuleMockery2.java | 2 +-
.../unittestsupport/jmocking/MyMockomatic.java | 23 +++++++-------------
.../unittestsupport/jmocking/PostponedAction.java | 2 +-
.../unittestsupport/soap/PublishedEndpoints.java | 2 +-
.../unittestsupport/soap/SoapEndpoint.java | 2 +-
.../soap/SoapEndpointPublishingRule.java | 2 +-
.../unittestsupport/soap/SoapEndpointSpec.java | 2 +-
.../sortedsets/SortedSetsContractTestAbstract.java | 4 ++--
.../unittestsupport/streams/NullPrintStream.java | 2 +-
.../unittestsupport/utils/CollectUtils.java | 2 +-
.../unittestsupport/utils/IndentPrinter.java | 2 +-
.../unittestsupport/utils/ReflectUtils.java | 2 +-
.../unittestsupport/utils/StringUtils.java | 2 +-
.../value/ValueTypeContractTestAbstract.java | 2 +-
.../PercentageValueSemanticsProviderTest.java | 2 +-
.../lib/RestfulHttpMethodTest_setUp.java | 6 ++----
.../adapterfactory/pojo/PojoAdapterTest.java | 4 ++--
.../runtime/system/ObjectMemberAbstractTest.java | 4 ++--
.../WrapperFactoryDefault_wrappedObject_Test.java | 6 +++---
...actoryDefault_wrappedObject_transient_Test.java | 6 +++---
...onRecognizerCompositeForJdoObjectStoreTest.java | 2 +-
...AnnotationFacetFactoryTest_refineMetaModel.java | 4 ++--
...AuthenticatorOrAuthorizorTest_authenticate.java | 4 ++--
...ticatorOrAuthorizorTest_isVisibleInAnyRole.java | 6 +++---
.../with/ComparableByCodeContractTester.java | 2 +-
.../ComparableByDescriptionContractTester.java | 2 +-
.../with/ComparableByNameContractTester.java | 2 +-
.../with/ComparableByReferenceContractTester.java | 2 +-
.../with/ComparableByTitleContractTester.java | 2 +-
.../with/InstantiatorForComparableByCode.java | 2 +-
.../InstantiatorForComparableByDescription.java | 2 +-
.../with/InstantiatorForComparableByName.java | 2 +-
.../with/InstantiatorForComparableByReference.java | 2 +-
.../applib/with/InstantiatorForWithStartDate.java | 2 +-
...valMutableContractTestAbstract_changeDates.java | 2 +-
.../applib/service/XDocReportServiceTest.java | 4 +---
.../applib/services/FakeDataServiceTest.java | 2 +-
.../pages/integ-test-support/abstract-class.adoc | 2 +-
.../applib/bean/AbstractBeanPropertiesTest.java | 2 +-
.../unit-test-support-ext/partials/module-nav.adoc | 2 +-
.../JsonValueEncoderTest_appendValueAndFormat.java | 2 +-
.../JsonValueEncoderTest_asAdapter.java | 2 +-
.../JsonValueEncoderTest_asObject.java | 2 +-
..._ensureCompatibleAcceptHeader_ContractTest.java | 4 ++--
.../context/ResourceContext_getArg_Test.java | 6 +++---
...tsApplicationExceptionMapper_Test_Contract.java | 2 +-
...ulObjectsSessionFilter_lookupPassThru_Test.java | 2 +-
.../wicket/model/models/EntityModel_hintsTest.java | 2 +-
.../ScalarModel_isScalarSubtypingAnyOf_Test.java | 2 +-
...ollectionContentsSelectorDropdownPanelTest.java | 4 ++--
.../jdkdates/DateConverterForJavaSqlDateTest.java | 4 ++--
.../jdkdates/DateConverterForJavaUtilDateTest.java | 4 ++--
.../jodatime/DateConverterForJodaDateTimeTest.java | 4 ++--
.../DateConverterForJodaLocalDateTest.java | 4 ++--
.../DateConverterForJodaLocalDateTimeTest.java | 4 ++--
.../DateConverterForJdk8LocalDateTest.java | 4 ++--
.../DateConverterForJdk8LocalDateTimeTest.java | 4 ++--
.../DateConverterForJdk8OffsetDateTimeTest.java | 4 ++--
...tAdapterMementoProviderForValueChoicesTest.java | 2 +-
...uthenticatedWebSessionForIsis_Authenticate.java | 2 +-
...thenticatedWebSessionForIsis_Instantiation.java | 4 ++--
.../AuthenticatedWebSessionForIsis_SignIn.java | 2 +-
...uthenticatedWebSessionForIsis_TestAbstract.java | 4 ++--
.../wicketapp/IsisWicketApplication_Defaults.java | 4 ++--
.../wicketapp/IsisWicketApplication_Pages.java | 4 ++--
152 files changed, 220 insertions(+), 230 deletions(-)
diff --git a/antora/components/testing/modules/ROOT/partials/component-nav.adoc b/antora/components/testing/modules/ROOT/partials/component-nav.adoc
index c2ec9e7..b0d175f 100644
--- a/antora/components/testing/modules/ROOT/partials/component-nav.adoc
+++ b/antora/components/testing/modules/ROOT/partials/component-nav.adoc
@@ -1,6 +1,6 @@
include::testing:ROOT:partial$module-nav.adoc[]
-include::testing:unit-test-support:partial$module-nav.adoc[]
-include::testing:unit-test-support-ext:partial$module-nav.adoc[]
+include::testing:unittestsupport:partial$module-nav.adoc[]
+include::testing:unittestsupport-ext:partial$module-nav.adoc[]
include::testing:integ-test-support:partial$module-nav.adoc[]
include::testing:specsupport:partial$module-nav.adoc[]
include::testing:fixtures:partial$module-nav.adoc[]
diff --git a/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/screencasts.adoc b/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/screencasts.adoc
index 28d16f9..83c39a4 100644
--- a/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/screencasts.adoc
+++ b/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/screencasts.adoc
@@ -89,7 +89,7 @@ Implementing xref:userguide:fun:business-rules.adoc[business rules]for domain ob
|x||||||||||
|link:https://www.youtube.com/watch?v=imHfxQGUgV8[007^] +
-Writing xref:testing:unit-test-support:about.adoc[unit tests] for a domain object responsibility
+Writing xref:testing:unittestsupport:about.adoc[unit tests] for a domain object responsibility
||x|||||||||
diff --git a/antora/components/toc/modules/relnotes/pages/rn-1.12.0.adoc b/antora/components/toc/modules/relnotes/pages/rn-1.12.0.adoc
index 8ac806e..ac7c23c 100644
--- a/antora/components/toc/modules/relnotes/pages/rn-1.12.0.adoc
+++ b/antora/components/toc/modules/relnotes/pages/rn-1.12.0.adoc
@@ -63,7 +63,7 @@ In all cases these mixins can be hidden using either security or by writing a li
== Bug
-* link:https://issues.apache.org/jira/browse/ISIS-1348[ISIS-1348] - Bug with link:https://isis.apache.org/versions/1.12.0/guides/ugtst/ugtst.html#_ugtst_unit-test-support_soap-fake-server-junit-rule[SoapEndpointPublishingRule] when multiple endpoints.
+* link:https://issues.apache.org/jira/browse/ISIS-1348[ISIS-1348] - Bug with link:https://isis.apache.org/versions/1.12.0/guides/ugtst/ugtst.html#_ugtst_unittestsupport_soap-fake-server-junit-rule[SoapEndpointPublishingRule] when multiple endpoints.
* link:https://issues.apache.org/jira/browse/ISIS-1347[ISIS-1347] - Missing annotation in SimpleObject
* link:https://issues.apache.org/jira/browse/ISIS-1346[ISIS-1346] - ActionInvocationContext isn't populated properly
* link:https://issues.apache.org/jira/browse/ISIS-1342[ISIS-1342] - The metamodel validation error page doesn't reliably render itself if there are errors.
diff --git a/antora/playbooks/site-security.yml b/antora/playbooks/site-security.yml
index 2557843..24c5818 100644
--- a/antora/playbooks/site-security.yml
+++ b/antora/playbooks/site-security.yml
@@ -17,16 +17,18 @@ content:
# core
- url: .
- start_path: core/security/api/src/main/doc # security
+ start_path: core/security/src/main/doc # security
branches: HEAD
+
+# security
- url: .
- start_path: core/security/bypass/src/main/doc # security
+ start_path: security/bypass/src/main/doc # security
branches: HEAD
- url: .
- start_path: core/security/shiro/src/main/doc # security
+ start_path: security/shiro/src/main/doc # security
branches: HEAD
- url: .
- start_path: core/security/keycloak/src/main/doc # security
+ start_path: security/keycloak/src/main/doc # security
branches: HEAD
# extensions
diff --git a/antora/playbooks/site.yml b/antora/playbooks/site.yml
index 82d0865..97a6138 100644
--- a/antora/playbooks/site.yml
+++ b/antora/playbooks/site.yml
@@ -88,15 +88,6 @@ content:
start_path: core/security/src/main/doc # security
branches: HEAD
- url: .
- start_path: security/bypass/src/main/doc # security
- branches: HEAD
- - url: .
- start_path: security/shiro/src/main/doc # security
- branches: HEAD
- - url: .
- start_path: security/keycloak/src/main/doc # security
- branches: HEAD
- - url: .
start_path: core/testsupport/unittestsupport/src/main/doc # testing
branches: HEAD
- url: .
@@ -183,6 +174,17 @@ content:
start_path: mavendeps/src/main/doc # toc
branches: HEAD
+# security
+ - url: .
+ start_path: security/bypass/src/main/doc # security
+ branches: HEAD
+ - url: .
+ start_path: security/shiro/src/main/doc # security
+ branches: HEAD
+ - url: .
+ start_path: security/keycloak/src/main/doc # security
+ branches: HEAD
+
# starters
- url: .
start_path: starters/src/main/doc # toc
diff --git a/api/applib/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerCompositeTest.java b/api/applib/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerCompositeTest.java
index b30efbe..e5ed87a 100644
--- a/api/applib/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerCompositeTest.java
+++ b/api/applib/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerCompositeTest.java
@@ -29,7 +29,7 @@ import static org.junit.Assert.assertThat;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.applib.services.registry.ServiceRegistry;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
public class ExceptionRecognizerCompositeTest {
diff --git a/api/applib/src/test/java/org/apache/isis/applib/services/i18n/TranslatableStringTest.java b/api/applib/src/test/java/org/apache/isis/applib/services/i18n/TranslatableStringTest.java
index 77b354b..0f6defe 100644
--- a/api/applib/src/test/java/org/apache/isis/applib/services/i18n/TranslatableStringTest.java
+++ b/api/applib/src/test/java/org/apache/isis/applib/services/i18n/TranslatableStringTest.java
@@ -26,7 +26,7 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
public class TranslatableStringTest {
diff --git a/api/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_compareTo.java b/api/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_compareTo.java
index 77be22e..dc545f2 100644
--- a/api/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_compareTo.java
+++ b/api/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_compareTo.java
@@ -20,7 +20,7 @@ import java.util.List;
import org.junit.Before;
-import org.apache.isis.unittestsupport.comparable.ComparableContractTest_compareTo;
+import org.apache.isis.core.unittestsupport.comparable.ComparableContractTest_compareTo;
public class ObjectContractsTest_compareTo extends ComparableContractTest_compareTo<InvoiceItem> {
diff --git a/api/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_equals_and_hashCode.java b/api/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_equals_and_hashCode.java
index 61363dc..3b2d109 100644
--- a/api/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_equals_and_hashCode.java
+++ b/api/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_equals_and_hashCode.java
@@ -21,7 +21,7 @@ import java.util.List;
import org.junit.Before;
import org.apache.isis.core.commons.internal.collections._Lists;
-import org.apache.isis.unittestsupport.value.ValueTypeContractTestAbstract;
+import org.apache.isis.core.unittestsupport.value.ValueTypeContractTestAbstract;
public class ObjectContractsTest_equals_and_hashCode extends ValueTypeContractTestAbstract<InvoiceItem3> {
diff --git a/api/applib/src/test/java/org/apache/isis/applib/util/schema/CommonDtoUtils_Test.java b/api/applib/src/test/java/org/apache/isis/applib/util/schema/CommonDtoUtils_Test.java
index 1ca795c..8e0283f 100644
--- a/api/applib/src/test/java/org/apache/isis/applib/util/schema/CommonDtoUtils_Test.java
+++ b/api/applib/src/test/java/org/apache/isis/applib/util/schema/CommonDtoUtils_Test.java
@@ -32,7 +32,7 @@ import org.apache.isis.applib.services.bookmark.BookmarkService;
import org.apache.isis.schema.cmd.v1.MapDto;
import org.apache.isis.schema.common.v1.ValueDto;
import org.apache.isis.schema.common.v1.ValueType;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
public class CommonDtoUtils_Test {
diff --git a/api/applib/src/test/java/org/apache/isis/applib/util/schema/CommonDtoUtils_setValueOn_Test.java b/api/applib/src/test/java/org/apache/isis/applib/util/schema/CommonDtoUtils_setValueOn_Test.java
index 83c8e44..7f4cfdf 100644
--- a/api/applib/src/test/java/org/apache/isis/applib/util/schema/CommonDtoUtils_setValueOn_Test.java
+++ b/api/applib/src/test/java/org/apache/isis/applib/util/schema/CommonDtoUtils_setValueOn_Test.java
@@ -35,7 +35,7 @@ import org.apache.isis.schema.common.v1.BlobDto;
import org.apache.isis.schema.common.v1.ClobDto;
import org.apache.isis.schema.common.v1.ValueDto;
import org.apache.isis.schema.common.v1.ValueType;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
public class CommonDtoUtils_setValueOn_Test {
diff --git a/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_createSubsetTest.java b/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_createSubsetTest.java
index f5620df..46d5b3f 100644
--- a/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_createSubsetTest.java
+++ b/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_createSubsetTest.java
@@ -23,8 +23,8 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.apache.isis.unittestsupport.config.IsisConfigurationLegacy;
-import org.apache.isis.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config.IsisConfigurationLegacy;
+import org.apache.isis.core.unittestsupport.config.internal._Config;
import lombok.val;
diff --git a/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_primingTest.java b/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_primingTest.java
index 93828cb..14d7eda 100644
--- a/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_primingTest.java
+++ b/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_primingTest.java
@@ -24,7 +24,7 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
-import org.apache.isis.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config.internal._Config;
import lombok.val;
diff --git a/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_specialCharTest.java b/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_specialCharTest.java
index 5eb81ed..94e7ddb 100644
--- a/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_specialCharTest.java
+++ b/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_specialCharTest.java
@@ -23,8 +23,8 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.apache.isis.unittestsupport.config.IsisConfigurationLegacy;
-import org.apache.isis.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config.IsisConfigurationLegacy;
+import org.apache.isis.core.unittestsupport.config.internal._Config;
class IsisConfiguration_specialCharTest {
diff --git a/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_whitespaceTest.java b/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_whitespaceTest.java
index 9ce8be5..314d13f 100644
--- a/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_whitespaceTest.java
+++ b/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_whitespaceTest.java
@@ -23,8 +23,8 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.apache.isis.unittestsupport.config.IsisConfigurationLegacy;
-import org.apache.isis.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config.IsisConfigurationLegacy;
+import org.apache.isis.core.unittestsupport.config.internal._Config;
class IsisConfiguration_whitespaceTest {
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/bidir/BidirectionalRelationshipContractTestAll.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/BidirectionalRelationshipContractTestAll.java
similarity index 96%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/bidir/BidirectionalRelationshipContractTestAll.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/BidirectionalRelationshipContractTestAll.java
index cee8c6a..920cfed 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/bidir/BidirectionalRelationshipContractTestAll.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/BidirectionalRelationshipContractTestAll.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.bidir;
+package org.apache.isis.core.unittestsupport.bidir;
import org.apache.isis.core.commons.internal.collections._Maps;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/bidir/ChildDomainObject.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/ChildDomainObject.java
similarity index 97%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/bidir/ChildDomainObject.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/ChildDomainObject.java
index 1fa96f8..5623f49 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/bidir/ChildDomainObject.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/ChildDomainObject.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.bidir;
+package org.apache.isis.core.unittestsupport.bidir;
import javax.jdo.annotations.PersistenceCapable;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/bidir/InstantiatorForChildDomainObject.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/InstantiatorForChildDomainObject.java
similarity index 96%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/bidir/InstantiatorForChildDomainObject.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/InstantiatorForChildDomainObject.java
index fc5f695..af050f0 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/bidir/InstantiatorForChildDomainObject.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/InstantiatorForChildDomainObject.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.bidir;
+package org.apache.isis.core.unittestsupport.bidir;
import java.util.SortedSet;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/bidir/ParentDomainObject.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/ParentDomainObject.java
similarity index 97%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/bidir/ParentDomainObject.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/ParentDomainObject.java
index 1ac5d89..11fe5c7 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/bidir/ParentDomainObject.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/ParentDomainObject.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.bidir;
+package org.apache.isis.core.unittestsupport.bidir;
import java.util.SortedSet;
import java.util.TreeSet;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/bidir/PeerDomainObject.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/PeerDomainObject.java
similarity index 98%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/bidir/PeerDomainObject.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/PeerDomainObject.java
index 5672906..103ef2e 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/bidir/PeerDomainObject.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/PeerDomainObject.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.bidir;
+package org.apache.isis.core.unittestsupport.bidir;
import javax.jdo.annotations.PersistenceCapable;
import javax.jdo.annotations.Persistent;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/bidir/PeerDomainObjectForTesting.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/PeerDomainObjectForTesting.java
similarity index 94%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/bidir/PeerDomainObjectForTesting.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/PeerDomainObjectForTesting.java
index 1aa2143..2fa0e7d 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/bidir/PeerDomainObjectForTesting.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/PeerDomainObjectForTesting.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.bidir;
+package org.apache.isis.core.unittestsupport.bidir;
public class PeerDomainObjectForTesting extends PeerDomainObject {
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/comparable/CategorizedDomainObject.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/comparable/CategorizedDomainObject.java
similarity index 96%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/comparable/CategorizedDomainObject.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/comparable/CategorizedDomainObject.java
index e0cf993..291960f 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/comparable/CategorizedDomainObject.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/comparable/CategorizedDomainObject.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.comparable;
+package org.apache.isis.core.unittestsupport.comparable;
import static org.apache.isis.core.commons.internal.base._NullSafe.compareNullsFirst;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/comparable/CategorizedDomainObjectComparableContractTest_compareTo.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/comparable/CategorizedDomainObjectComparableContractTest_compareTo.java
similarity index 96%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/comparable/CategorizedDomainObjectComparableContractTest_compareTo.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/comparable/CategorizedDomainObjectComparableContractTest_compareTo.java
index 3548fcc..01a9048 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/comparable/CategorizedDomainObjectComparableContractTest_compareTo.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/comparable/CategorizedDomainObjectComparableContractTest_compareTo.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.comparable;
+package org.apache.isis.core.unittestsupport.comparable;
import java.util.List;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/files/FilesTest_deleteFiles.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/files/FilesTest_deleteFiles.java
similarity index 98%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/files/FilesTest_deleteFiles.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/files/FilesTest_deleteFiles.java
index 7469231..ae1490d 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/files/FilesTest_deleteFiles.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/files/FilesTest_deleteFiles.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.files;
+package org.apache.isis.core.unittestsupport.files;
import java.io.File;
import java.io.IOException;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/inject/InjectServiceMethodMustBeFinalContractTestAll.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/inject/InjectServiceMethodMustBeFinalContractTestAll.java
similarity index 95%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/inject/InjectServiceMethodMustBeFinalContractTestAll.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/inject/InjectServiceMethodMustBeFinalContractTestAll.java
index 0bac6b5..62efadc 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/inject/InjectServiceMethodMustBeFinalContractTestAll.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/inject/InjectServiceMethodMustBeFinalContractTestAll.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.inject;
+package org.apache.isis.core.unittestsupport.inject;
public class InjectServiceMethodMustBeFinalContractTestAll extends InjectServiceMethodMustBeFinalContractTestAbstract {
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/inject/SomeDomainObject.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/inject/SomeDomainObject.java
similarity index 94%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/inject/SomeDomainObject.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/inject/SomeDomainObject.java
index 071f913..0e5c1e7 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/inject/SomeDomainObject.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/inject/SomeDomainObject.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.inject;
+package org.apache.isis.core.unittestsupport.inject;
import javax.jdo.annotations.PersistenceCapable;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/inject/SomeService.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/inject/SomeService.java
similarity index 94%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/inject/SomeService.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/inject/SomeService.java
index 61a1bc8..f42fdf9 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/inject/SomeService.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/inject/SomeService.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.inject;
+package org.apache.isis.core.unittestsupport.inject;
public interface SomeService {
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/CollaboratingUsingConstructorInjection.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/CollaboratingUsingConstructorInjection.java
similarity index 95%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/CollaboratingUsingConstructorInjection.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/CollaboratingUsingConstructorInjection.java
index 46c90b6..d065771 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/CollaboratingUsingConstructorInjection.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/CollaboratingUsingConstructorInjection.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.unittestsupport.jmocking;
+package org.apache.isis.core.unittestsupport.jmocking;
public class CollaboratingUsingConstructorInjection {
final Collaborator collaborator;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/CollaboratingUsingSetterInjection.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/CollaboratingUsingSetterInjection.java
similarity index 95%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/CollaboratingUsingSetterInjection.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/CollaboratingUsingSetterInjection.java
index 68efd8a..496b4d6 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/CollaboratingUsingSetterInjection.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/CollaboratingUsingSetterInjection.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.unittestsupport.jmocking;
+package org.apache.isis.core.unittestsupport.jmocking;
public class CollaboratingUsingSetterInjection {
Collaborator collaborator;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/Collaborator.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/Collaborator.java
similarity index 94%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/Collaborator.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/Collaborator.java
index 24998bf..06b626b 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/Collaborator.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/Collaborator.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.unittestsupport.jmocking;
+package org.apache.isis.core.unittestsupport.jmocking;
public interface Collaborator {
public void doOtherStuff();
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/ImposteriserTestUsingCodegenPlugin.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/ImposteriserTestUsingCodegenPlugin.java
similarity index 99%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/ImposteriserTestUsingCodegenPlugin.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/ImposteriserTestUsingCodegenPlugin.java
index 4ba68a5..c249165 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/ImposteriserTestUsingCodegenPlugin.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/ImposteriserTestUsingCodegenPlugin.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.jmocking;
+package org.apache.isis.core.unittestsupport.jmocking;
import java.io.File;
import java.lang.reflect.InvocationTargetException;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/IsisActionsTest_returnNewTransientInstance.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/IsisActionsTest_returnNewTransientInstance.java
similarity index 98%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/IsisActionsTest_returnNewTransientInstance.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/IsisActionsTest_returnNewTransientInstance.java
index f5e4627..db6bdea 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/IsisActionsTest_returnNewTransientInstance.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/IsisActionsTest_returnNewTransientInstance.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.jmocking;
+package org.apache.isis.core.unittestsupport.jmocking;
import org.hamcrest.Description;
import org.hamcrest.Matcher;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JMockActionsTest_returnArgument.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JMockActionsTest_returnArgument.java
similarity index 97%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JMockActionsTest_returnArgument.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JMockActionsTest_returnArgument.java
index 1f09a5b..66c1596 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JMockActionsTest_returnArgument.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JMockActionsTest_returnArgument.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.unittestsupport.jmocking;
+package org.apache.isis.core.unittestsupport.jmocking;
import org.jmock.Expectations;
import org.jmock.auto.Mock;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JMockActionsTest_returnEach.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JMockActionsTest_returnEach.java
similarity index 97%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JMockActionsTest_returnEach.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JMockActionsTest_returnEach.java
index 8916a61..b95eafb 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JMockActionsTest_returnEach.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JMockActionsTest_returnEach.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.unittestsupport.jmocking;
+package org.apache.isis.core.unittestsupport.jmocking;
import org.jmock.Expectations;
import org.jmock.auto.Mock;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test.java
similarity index 96%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test.java
index 3248802..8b83738 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.unittestsupport.jmocking;
+package org.apache.isis.core.unittestsupport.jmocking;
import org.jmock.Expectations;
import org.jmock.auto.Mock;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_constructorInjection_happyCase.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_constructorInjection_happyCase.java
similarity index 97%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_constructorInjection_happyCase.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_constructorInjection_happyCase.java
index 395e5d1..eddf0ee 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_constructorInjection_happyCase.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_constructorInjection_happyCase.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.unittestsupport.jmocking;
+package org.apache.isis.core.unittestsupport.jmocking;
import org.jmock.auto.Mock;
import org.junit.Rule;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_noClassUnderTest.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_noClassUnderTest.java
similarity index 96%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_noClassUnderTest.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_noClassUnderTest.java
index 68170f6..efdea13 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_noClassUnderTest.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_noClassUnderTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.unittestsupport.jmocking;
+package org.apache.isis.core.unittestsupport.jmocking;
import org.jmock.auto.Mock;
import org.junit.Rule;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_twoClassesUnderTest.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_twoClassesUnderTest.java
similarity index 97%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_twoClassesUnderTest.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_twoClassesUnderTest.java
index fc6593d..601a9d9 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_twoClassesUnderTest.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_twoClassesUnderTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.unittestsupport.jmocking;
+package org.apache.isis.core.unittestsupport.jmocking;
import org.jmock.auto.Mock;
import org.junit.Ignore;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_setterInjection_happyCase.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_setterInjection_happyCase.java
similarity index 97%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_setterInjection_happyCase.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_setterInjection_happyCase.java
index 59e21d3..f31fb63 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_setterInjection_happyCase.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_setterInjection_happyCase.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.unittestsupport.jmocking;
+package org.apache.isis.core.unittestsupport.jmocking;
import org.jmock.auto.Mock;
import org.junit.Rule;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithAllowing.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithAllowing.java
similarity index 97%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithAllowing.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithAllowing.java
index 53d2bb0..05b8183 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithAllowing.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithAllowing.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.unittestsupport.jmocking;
+package org.apache.isis.core.unittestsupport.jmocking;
import org.jmock.auto.Mock;
import org.junit.Rule;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithChecking.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithChecking.java
similarity index 97%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithChecking.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithChecking.java
index ff307ec..e22055e 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithChecking.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithChecking.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.unittestsupport.jmocking;
+package org.apache.isis.core.unittestsupport.jmocking;
import org.jmock.auto.Mock;
import org.junit.Rule;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithIgnoring.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithIgnoring.java
similarity index 97%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithIgnoring.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithIgnoring.java
index d6cdb16..afed4e2 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithIgnoring.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithIgnoring.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.unittestsupport.jmocking;
+package org.apache.isis.core.unittestsupport.jmocking;
import org.jmock.auto.Mock;
import org.junit.Rule;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_happyCase.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_happyCase.java
similarity index 97%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_happyCase.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_happyCase.java
index a3b2b72..d7953f9 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_happyCase.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_happyCase.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.unittestsupport.jmocking;
+package org.apache.isis.core.unittestsupport.jmocking;
import org.jmock.auto.Mock;
import org.junit.Rule;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_sadCase.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_sadCase.java
similarity index 97%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_sadCase.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_sadCase.java
index 048d6be..b6aa7f8 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_sadCase.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_sadCase.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.unittestsupport.jmocking;
+package org.apache.isis.core.unittestsupport.jmocking;
import org.jmock.auto.Mock;
import org.junit.Rule;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_happyCase.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_happyCase.java
similarity index 97%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_happyCase.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_happyCase.java
index 4705799..3e11207 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_happyCase.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_happyCase.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.unittestsupport.jmocking;
+package org.apache.isis.core.unittestsupport.jmocking;
import org.jmock.auto.Mock;
import org.junit.Rule;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_sadCase.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_sadCase.java
similarity index 97%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_sadCase.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_sadCase.java
index 8413acf..61f3a1d 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_sadCase.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_sadCase.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.unittestsupport.jmocking;
+package org.apache.isis.core.unittestsupport.jmocking;
import org.jmock.auto.Mock;
import org.junit.Ignore;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/sortedsets/SomeDomainObject.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/sortedsets/SomeDomainObject.java
similarity index 95%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/sortedsets/SomeDomainObject.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/sortedsets/SomeDomainObject.java
index 8d6f3df..82ece30 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/sortedsets/SomeDomainObject.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/sortedsets/SomeDomainObject.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.sortedsets;
+package org.apache.isis.core.unittestsupport.sortedsets;
import java.util.SortedSet;
import java.util.TreeSet;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/sortedsets/SortedSetsContractTestAll.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/sortedsets/SortedSetsContractTestAll.java
similarity index 94%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/sortedsets/SortedSetsContractTestAll.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/sortedsets/SortedSetsContractTestAll.java
index bf19c7c..d3e1faa 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/sortedsets/SortedSetsContractTestAll.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/sortedsets/SortedSetsContractTestAll.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.sortedsets;
+package org.apache.isis.core.unittestsupport.sortedsets;
public class SortedSetsContractTestAll extends SortedSetsContractTestAbstract {
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/value/ValueTypeContractTestAbstract_BigIntegerTest.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/value/ValueTypeContractTestAbstract_BigIntegerTest.java
similarity index 96%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/value/ValueTypeContractTestAbstract_BigIntegerTest.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/value/ValueTypeContractTestAbstract_BigIntegerTest.java
index 39bf280..6904757 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/value/ValueTypeContractTestAbstract_BigIntegerTest.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/value/ValueTypeContractTestAbstract_BigIntegerTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.value;
+package org.apache.isis.core.unittestsupport.value;
import java.math.BigInteger;
import java.util.Arrays;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/value/ValueTypeContractTestAbstract_ColorTest.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/value/ValueTypeContractTestAbstract_ColorTest.java
similarity index 96%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/value/ValueTypeContractTestAbstract_ColorTest.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/value/ValueTypeContractTestAbstract_ColorTest.java
index 7a4deea..f6e2bcf 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/value/ValueTypeContractTestAbstract_ColorTest.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/value/ValueTypeContractTestAbstract_ColorTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.value;
+package org.apache.isis.core.unittestsupport.value;
import java.awt.Color;
import java.util.Arrays;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/value/ValueTypeContractTestAbstract_StringTest.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/value/ValueTypeContractTestAbstract_StringTest.java
similarity index 96%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/value/ValueTypeContractTestAbstract_StringTest.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/value/ValueTypeContractTestAbstract_StringTest.java
index c1fc569..d29be31 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/value/ValueTypeContractTestAbstract_StringTest.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/value/ValueTypeContractTestAbstract_StringTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.value;
+package org.apache.isis.core.unittestsupport.value;
import java.util.Arrays;
import java.util.List;
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionLayoutXmlDefaultTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionLayoutXmlDefaultTest.java
index cf55824..b44b832 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionLayoutXmlDefaultTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionLayoutXmlDefaultTest.java
@@ -39,8 +39,8 @@ import org.apache.isis.core.metamodel.facets.all.named.NamedFacetAbstract;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.specloader.specimpl.ObjectActionDefault;
import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class ObjectActionLayoutXmlDefaultTest {
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationDefaultTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationDefaultTest.java
index e3109e2..c7154f8 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationDefaultTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationDefaultTest.java
@@ -44,8 +44,8 @@ import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.specloader.specimpl.OneToManyAssociationDefault;
import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class OneToManyAssociationDefaultTest {
diff --git a/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/i18n/po/PoReaderTest.java b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/i18n/po/PoReaderTest.java
index 6c95e79..4b18dd9 100644
--- a/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/i18n/po/PoReaderTest.java
+++ b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/i18n/po/PoReaderTest.java
@@ -36,7 +36,7 @@ import org.apache.isis.applib.services.i18n.LocaleProvider;
import org.apache.isis.applib.services.i18n.TranslationsResolver;
import org.apache.isis.core.commons.collections.Can;
import org.apache.isis.core.commons.internal.collections._Lists;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
public class PoReaderTest {
diff --git a/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefaultTest.java b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefaultTest.java
index ac075c1..eb3c2f7 100644
--- a/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefaultTest.java
+++ b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefaultTest.java
@@ -33,7 +33,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.applib.services.wrapper.WrappingObject;
import org.apache.isis.core.commons.internal.plugins.codegen.ProxyFactoryService;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import lombok.RequiredArgsConstructor;
diff --git a/core/unittestsupport/src/main/doc/modules/unit-test-support/partials/module-nav.adoc b/core/unittestsupport/src/main/doc/modules/unit-test-support/partials/module-nav.adoc
deleted file mode 100644
index 3cdcf2c..0000000
--- a/core/unittestsupport/src/main/doc/modules/unit-test-support/partials/module-nav.adoc
+++ /dev/null
@@ -1 +0,0 @@
-* xref:testing:unit-test-support:about.adoc[Unit Test Support]
diff --git a/core/unittestsupport/src/main/doc/modules/unit-test-support/nav.adoc b/core/unittestsupport/src/main/doc/modules/unittestsupport/nav.adoc
similarity index 100%
rename from core/unittestsupport/src/main/doc/modules/unit-test-support/nav.adoc
rename to core/unittestsupport/src/main/doc/modules/unittestsupport/nav.adoc
diff --git a/core/unittestsupport/src/main/doc/modules/unit-test-support/pages/about.adoc b/core/unittestsupport/src/main/doc/modules/unittestsupport/pages/about.adoc
similarity index 76%
rename from core/unittestsupport/src/main/doc/modules/unit-test-support/pages/about.adoc
rename to core/unittestsupport/src/main/doc/modules/unittestsupport/pages/about.adoc
index 298e586..3391ac5 100644
--- a/core/unittestsupport/src/main/doc/modules/unit-test-support/pages/about.adoc
+++ b/core/unittestsupport/src/main/doc/modules/unittestsupport/pages/about.adoc
@@ -3,7 +3,7 @@
Apache Isis provides a number of unit test helpers for you to use (if you wish) to unit test your domain objects.
-include::unit-test-support/contract-tests.adoc[leveloffset=+1]
-include::unit-test-support/jmock-extensions.adoc[leveloffset=+1]
-include::unit-test-support/soap-fake-server-junit-rule.adoc[leveloffset=+1]
-include::unit-test-support/maven-configuration.adoc[leveloffset=+1]
+include::unittestsupport/contract-tests.adoc[leveloffset=+1]
+include::unittestsupport/jmock-extensions.adoc[leveloffset=+1]
+include::unittestsupport/soap-fake-server-junit-rule.adoc[leveloffset=+1]
+include::unittestsupport/maven-configuration.adoc[leveloffset=+1]
diff --git a/core/unittestsupport/src/main/doc/modules/unit-test-support/pages/unit-test-support/contract-tests.adoc b/core/unittestsupport/src/main/doc/modules/unittestsupport/pages/unit-test-support/contract-tests.adoc
similarity index 100%
rename from core/unittestsupport/src/main/doc/modules/unit-test-support/pages/unit-test-support/contract-tests.adoc
rename to core/unittestsupport/src/main/doc/modules/unittestsupport/pages/unit-test-support/contract-tests.adoc
diff --git a/core/unittestsupport/src/main/doc/modules/unit-test-support/pages/unit-test-support/jmock-extensions.adoc b/core/unittestsupport/src/main/doc/modules/unittestsupport/pages/unit-test-support/jmock-extensions.adoc
similarity index 100%
rename from core/unittestsupport/src/main/doc/modules/unit-test-support/pages/unit-test-support/jmock-extensions.adoc
rename to core/unittestsupport/src/main/doc/modules/unittestsupport/pages/unit-test-support/jmock-extensions.adoc
diff --git a/core/unittestsupport/src/main/doc/modules/unit-test-support/pages/unit-test-support/maven-configuration.adoc b/core/unittestsupport/src/main/doc/modules/unittestsupport/pages/unit-test-support/maven-configuration.adoc
similarity index 100%
rename from core/unittestsupport/src/main/doc/modules/unit-test-support/pages/unit-test-support/maven-configuration.adoc
rename to core/unittestsupport/src/main/doc/modules/unittestsupport/pages/unit-test-support/maven-configuration.adoc
diff --git a/core/unittestsupport/src/main/doc/modules/unit-test-support/pages/unit-test-support/soap-fake-server-junit-rule.adoc b/core/unittestsupport/src/main/doc/modules/unittestsupport/pages/unit-test-support/soap-fake-server-junit-rule.adoc
similarity index 100%
rename from core/unittestsupport/src/main/doc/modules/unit-test-support/pages/unit-test-support/soap-fake-server-junit-rule.adoc
rename to core/unittestsupport/src/main/doc/modules/unittestsupport/pages/unit-test-support/soap-fake-server-junit-rule.adoc
diff --git a/core/unittestsupport/src/main/doc/modules/unittestsupport/partials/module-nav.adoc b/core/unittestsupport/src/main/doc/modules/unittestsupport/partials/module-nav.adoc
new file mode 100644
index 0000000..241ce16
--- /dev/null
+++ b/core/unittestsupport/src/main/doc/modules/unittestsupport/partials/module-nav.adoc
@@ -0,0 +1 @@
+* xref:testing:unittestsupport:about.adoc[Unit Test Support]
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/AbstractApplyToAllContractTest.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/AbstractApplyToAllContractTest.java
similarity index 96%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/AbstractApplyToAllContractTest.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/AbstractApplyToAllContractTest.java
index d61e48d..bfbe7cd 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/AbstractApplyToAllContractTest.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/AbstractApplyToAllContractTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport;
+package org.apache.isis.core.unittestsupport;
import java.io.PrintStream;
import java.io.PrintWriter;
@@ -29,7 +29,7 @@ import java.util.TreeSet;
import org.junit.Test;
import org.apache.isis.core.commons.internal._Constants;
-import org.apache.isis.unittestsupport.utils.IndentPrinter;
+import org.apache.isis.core.unittestsupport.utils.IndentPrinter;
/**
* Provides some basic infrastructure to iterate over all entity types and
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/BidirectionalRelationshipContractTestAbstract.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/bidir/BidirectionalRelationshipContractTestAbstract.java
similarity index 96%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/BidirectionalRelationshipContractTestAbstract.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/bidir/BidirectionalRelationshipContractTestAbstract.java
index dcc6900..31123c8 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/BidirectionalRelationshipContractTestAbstract.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/bidir/BidirectionalRelationshipContractTestAbstract.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.bidir;
+package org.apache.isis.core.unittestsupport.bidir;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
@@ -35,20 +35,17 @@ import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.Matchers.greaterThan;
import static org.junit.Assert.assertThat;
-import org.apache.isis.unittestsupport.AbstractApplyToAllContractTest;
-import org.apache.isis.unittestsupport.utils.CollectUtils;
-import org.apache.isis.unittestsupport.utils.ReflectUtils;
-import org.apache.isis.unittestsupport.utils.StringUtils;
+import org.apache.isis.core.unittestsupport.AbstractApplyToAllContractTest;
+import org.apache.isis.core.unittestsupport.utils.CollectUtils;
+import org.apache.isis.core.unittestsupport.utils.ReflectUtils;
+import org.apache.isis.core.unittestsupport.utils.StringUtils;
import static org.apache.isis.core.commons.internal.collections._Collections.toHashSet;
import static org.apache.isis.core.commons.internal.reflection._Reflect.streamAllFields;
import static org.apache.isis.core.commons.internal.reflection._Reflect.streamAllMethods;
import static org.apache.isis.core.commons.internal.reflection._Reflect.withMethodParametersCount;
import static org.apache.isis.core.commons.internal.reflection._Reflect.withName;
-import static org.apache.isis.unittestsupport.utils.ReflectUtils.withEntityParameter;
-import static org.apache.isis.unittestsupport.utils.ReflectUtils.withParametersAssignableFrom;
-import static org.apache.isis.unittestsupport.utils.ReflectUtils.withReturnTypeAssignableFrom;
-import static org.apache.isis.unittestsupport.utils.ReflectUtils.withTypeAssignableFrom;
+import static org.apache.isis.core.unittestsupport.utils.ReflectUtils.withParametersAssignableFrom;
public abstract class BidirectionalRelationshipContractTestAbstract extends AbstractApplyToAllContractTest implements Instantiators {
@@ -105,7 +102,7 @@ public abstract class BidirectionalRelationshipContractTestAbstract extends Abst
final Set<Method> addToMethods = streamAllMethods(p.entityType, true)
.filter(withConcreteMethodNamed(addToMethod))
.filter(withMethodParametersCount(1))
- .filter(withEntityParameter())
+ .filter(ReflectUtils.withEntityParameter())
.collect(toHashSet());
if(addToMethods.size() != 1) {
@@ -120,7 +117,7 @@ public abstract class BidirectionalRelationshipContractTestAbstract extends Abst
final Set<Method> removeFromMethods = streamAllMethods(p.entityType, true)
.filter(withConcreteMethodNamed(removeFromMethod))
.filter(withMethodParametersCount(1))
- .filter(withEntityParameter())
+ .filter(ReflectUtils.withEntityParameter())
.collect(toHashSet());
if(removeFromMethods.size() != 1) {
@@ -145,7 +142,7 @@ public abstract class BidirectionalRelationshipContractTestAbstract extends Abst
final Set<Method> modifyMethods = streamAllMethods(p.entityType, true)
.filter(withConcreteMethodNamed(modifyMethod))
.filter(withMethodParametersCount(1))
- .filter(withEntityParameter())
+ .filter(ReflectUtils.withEntityParameter())
.collect(toHashSet());
if(modifyMethods.size() != 1) {
@@ -225,7 +222,7 @@ public abstract class BidirectionalRelationshipContractTestAbstract extends Abst
// mappedBy field
final Set<Field> parentFields = streamAllFields(c.entityType, true)
.filter(withName(p.mappedBy))
- .filter(withTypeAssignableFrom(p.entityType))
+ .filter(ReflectUtils.withTypeAssignableFrom(p.entityType))
.collect(toHashSet());
assertThat(c.entityType.getName()+ ": could not locate '" + p.mappedBy + "' field, returning supertype of " + p.entityType.getSimpleName() +", (as per @Persistent(mappedBy=...) in parent "+ p.entityType.getSimpleName()+")", parentFields.size(), is(1));
@@ -236,7 +233,7 @@ public abstract class BidirectionalRelationshipContractTestAbstract extends Abst
final Set<Method> getterMethods = streamAllMethods(c.entityType, true)
.filter(withConcreteMethodNamed(getterMethod))
.filter(withMethodParametersCount(0))
- .filter(withReturnTypeAssignableFrom(p.entityType))
+ .filter(ReflectUtils.withReturnTypeAssignableFrom(p.entityType))
.collect(toHashSet());
assertThat(p.descRel(c) +": could not locate getter " + getterMethod + "() returning supertype of " + p.entityType.getSimpleName(), getterMethods.size(), is(1));
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/Child.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/bidir/Child.java
similarity index 96%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/Child.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/bidir/Child.java
index 6e91018..5ac8b81 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/Child.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/bidir/Child.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.bidir;
+package org.apache.isis.core.unittestsupport.bidir;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/Instantiator.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/bidir/Instantiator.java
similarity index 95%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/Instantiator.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/bidir/Instantiator.java
index 058bc65..75bf086 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/Instantiator.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/bidir/Instantiator.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.bidir;
+package org.apache.isis.core.unittestsupport.bidir;
public interface Instantiator {
Instantiator NOOP = new Instantiator() {
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/InstantiatorMap.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/bidir/InstantiatorMap.java
similarity index 97%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/InstantiatorMap.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/bidir/InstantiatorMap.java
index 6ea9bd2..2ff11ee 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/InstantiatorMap.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/bidir/InstantiatorMap.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.bidir;
+package org.apache.isis.core.unittestsupport.bidir;
import java.util.HashMap;
import java.util.Map;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/InstantiatorSimple.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/bidir/InstantiatorSimple.java
similarity index 95%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/InstantiatorSimple.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/bidir/InstantiatorSimple.java
index 554c1ea..13caa5e 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/InstantiatorSimple.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/bidir/InstantiatorSimple.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.bidir;
+package org.apache.isis.core.unittestsupport.bidir;
public class InstantiatorSimple implements Instantiator {
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/Instantiators.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/bidir/Instantiators.java
similarity index 94%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/Instantiators.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/bidir/Instantiators.java
index 3ba90e8..16e9bbd 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/Instantiators.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/bidir/Instantiators.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.bidir;
+package org.apache.isis.core.unittestsupport.bidir;
interface Instantiators {
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/Parent.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/bidir/Parent.java
similarity index 98%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/Parent.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/bidir/Parent.java
index 4fa518c..a8b9003 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/Parent.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/bidir/Parent.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.bidir;
+package org.apache.isis.core.unittestsupport.bidir;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/comparable/ComparableContractTest_compareTo.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/comparable/ComparableContractTest_compareTo.java
similarity index 96%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/comparable/ComparableContractTest_compareTo.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/comparable/ComparableContractTest_compareTo.java
index b65591b..f948a39 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/comparable/ComparableContractTest_compareTo.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/comparable/ComparableContractTest_compareTo.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.comparable;
+package org.apache.isis.core.unittestsupport.comparable;
import java.util.Arrays;
import java.util.List;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/comparable/ComparableContractTester.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/comparable/ComparableContractTester.java
similarity index 97%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/comparable/ComparableContractTester.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/comparable/ComparableContractTester.java
index 6e81365..1fc4316 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/comparable/ComparableContractTester.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/comparable/ComparableContractTester.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.comparable;
+package org.apache.isis.core.unittestsupport.comparable;
import java.util.List;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/IsisConfigurationLegacy.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/IsisConfigurationLegacy.java
similarity index 99%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/IsisConfigurationLegacy.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/IsisConfigurationLegacy.java
index 68e6d70..280af75 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/IsisConfigurationLegacy.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/IsisConfigurationLegacy.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.unittestsupport.config;
+package org.apache.isis.core.unittestsupport.config;
import java.awt.Color;
import java.awt.Font;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/internal/_Config.java
similarity index 96%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/internal/_Config.java
index 5fc8941..4aa4c99 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/internal/_Config.java
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.config.internal;
+package org.apache.isis.core.unittestsupport.config.internal;
import java.util.Map;
import org.apache.isis.core.commons.internal.collections._Maps;
import org.apache.isis.core.commons.internal.context._Context;
-import org.apache.isis.unittestsupport.config.IsisConfigurationLegacy;
+import org.apache.isis.core.unittestsupport.config.IsisConfigurationLegacy;
import lombok.val;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_Instance.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/internal/_Config_Instance.java
similarity index 97%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_Instance.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/internal/_Config_Instance.java
index 5a3033b..75edf17 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_Instance.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/internal/_Config_Instance.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.config.internal;
+package org.apache.isis.core.unittestsupport.config.internal;
import java.awt.Color;
import java.awt.Font;
@@ -28,7 +28,7 @@ import javax.annotation.Nullable;
import org.apache.isis.core.commons.internal._Constants;
import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.core.commons.internal.collections._Maps;
-import org.apache.isis.unittestsupport.config.IsisConfigurationLegacy;
+import org.apache.isis.core.unittestsupport.config.IsisConfigurationLegacy;
import static org.apache.isis.core.commons.internal.base._With.computeIfAbsent;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_LifecycleResource.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/internal/_Config_LifecycleResource.java
similarity index 96%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_LifecycleResource.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/internal/_Config_LifecycleResource.java
index 3f34afa..648c83a 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_LifecycleResource.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/internal/_Config_LifecycleResource.java
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.config.internal;
+package org.apache.isis.core.unittestsupport.config.internal;
import java.util.Map;
import java.util.Optional;
import org.apache.isis.core.commons.internal.base._Lazy;
-import org.apache.isis.unittestsupport.config.IsisConfigurationLegacy;
+import org.apache.isis.core.unittestsupport.config.IsisConfigurationLegacy;
import static org.apache.isis.core.commons.internal.base._With.requires;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_Parsers.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/internal/_Config_Parsers.java
similarity index 98%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_Parsers.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/internal/_Config_Parsers.java
index 6e3de62..8b16995 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_Parsers.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/internal/_Config_Parsers.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.config.internal;
+package org.apache.isis.core.unittestsupport.config.internal;
import java.awt.Color;
import java.awt.Font;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_trim.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/internal/_Config_trim.java
similarity index 95%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_trim.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/internal/_Config_trim.java
index 4955507..6fdf7e1 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_trim.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/internal/_Config_trim.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.config.internal;
+package org.apache.isis.core.unittestsupport.config.internal;
import java.util.Map;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/files/Files.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/files/Files.java
similarity index 98%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/files/Files.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/files/Files.java
index 9c99b0a..a71376a 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/files/Files.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/files/Files.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.files;
+package org.apache.isis.core.unittestsupport.files;
import java.io.File;
import java.io.FileFilter;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/inject/InjectServiceMethodMustBeFinalContractTestAbstract.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/inject/InjectServiceMethodMustBeFinalContractTestAbstract.java
similarity index 95%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/inject/InjectServiceMethodMustBeFinalContractTestAbstract.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/inject/InjectServiceMethodMustBeFinalContractTestAbstract.java
index 2bdda44..35e1371 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/inject/InjectServiceMethodMustBeFinalContractTestAbstract.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/inject/InjectServiceMethodMustBeFinalContractTestAbstract.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.inject;
+package org.apache.isis.core.unittestsupport.inject;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
@@ -26,7 +26,7 @@ import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
import org.apache.isis.core.commons.internal.reflection._Reflect;
-import org.apache.isis.unittestsupport.AbstractApplyToAllContractTest;
+import org.apache.isis.core.unittestsupport.AbstractApplyToAllContractTest;
import static org.apache.isis.core.commons.internal.collections._Collections.toHashSet;
import static org.apache.isis.core.commons.internal.reflection._Reflect.withPrefix;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jaxb/JaxbMatchers.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jaxb/JaxbMatchers.java
similarity index 98%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jaxb/JaxbMatchers.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jaxb/JaxbMatchers.java
index 14c3a3d..e711fc0 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jaxb/JaxbMatchers.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jaxb/JaxbMatchers.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.jaxb;
+package org.apache.isis.core.unittestsupport.jaxb;
import java.io.CharArrayWriter;
import java.io.IOException;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/ImposteriserUsingCodegenPlugin.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/ImposteriserUsingCodegenPlugin.java
similarity index 98%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/ImposteriserUsingCodegenPlugin.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/ImposteriserUsingCodegenPlugin.java
index 4e483c2..c5dd229 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/ImposteriserUsingCodegenPlugin.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/ImposteriserUsingCodegenPlugin.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.jmocking;
+package org.apache.isis.core.unittestsupport.jmocking;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/Imposterisers.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/Imposterisers.java
similarity index 95%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/Imposterisers.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/Imposterisers.java
index 3ecd44e..b2294ce 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/Imposterisers.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/Imposterisers.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.jmocking;
+package org.apache.isis.core.unittestsupport.jmocking;
import org.jmock.api.Imposteriser;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/InjectIntoJMockAction.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/InjectIntoJMockAction.java
similarity index 97%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/InjectIntoJMockAction.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/InjectIntoJMockAction.java
index 95f96f1..c887675 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/InjectIntoJMockAction.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/InjectIntoJMockAction.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.unittestsupport.jmocking;
+package org.apache.isis.core.unittestsupport.jmocking;
import java.lang.reflect.Method;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/IsisActions.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/IsisActions.java
similarity index 97%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/IsisActions.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/IsisActions.java
index ce38e9c..7634764 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/IsisActions.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/IsisActions.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.jmocking;
+package org.apache.isis.core.unittestsupport.jmocking;
import org.hamcrest.Description;
import org.jmock.api.Action;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/JMockActions.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/JMockActions.java
similarity index 97%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/JMockActions.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/JMockActions.java
index 916fac1..4a5d50f 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/JMockActions.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/JMockActions.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.jmocking;
+package org.apache.isis.core.unittestsupport.jmocking;
import java.util.Arrays;
import java.util.Collection;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2.java
similarity index 99%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2.java
index a48b796..38f3fb8 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.jmocking;
+package org.apache.isis.core.unittestsupport.jmocking;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/MyMockomatic.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/MyMockomatic.java
similarity index 78%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/MyMockomatic.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/MyMockomatic.java
index e7d6b5d..d9f32d4 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/MyMockomatic.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/MyMockomatic.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.jmocking;
+package org.apache.isis.core.unittestsupport.jmocking;
import java.lang.reflect.Field;
import java.util.ArrayList;
@@ -27,13 +27,6 @@ import org.jmock.States;
import org.jmock.auto.Auto;
import org.jmock.auto.Mock;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Allowing;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Checking;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.ExpectationsOn;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Ignoring;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Never;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.One;
-
class MyMockomatic {
private final JUnitRuleMockery2 context;
@@ -57,28 +50,28 @@ class MyMockomatic {
}
final Object mock = context.mock(field.getType(), field.getName());
setAutoField(field, object, mock, "auto-mock field " + field.getName());
- if(field.isAnnotationPresent(Ignoring.class)) {
+ if(field.isAnnotationPresent(JUnitRuleMockery2.Ignoring.class)) {
context.ignoring(mock);
}
- if(field.isAnnotationPresent(Allowing.class)) {
+ if(field.isAnnotationPresent(JUnitRuleMockery2.Allowing.class)) {
context.allowing(mock);
}
- if(field.isAnnotationPresent(Never.class)) {
+ if(field.isAnnotationPresent(JUnitRuleMockery2.Never.class)) {
context.never(mock);
}
- if(field.isAnnotationPresent(One.class)) {
+ if(field.isAnnotationPresent(JUnitRuleMockery2.One.class)) {
context.oneOf(mock);
}
- if(field.isAnnotationPresent(Checking.class)) {
+ if(field.isAnnotationPresent(JUnitRuleMockery2.Checking.class)) {
checking(field, mock);
}
mocks.add(mock);
}
private <T> void checking(final Field field, final T mock) {
- Checking checking = field.getAnnotation(Checking.class);
+ JUnitRuleMockery2.Checking checking = field.getAnnotation(JUnitRuleMockery2.Checking.class);
@SuppressWarnings("unchecked")
- Class<? extends ExpectationsOn<T>> expectationsOnClass = (Class<? extends ExpectationsOn<T>>) checking.value();
+ Class<? extends JUnitRuleMockery2.ExpectationsOn<T>> expectationsOnClass = (Class<? extends JUnitRuleMockery2.ExpectationsOn<T>>) checking.value();
context.checking(mock, expectationsOnClass);
}
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/PostponedAction.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/PostponedAction.java
similarity index 96%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/PostponedAction.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/PostponedAction.java
index b2fa43c..52e9297 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/PostponedAction.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/PostponedAction.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.jmocking;
+package org.apache.isis.core.unittestsupport.jmocking;
import java.util.function.Supplier;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/soap/PublishedEndpoints.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/soap/PublishedEndpoints.java
similarity index 97%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/soap/PublishedEndpoints.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/soap/PublishedEndpoints.java
index 2c85600..99c5e8b 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/soap/PublishedEndpoints.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/soap/PublishedEndpoints.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.soap;
+package org.apache.isis.core.unittestsupport.soap;
import java.util.List;
import java.util.Map;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/soap/SoapEndpoint.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/soap/SoapEndpoint.java
similarity index 97%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/soap/SoapEndpoint.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/soap/SoapEndpoint.java
index 1979db0..76522f4 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/soap/SoapEndpoint.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/soap/SoapEndpoint.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.soap;
+package org.apache.isis.core.unittestsupport.soap;
import javax.xml.ws.Endpoint;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/soap/SoapEndpointPublishingRule.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/soap/SoapEndpointPublishingRule.java
similarity index 98%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/soap/SoapEndpointPublishingRule.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/soap/SoapEndpointPublishingRule.java
index 1e7b55b..f9bedd2 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/soap/SoapEndpointPublishingRule.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/soap/SoapEndpointPublishingRule.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.soap;
+package org.apache.isis.core.unittestsupport.soap;
import java.util.ArrayList;
import java.util.List;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/soap/SoapEndpointSpec.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/soap/SoapEndpointSpec.java
similarity index 98%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/soap/SoapEndpointSpec.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/soap/SoapEndpointSpec.java
index 2fb0d66..d96ef78 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/soap/SoapEndpointSpec.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/soap/SoapEndpointSpec.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.soap;
+package org.apache.isis.core.unittestsupport.soap;
import java.util.function.Supplier;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/sortedsets/SortedSetsContractTestAbstract.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/sortedsets/SortedSetsContractTestAbstract.java
similarity index 95%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/sortedsets/SortedSetsContractTestAbstract.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/sortedsets/SortedSetsContractTestAbstract.java
index e1b18d3..f1b8545 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/sortedsets/SortedSetsContractTestAbstract.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/sortedsets/SortedSetsContractTestAbstract.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.sortedsets;
+package org.apache.isis.core.unittestsupport.sortedsets;
import java.lang.reflect.Field;
import java.util.Collection;
@@ -27,7 +27,7 @@ import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
import org.apache.isis.core.commons.internal.reflection._Reflect;
-import org.apache.isis.unittestsupport.AbstractApplyToAllContractTest;
+import org.apache.isis.core.unittestsupport.AbstractApplyToAllContractTest;
import static org.apache.isis.core.commons.internal.collections._Collections.toHashSet;
import static org.apache.isis.core.commons.internal.reflection._Reflect.withTypeAssignableTo;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/streams/NullPrintStream.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/streams/NullPrintStream.java
similarity index 98%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/streams/NullPrintStream.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/streams/NullPrintStream.java
index a9d9b8c..41be8c2 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/streams/NullPrintStream.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/streams/NullPrintStream.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.streams;
+package org.apache.isis.core.unittestsupport.streams;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/utils/CollectUtils.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/utils/CollectUtils.java
similarity index 94%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/utils/CollectUtils.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/utils/CollectUtils.java
index a0f5b5f..5b84644 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/utils/CollectUtils.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/utils/CollectUtils.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.utils;
+package org.apache.isis.core.unittestsupport.utils;
import java.util.Set;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/utils/IndentPrinter.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/utils/IndentPrinter.java
similarity index 98%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/utils/IndentPrinter.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/utils/IndentPrinter.java
index f0aa523..24b0aff 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/utils/IndentPrinter.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/utils/IndentPrinter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.utils;
+package org.apache.isis.core.unittestsupport.utils;
import java.io.IOException;
import java.io.PrintWriter;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/utils/ReflectUtils.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/utils/ReflectUtils.java
similarity index 98%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/utils/ReflectUtils.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/utils/ReflectUtils.java
index 4c27595..b4cc3ab 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/utils/ReflectUtils.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/utils/ReflectUtils.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.utils;
+package org.apache.isis.core.unittestsupport.utils;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/utils/StringUtils.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/utils/StringUtils.java
similarity index 96%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/utils/StringUtils.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/utils/StringUtils.java
index 69570a7..97f7b1d 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/utils/StringUtils.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/utils/StringUtils.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.utils;
+package org.apache.isis.core.unittestsupport.utils;
import java.lang.reflect.Field;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/value/ValueTypeContractTestAbstract.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/value/ValueTypeContractTestAbstract.java
similarity index 98%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/value/ValueTypeContractTestAbstract.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/value/ValueTypeContractTestAbstract.java
index 792ad08..4734fcc 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/value/ValueTypeContractTestAbstract.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/value/ValueTypeContractTestAbstract.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.value;
+package org.apache.isis.core.unittestsupport.value;
import java.util.List;
diff --git a/legacy/extensions/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/PercentageValueSemanticsProviderTest.java b/legacy/extensions/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/PercentageValueSemanticsProviderTest.java
index 0a8257b..e3b93f3 100644
--- a/legacy/extensions/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/PercentageValueSemanticsProviderTest.java
+++ b/legacy/extensions/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/PercentageValueSemanticsProviderTest.java
@@ -30,7 +30,7 @@ import org.apache.isis.core.metamodel.context.MetaModelContextAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.value.ValueSemanticsProviderAbstractTestCase;
-import org.apache.isis.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config.internal._Config;
public class PercentageValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
private PercentageValueSemanticsProvider adapter;
diff --git a/legacy/mappings/restclient/src/test/java/org/apache/isis/legacy/restclient/lib/RestfulHttpMethodTest_setUp.java b/legacy/mappings/restclient/src/test/java/org/apache/isis/legacy/restclient/lib/RestfulHttpMethodTest_setUp.java
index bb13e41..b8269db 100644
--- a/legacy/mappings/restclient/src/test/java/org/apache/isis/legacy/restclient/lib/RestfulHttpMethodTest_setUp.java
+++ b/legacy/mappings/restclient/src/test/java/org/apache/isis/legacy/restclient/lib/RestfulHttpMethodTest_setUp.java
@@ -26,10 +26,8 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.isis.legacy.restclient.lib.ClientRequestConfigurer;
-import org.apache.isis.legacy.restclient.lib.RestfulHttpMethodHelper;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
public class RestfulHttpMethodTest_setUp {
diff --git a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
index d333fb6..d46c666 100644
--- a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
+++ b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
@@ -33,8 +33,8 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.persistence.adapter.PojoAdapter;
import org.apache.isis.security.api.authentication.AuthenticationSession;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class PojoAdapterTest {
diff --git a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
index 70ecc46..0ba63d9 100644
--- a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
+++ b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
@@ -64,8 +64,8 @@ import org.apache.isis.core.runtime.persistence.objectstore.transaction.PojoAdap
import org.apache.isis.core.runtime.persistence.adapter.PojoAdapter;
import org.apache.isis.security.api.authentication.AuthenticationSession;
import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class ObjectMemberAbstractTest {
diff --git a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
index 588b248..2b37416 100644
--- a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
+++ b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
@@ -73,9 +73,9 @@ import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.schema.cmd.v1.CommandDto;
import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
import org.apache.isis.security.api.authentication.standard.SimpleSession;
-import org.apache.isis.unittestsupport.config.internal._Config;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import lombok.val;
diff --git a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java
index 447a7de..c8aeca0 100644
--- a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java
+++ b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java
@@ -67,10 +67,10 @@ import org.apache.isis.core.runtimeservices.wrapper.dom.employees.Employee;
import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
import org.apache.isis.security.api.authentication.standard.SimpleSession;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-import static org.apache.isis.unittestsupport.jmocking.PostponedAction.returnValuePostponed;
+import static org.apache.isis.core.unittestsupport.jmocking.PostponedAction.returnValuePostponed;
import lombok.val;
diff --git a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/ExceptionRecognizerCompositeForJdoObjectStoreTest.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/ExceptionRecognizerCompositeForJdoObjectStoreTest.java
index 8376728..7231d46 100644
--- a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/ExceptionRecognizerCompositeForJdoObjectStoreTest.java
+++ b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/ExceptionRecognizerCompositeForJdoObjectStoreTest.java
@@ -25,7 +25,7 @@ import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
import org.apache.isis.core.config.IsisConfiguration;
-import org.apache.isis.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config.internal._Config;
import lombok.val;
diff --git a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest_refineMetaModel.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest_refineMetaModel.java
index 290296d..75236c4 100644
--- a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest_refineMetaModel.java
+++ b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest_refineMetaModel.java
@@ -37,8 +37,8 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidator;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorAbstract;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorVisiting.Visitor;
import org.apache.isis.core.metamodel.specloader.validator.ValidationFailures;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import lombok.val;
diff --git a/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java b/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
index 827a62e..739fbb3 100644
--- a/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
+++ b/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
@@ -41,8 +41,8 @@ import org.apache.isis.security.api.authentication.AuthenticationRequestPassword
import org.apache.isis.security.api.authentication.AuthenticationSession;
import org.apache.isis.security.shiro.authentication.AuthenticatorShiro;
import org.apache.isis.security.shiro.authorization.AuthorizorShiro;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import lombok.val;
diff --git a/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java b/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
index 96f01f9..2d1b94f 100644
--- a/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
+++ b/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
@@ -39,9 +39,9 @@ import org.apache.isis.security.api.authentication.AuthenticationRequest;
import org.apache.isis.security.api.authentication.AuthenticationRequestPassword;
import org.apache.isis.security.shiro.authentication.AuthenticatorShiro;
import org.apache.isis.security.shiro.authorization.AuthorizorShiro;
-import org.apache.isis.unittestsupport.config.IsisConfigurationLegacy;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.config.IsisConfigurationLegacy;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import lombok.val;
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByCodeContractTester.java b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByCodeContractTester.java
index 9bbfda0..232a4cc 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByCodeContractTester.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByCodeContractTester.java
@@ -8,7 +8,7 @@ import com.google.common.collect.Lists;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-import org.apache.isis.unittestsupport.comparable.ComparableContractTester;
+import org.apache.isis.core.unittestsupport.comparable.ComparableContractTester;
public class ComparableByCodeContractTester<T extends WithCodeComparable<T>> {
protected final Class<T> cls;
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByDescriptionContractTester.java b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByDescriptionContractTester.java
index 1a31874..d80b707 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByDescriptionContractTester.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByDescriptionContractTester.java
@@ -8,7 +8,7 @@ import com.google.common.collect.Lists;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.unittestsupport.comparable.ComparableContractTester;
+import org.apache.isis.core.unittestsupport.comparable.ComparableContractTester;
public class ComparableByDescriptionContractTester<T extends WithDescriptionComparable<T>> {
protected final Class<T> cls;
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByNameContractTester.java b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByNameContractTester.java
index 5fed387..eb29bd5 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByNameContractTester.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByNameContractTester.java
@@ -8,7 +8,7 @@ import com.google.common.collect.Lists;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.unittestsupport.comparable.ComparableContractTester;
+import org.apache.isis.core.unittestsupport.comparable.ComparableContractTester;
public class ComparableByNameContractTester<T extends WithNameComparable<T>> {
protected final Class<T> cls;
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByReferenceContractTester.java b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByReferenceContractTester.java
index f13d1d6..58c0385 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByReferenceContractTester.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByReferenceContractTester.java
@@ -8,7 +8,7 @@ import com.google.common.collect.Lists;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.unittestsupport.comparable.ComparableContractTester;
+import org.apache.isis.core.unittestsupport.comparable.ComparableContractTester;
public class ComparableByReferenceContractTester<T extends WithReferenceComparable<T>> {
protected final Class<T> cls;
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByTitleContractTester.java b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByTitleContractTester.java
index e50f07f..3a61693 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByTitleContractTester.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByTitleContractTester.java
@@ -8,7 +8,7 @@ import com.google.common.collect.Lists;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.unittestsupport.comparable.ComparableContractTester;
+import org.apache.isis.core.unittestsupport.comparable.ComparableContractTester;
public class ComparableByTitleContractTester<T extends WithTitleComparable<T>> {
protected final Class<T> cls;
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/InstantiatorForComparableByCode.java b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/InstantiatorForComparableByCode.java
index fc26dd8..ac287a9 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/InstantiatorForComparableByCode.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/InstantiatorForComparableByCode.java
@@ -1,6 +1,6 @@
package org.apache.isis.subdomains.base.applib.with;
-import org.apache.isis.unittestsupport.bidir.Instantiator;
+import org.apache.isis.core.unittestsupport.bidir.Instantiator;
public class InstantiatorForComparableByCode implements Instantiator {
public final Class<? extends WithCodeComparable<?>> cls;
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/InstantiatorForComparableByDescription.java b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/InstantiatorForComparableByDescription.java
index 51ba406..9111b54 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/InstantiatorForComparableByDescription.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/InstantiatorForComparableByDescription.java
@@ -1,7 +1,7 @@
package org.apache.isis.subdomains.base.applib.with;
-import org.apache.isis.unittestsupport.bidir.Instantiator;
+import org.apache.isis.core.unittestsupport.bidir.Instantiator;
public class InstantiatorForComparableByDescription implements Instantiator {
public final Class<? extends WithDescriptionComparable<?>> cls;
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/InstantiatorForComparableByName.java b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/InstantiatorForComparableByName.java
index b5bb7a6..742913e 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/InstantiatorForComparableByName.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/InstantiatorForComparableByName.java
@@ -1,7 +1,7 @@
package org.apache.isis.subdomains.base.applib.with;
-import org.apache.isis.unittestsupport.bidir.Instantiator;
+import org.apache.isis.core.unittestsupport.bidir.Instantiator;
public class InstantiatorForComparableByName implements Instantiator {
public final Class<? extends WithNameComparable<?>> cls;
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/InstantiatorForComparableByReference.java b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/InstantiatorForComparableByReference.java
index 10b1dd5..4122272 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/InstantiatorForComparableByReference.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/InstantiatorForComparableByReference.java
@@ -1,7 +1,7 @@
package org.apache.isis.subdomains.base.applib.with;
-import org.apache.isis.unittestsupport.bidir.Instantiator;
+import org.apache.isis.core.unittestsupport.bidir.Instantiator;
public class InstantiatorForComparableByReference implements Instantiator {
public final Class<? extends WithReferenceComparable<?>> cls;
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/InstantiatorForWithStartDate.java b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/InstantiatorForWithStartDate.java
index f8fe5c9..ef2c808 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/InstantiatorForWithStartDate.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/InstantiatorForWithStartDate.java
@@ -2,7 +2,7 @@ package org.apache.isis.subdomains.base.applib.with;
import org.joda.time.LocalDate;
-import org.apache.isis.unittestsupport.bidir.Instantiator;
+import org.apache.isis.core.unittestsupport.bidir.Instantiator;
public class InstantiatorForWithStartDate implements Instantiator {
public final Class<? extends WithStartDate> cls;
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/WithIntervalMutableContractTestAbstract_changeDates.java b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/WithIntervalMutableContractTestAbstract_changeDates.java
index b4cef04..748aad3 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/WithIntervalMutableContractTestAbstract_changeDates.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/WithIntervalMutableContractTestAbstract_changeDates.java
@@ -10,7 +10,7 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
public abstract class WithIntervalMutableContractTestAbstract_changeDates<T extends WithIntervalMutable<T>> {
@Rule
diff --git a/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/XDocReportServiceTest.java b/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/XDocReportServiceTest.java
index e41ccf6..c6df8d8 100644
--- a/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/XDocReportServiceTest.java
+++ b/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/XDocReportServiceTest.java
@@ -12,12 +12,10 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
-import org.apache.isis.subdomains.xdocreport.applib.service.OutputType;
-import org.apache.isis.subdomains.xdocreport.applib.service.XDocReportService;
import org.apache.isis.subdomains.xdocreport.applib.service.example.models.Developer;
import org.apache.isis.subdomains.xdocreport.applib.service.example.models.Project;
import org.apache.isis.subdomains.xdocreport.applib.service.example.models.ProjectDevelopersModel;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import fr.opensagres.xdocreport.core.io.IOUtils;
diff --git a/testing/fakedata/applib/src/test/java/org/apache/isis/testing/fakedata/applib/services/FakeDataServiceTest.java b/testing/fakedata/applib/src/test/java/org/apache/isis/testing/fakedata/applib/services/FakeDataServiceTest.java
index ea3499a..4942ee9 100644
--- a/testing/fakedata/applib/src/test/java/org/apache/isis/testing/fakedata/applib/services/FakeDataServiceTest.java
+++ b/testing/fakedata/applib/src/test/java/org/apache/isis/testing/fakedata/applib/services/FakeDataServiceTest.java
@@ -28,7 +28,7 @@ import org.apache.isis.applib.value.Clob;
import org.apache.isis.applib.value.Password;
import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.core.commons.internal.collections._Sets;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
public class FakeDataServiceTest {
diff --git a/testing/integtestsupport/src/main/doc/modules/integ-test-support/pages/integ-test-support/abstract-class.adoc b/testing/integtestsupport/src/main/doc/modules/integ-test-support/pages/integ-test-support/abstract-class.adoc
index e02109d..185ed4d 100644
--- a/testing/integtestsupport/src/main/doc/modules/integ-test-support/pages/integ-test-support/abstract-class.adoc
+++ b/testing/integtestsupport/src/main/doc/modules/integ-test-support/pages/integ-test-support/abstract-class.adoc
@@ -64,7 +64,7 @@ public ExceptionRecognizerTranslate exceptionRecognizerTranslations = // <4>
ExceptionRecognizerTranslate.create();
----
<1> ensures an Apache Isis session/transaction running for each test
-<2> sets up a JMock context (using Apache Isis' extension to JMock as described in xref:testing:unit-test-support:about.adoc#jmock-extensions[JMock Extensions].
+<2> sets up a JMock context (using Apache Isis' extension to JMock as described in xref:testing:unittestsupport:about.adoc#jmock-extensions[JMock Extensions].
<3> standard JUnit rule for writing tests that throw exceptions
<4> to capture messages that require translation, as described in xref:userguide:btb:i18n.adoc[i18 support].
diff --git a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/bean/AbstractBeanPropertiesTest.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/bean/AbstractBeanPropertiesTest.java
index fc5ff21..1a093af 100644
--- a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/bean/AbstractBeanPropertiesTest.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/bean/AbstractBeanPropertiesTest.java
@@ -4,7 +4,7 @@ import org.jmock.auto.Mock;
import org.junit.Rule;
import org.apache.isis.applib.services.repository.RepositoryService;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
public abstract class AbstractBeanPropertiesTest {
diff --git a/testing/unittestsupport/src/main/doc/modules/unit-test-support-ext/partials/module-nav.adoc b/testing/unittestsupport/src/main/doc/modules/unit-test-support-ext/partials/module-nav.adoc
index 1c0f3d4..d5df2eb 100644
--- a/testing/unittestsupport/src/main/doc/modules/unit-test-support-ext/partials/module-nav.adoc
+++ b/testing/unittestsupport/src/main/doc/modules/unit-test-support-ext/partials/module-nav.adoc
@@ -1,3 +1,3 @@
-* xref:testing:unit-test-support-ext:about.adoc[Unit Test Support (extension)]
+* xref:testing:unittestsupport-ext:about.adoc[Unit Test Support (extension)]
diff --git a/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_appendValueAndFormat.java b/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_appendValueAndFormat.java
index 38c91cb..6e8da50 100644
--- a/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_appendValueAndFormat.java
+++ b/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_appendValueAndFormat.java
@@ -39,7 +39,7 @@ import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
public class JsonValueEncoderTest_appendValueAndFormat {
diff --git a/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_asAdapter.java b/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_asAdapter.java
index 72bee80..04062e7 100644
--- a/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_asAdapter.java
+++ b/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_asAdapter.java
@@ -49,7 +49,7 @@ import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import lombok.val;
diff --git a/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_asObject.java b/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_asObject.java
index d266418..e45fd91 100644
--- a/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_asObject.java
+++ b/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_asObject.java
@@ -37,7 +37,7 @@ import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
public class JsonValueEncoderTest_asObject {
diff --git a/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
index e7dc74f..3f9d291 100644
--- a/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
+++ b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
@@ -46,8 +46,8 @@ import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
import org.apache.isis.core.runtime.session.IsisSession;
import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.security.api.authentication.AuthenticationSession;
-import org.apache.isis.unittestsupport.config.IsisConfigurationLegacy;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.config.IsisConfigurationLegacy;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
import org.apache.isis.viewer.restfulobjects.applib.RestfulResponse.HttpStatusCode;
import org.apache.isis.viewer.restfulobjects.rendering.RestfulObjectsApplicationException;
diff --git a/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java
index f647b22..73c18c4 100644
--- a/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java
+++ b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java
@@ -44,9 +44,9 @@ import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
import org.apache.isis.core.runtime.session.IsisSession;
import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.security.api.authentication.AuthenticationSession;
-import org.apache.isis.unittestsupport.config.IsisConfigurationLegacy;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.config.IsisConfigurationLegacy;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
import org.apache.isis.viewer.restfulobjects.applib.RestfulRequest.RequestParameter;
diff --git a/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/RestfulObjectsApplicationExceptionMapper_Test_Contract.java b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/RestfulObjectsApplicationExceptionMapper_Test_Contract.java
index fdf002f..ca24e3b 100644
--- a/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/RestfulObjectsApplicationExceptionMapper_Test_Contract.java
+++ b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/RestfulObjectsApplicationExceptionMapper_Test_Contract.java
@@ -31,7 +31,7 @@ import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.RestfulResponse.HttpStatusCode;
import org.apache.isis.viewer.restfulobjects.applib.util.JsonMapper;
diff --git a/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsSessionFilter_lookupPassThru_Test.java b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsSessionFilter_lookupPassThru_Test.java
index 244dc16..9f2da79 100644
--- a/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsSessionFilter_lookupPassThru_Test.java
+++ b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsSessionFilter_lookupPassThru_Test.java
@@ -31,7 +31,7 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
public class IsisRestfulObjectsSessionFilter_lookupPassThru_Test {
diff --git a/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/EntityModel_hintsTest.java b/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/EntityModel_hintsTest.java
index d884afb..48d5d2d 100644
--- a/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/EntityModel_hintsTest.java
+++ b/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/EntityModel_hintsTest.java
@@ -33,7 +33,7 @@ import static org.junit.Assert.assertThat;
import org.apache.isis.core.metamodel.MetaModelContext_forTesting;
import org.apache.isis.core.metamodel.context.MetaModelContext;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.webapp.context.IsisWebAppCommonContext;
import lombok.val;
diff --git a/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/ScalarModel_isScalarSubtypingAnyOf_Test.java b/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/ScalarModel_isScalarSubtypingAnyOf_Test.java
index d7a45df..948bae0 100644
--- a/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/ScalarModel_isScalarSubtypingAnyOf_Test.java
+++ b/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/ScalarModel_isScalarSubtypingAnyOf_Test.java
@@ -32,7 +32,7 @@ import org.apache.isis.core.metamodel.MetaModelContext_forTesting;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.objectmanager.ObjectManager;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.webapp.context.IsisWebAppCommonContext;
import org.apache.isis.webapp.context.memento.ObjectMementoService;
diff --git a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionContentsSelectorDropdownPanelTest.java b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionContentsSelectorDropdownPanelTest.java
index cfb4534..dcca4dc 100644
--- a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionContentsSelectorDropdownPanelTest.java
+++ b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionContentsSelectorDropdownPanelTest.java
@@ -31,8 +31,8 @@ import static org.junit.Assert.assertThat;
import org.apache.isis.core.metamodel.MetaModelContext_forTesting;
import org.apache.isis.core.metamodel.context.MetaModelContext;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.viewer.wicket.ui.ComponentFactory;
import org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable.CollectionContentsAsAjaxTablePanelFactory;
import org.apache.isis.webapp.context.IsisWebAppCommonContext;
diff --git a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaSqlDateTest.java b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaSqlDateTest.java
index a3b098a..91e5cfb 100644
--- a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaSqlDateTest.java
+++ b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaSqlDateTest.java
@@ -27,8 +27,8 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
public class DateConverterForJavaSqlDateTest {
diff --git a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaUtilDateTest.java b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaUtilDateTest.java
index a42d9db..21c771f 100644
--- a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaUtilDateTest.java
+++ b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaUtilDateTest.java
@@ -29,8 +29,8 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
public class DateConverterForJavaUtilDateTest {
diff --git a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaDateTimeTest.java b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaDateTimeTest.java
index 2dcb666..b1b7b94 100644
--- a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaDateTimeTest.java
+++ b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaDateTimeTest.java
@@ -28,8 +28,8 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
public class DateConverterForJodaDateTimeTest {
diff --git a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTest.java b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTest.java
index 6ecf31f..28b307f 100644
--- a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTest.java
+++ b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTest.java
@@ -28,8 +28,8 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
public class DateConverterForJodaLocalDateTest {
diff --git a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTimeTest.java b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTimeTest.java
index 532d1c1..1a121de 100644
--- a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTimeTest.java
+++ b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTimeTest.java
@@ -28,8 +28,8 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
public class DateConverterForJodaLocalDateTimeTest {
diff --git a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8LocalDateTest.java b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8LocalDateTest.java
index 319adf7..7802a55 100644
--- a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8LocalDateTest.java
+++ b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8LocalDateTest.java
@@ -29,8 +29,8 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
import org.apache.isis.viewer.wicket.ui.components.scalars.jdk8time.DateConverterForJdk8LocalDate;
diff --git a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8LocalDateTimeTest.java b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8LocalDateTimeTest.java
index 1ca1c83..49529ac 100644
--- a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8LocalDateTimeTest.java
+++ b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8LocalDateTimeTest.java
@@ -29,8 +29,8 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
import org.apache.isis.viewer.wicket.ui.components.scalars.jdk8time.DateConverterForJdk8LocalDateTime;
diff --git a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8OffsetDateTimeTest.java b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8OffsetDateTimeTest.java
index 2534c2a..3d60b86 100644
--- a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8OffsetDateTimeTest.java
+++ b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8OffsetDateTimeTest.java
@@ -29,8 +29,8 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
import org.apache.isis.viewer.wicket.ui.components.scalars.jdk8time.DateConverterForJdk8OffsetDateTime;
diff --git a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ObjectAdapterMementoProviderForValueChoicesTest.java b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ObjectAdapterMementoProviderForValueChoicesTest.java
index 55dc85d..cd8049e 100644
--- a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ObjectAdapterMementoProviderForValueChoicesTest.java
+++ b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ObjectAdapterMementoProviderForValueChoicesTest.java
@@ -35,7 +35,7 @@ import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.widgets.select2.providers.ObjectAdapterMementoProviderForValueChoices;
diff --git a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Authenticate.java b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Authenticate.java
index c46b029..345fbaa 100644
--- a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Authenticate.java
+++ b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Authenticate.java
@@ -44,7 +44,7 @@ import org.apache.isis.security.api.authentication.manager.AuthenticationManager
import org.apache.isis.security.api.authentication.standard.Authenticator;
import org.apache.isis.security.api.authentication.standard.RandomCodeGeneratorDefault;
import org.apache.isis.security.api.authentication.standard.SimpleSession;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.webapp.context.IsisWebAppCommonContext;
public class AuthenticatedWebSessionForIsis_Authenticate {
diff --git a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Instantiation.java b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Instantiation.java
index 0c543db..0fbed87 100644
--- a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Instantiation.java
+++ b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Instantiation.java
@@ -27,8 +27,8 @@ import org.jmock.auto.Mock;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class AuthenticatedWebSessionForIsis_Instantiation {
diff --git a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_SignIn.java b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_SignIn.java
index 8925bee..7590839 100644
--- a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_SignIn.java
+++ b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_SignIn.java
@@ -41,7 +41,7 @@ import org.apache.isis.security.api.authentication.AuthenticationRequestPassword
import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
import org.apache.isis.security.api.authentication.standard.Authenticator;
import org.apache.isis.security.api.authentication.standard.RandomCodeGeneratorDefault;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.webapp.context.IsisWebAppCommonContext;
public class AuthenticatedWebSessionForIsis_SignIn {
diff --git a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_TestAbstract.java b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_TestAbstract.java
index 4b68189..f1731f3 100644
--- a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_TestAbstract.java
+++ b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_TestAbstract.java
@@ -31,8 +31,8 @@ import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.applib.services.session.SessionLoggingService;
import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.webapp.context.IsisWebAppCommonContext;
public abstract class AuthenticatedWebSessionForIsis_TestAbstract {
diff --git a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_Defaults.java b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_Defaults.java
index a965311..c44913b 100644
--- a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_Defaults.java
+++ b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_Defaults.java
@@ -33,8 +33,8 @@ import static org.hamcrest.Matchers.nullValue;
import static org.junit.Assert.assertThat;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.viewer.wicket.viewer.integration.AuthenticatedWebSessionForIsis;
import org.apache.isis.webapp.context.memento.ObjectMemento;
diff --git a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_Pages.java b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_Pages.java
index 63e94e2..111fb09 100644
--- a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_Pages.java
+++ b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_Pages.java
@@ -29,8 +29,8 @@ import org.junit.Test;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.viewer.wicket.model.models.PageType;
import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
import org.apache.isis.viewer.wicket.ui.pages.home.HomePage;