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/29 19:38:30 UTC

[isis] 01/25: ISIS-2273: moves detached tests for unittestsupport, copies a couple also used by config or applib

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch ISIS-2062
in repository https://gitbox.apache.org/repos/asf/isis.git

commit 0c43914b4df4fcba855cf3dc3f73e3cf6f735b53
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jan 29 16:44:17 2020 +0000

    ISIS-2273: moves detached tests for unittestsupport, copies a couple also used by config or applib
---
 api/applib/pom.xml                                 |  7 --
 .../ComparableContractTest_compareTo.java          |  9 ++-
 .../unittestsupport/ComparableContractTester.java  | 82 ++++++++++++++++++++++
 .../config/IsisConfiguration_createSubsetTest.java |  4 +-
 .../core/config/IsisConfiguration_primingTest.java |  2 +-
 .../config/IsisConfiguration_specialCharTest.java  |  4 +-
 .../config/IsisConfiguration_whitespaceTest.java   |  4 +-
 .../unittestsupport}/IsisConfigurationLegacy.java  |  2 +-
 .../config/unittestsupport}/internal/_Config.java  |  4 +-
 .../internal/_Config_Instance.java                 |  4 +-
 .../internal/_Config_LifecycleResource.java        |  4 +-
 .../unittestsupport}/internal/_Config_Parsers.java |  2 +-
 .../unittestsupport}/internal/_Config_trim.java    |  2 +-
 .../metamodel/MetaModelContext_configTest.java     |  2 +-
 .../metamodel/MetaModelContext_forTesting.java     |  2 +-
 .../ViewModelSemanticCheckingFacetFactoryTest.java |  2 +-
 .../object/defaults/DefaultedFacetFactoryTest.java |  2 +-
 .../DomainObjectAnnotationFacetFactoryTest.java    |  2 +-
 .../DomainObjectLayoutFactoryTest.java             |  2 +-
 ...eFacetAnnotationOrConfigurationFactoryTest.java |  2 +-
 .../PropertyAnnotationFacetFactoryTest.java        |  2 +-
 .../BigDecimalValueSemanticsProviderTest.java      |  2 +-
 .../value/BigIntValueSemanticsProviderTest.java    |  2 +-
 .../value/ByteValueSemanticsProviderTest.java      |  2 +-
 .../value/DoubleValueSemanticsProviderTest.java    |  2 +-
 .../value/FloatValueSemanticsProviderTest.java     |  2 +-
 .../value/IntValueSemanticsProviderTest.java       |  2 +-
 .../JavaSqlDateValueSemanticsProviderTest.java     |  2 +-
 .../JavaSqlTimeValueSemanticsProviderTest.java     |  2 +-
 .../JavaUtilDateValueSemanticsProviderTest.java    |  2 +-
 .../value/LongValueSemanticsProviderTest.java      |  2 +-
 .../value/ShortValueSemanticsProviderTest.java     |  2 +-
 .../ValueSemanticsProviderAbstractTestCase.java    |  2 +-
 ...odaLocalDateTimeValueSemanticsProviderTest.java |  2 +-
 .../WrapperFactoryDefault_wrappedObject_Test.java  |  2 +-
 .../AbstractApplyToAllContractTest.java            |  4 ++
 ...irectionalRelationshipContractTestAbstract.java |  5 ++
 .../ComparableContractTest_compareTo.java          |  7 ++
 .../isis/core/unittestsupport/files/Files.java     |  5 ++
 .../core/unittestsupport/jaxb/JaxbMatchers.java    |  4 +-
 .../jmocking/JUnitRuleMockery2.java                |  4 ++
 .../soap/SoapEndpointPublishingRule.java           |  4 +-
 .../sortedsets/SortedSetsContractTestAbstract.java |  5 ++
 .../unittestsupport/streams/NullPrintStream.java   |  5 ++
 .../core/unittestsupport/utils/CollectUtils.java   |  5 ++
 .../core/unittestsupport/utils/IndentPrinter.java  |  4 ++
 .../core/unittestsupport/utils/ReflectUtils.java   |  5 ++
 .../core/unittestsupport/utils/StringUtils.java    |  5 ++
 .../value/ValueTypeContractTestAbstract.java       |  4 ++
 .../BidirectionalRelationshipContractTestAll.java  |  0
 .../unittestsupport/bidir/ChildDomainObject.java   |  0
 .../bidir/InstantiatorForChildDomainObject.java    |  0
 .../unittestsupport/bidir/ParentDomainObject.java  |  0
 .../unittestsupport/bidir/PeerDomainObject.java    |  0
 .../bidir/PeerDomainObjectForTesting.java          |  0
 .../comparable/CategorizedDomainObject.java        |  0
 ...mainObjectComparableContractTest_compareTo.java |  0
 .../files/FilesTest_deleteFiles.java               |  0
 .../CollaboratingUsingConstructorInjection.java    |  0
 .../CollaboratingUsingSetterInjection.java         |  0
 .../unittestsupport/jmocking/Collaborator.java     |  0
 .../ImposteriserTestUsingCodegenPlugin.java        |  0
 ...IsisActionsTest_returnNewTransientInstance.java |  0
 .../jmocking/JMockActionsTest_returnArgument.java  |  0
 .../jmocking/JMockActionsTest_returnEach.java      |  0
 .../jmocking/JUnitRuleMockery2Test.java            |  0
 ..._autoWiring_constructorInjection_happyCase.java |  0
 ...y2Test_autoWiring_sadCase_noClassUnderTest.java |  0
 ...est_autoWiring_sadCase_twoClassesUnderTest.java |  0
 ...2Test_autoWiring_setterInjection_happyCase.java |  0
 ...RuleMockery2Test_mockAnnotatedWithAllowing.java |  0
 ...RuleMockery2Test_mockAnnotatedWithChecking.java |  0
 ...RuleMockery2Test_mockAnnotatedWithIgnoring.java |  0
 ...kery2Test_mockAnnotatedWithNever_happyCase.java |  0
 ...ockery2Test_mockAnnotatedWithNever_sadCase.java |  0
 ...ockery2Test_mockAnnotatedWithOne_happyCase.java |  0
 ...eMockery2Test_mockAnnotatedWithOne_sadCase.java |  0
 .../sortedsets/SomeDomainObject.java               |  0
 .../sortedsets/SortedSetsContractTestAll.java      |  0
 ...lueTypeContractTestAbstract_BigIntegerTest.java |  0
 .../ValueTypeContractTestAbstract_ColorTest.java   |  0
 .../ValueTypeContractTestAbstract_StringTest.java  |  0
 .../PercentageValueSemanticsProviderTest.java      |  2 +-
 83 files changed, 193 insertions(+), 49 deletions(-)

diff --git a/api/applib/pom.xml b/api/applib/pom.xml
index 44d7207..0f00fa0 100644
--- a/api/applib/pom.xml
+++ b/api/applib/pom.xml
@@ -91,13 +91,6 @@
             <artifactId>annotations</artifactId>
         </dependency>
 
-        <!-- TESTS -->
-        <dependency>
-            <groupId>org.apache.isis.core</groupId>
-            <artifactId>isis-core-unittestsupport</artifactId>
-            <scope>test</scope>
-        </dependency>
-
     </dependencies>
 
 </project>
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/comparable/ComparableContractTest_compareTo.java b/api/applib/src/test/java/org/apache/isis/applib/unittestsupport/ComparableContractTest_compareTo.java
similarity index 93%
copy from core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/comparable/ComparableContractTest_compareTo.java
copy to api/applib/src/test/java/org/apache/isis/applib/unittestsupport/ComparableContractTest_compareTo.java
index f948a39..4d6abcd 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/comparable/ComparableContractTest_compareTo.java
+++ b/api/applib/src/test/java/org/apache/isis/applib/unittestsupport/ComparableContractTest_compareTo.java
@@ -16,13 +16,20 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.core.unittestsupport.comparable;
+package org.apache.isis.applib.unittestsupport;
 
 import java.util.Arrays;
 import java.util.List;
 
 import org.junit.Test;
 
+/**
+ * <p>
+ *     Used by core.
+ * </p>
+ *
+ * @param <T>
+ */
 public abstract class ComparableContractTest_compareTo<T extends Comparable<T>> {
 
     /**
diff --git a/api/applib/src/test/java/org/apache/isis/applib/unittestsupport/ComparableContractTester.java b/api/applib/src/test/java/org/apache/isis/applib/unittestsupport/ComparableContractTester.java
new file mode 100644
index 0000000..2145ab8
--- /dev/null
+++ b/api/applib/src/test/java/org/apache/isis/applib/unittestsupport/ComparableContractTester.java
@@ -0,0 +1,82 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package org.apache.isis.applib.unittestsupport;
+
+import java.util.List;
+
+import org.hamcrest.Matchers;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+import org.apache.isis.core.commons.internal.collections._Lists;
+
+public class ComparableContractTester<T extends Comparable<T>> {
+
+
+    private final List<List<T>> orderedTuples;
+
+    /**
+     * Provide an array of tuples; each tuple should consist of 4 elements, whereby
+     * item0  < item1 = item2 < item3
+     *
+     * Typically item0 should be null valued (if supported by the impl).
+     */
+    public ComparableContractTester(List<List<T>> orderedTuples) {
+        this.orderedTuples = orderedTuples;
+    }
+
+    public void test() {
+
+        for(List<T> orderedTuple: orderedTuples) {
+
+            T item1 = orderedTuple.get(0);
+            T item2 = orderedTuple.get(1);
+            T item3 = orderedTuple.get(2);
+            T item4 = orderedTuple.get(3);
+
+            assertThat(desc(item1, "<", item2), item1.compareTo(item2), is(Matchers.lessThan(0)));
+            assertThat(desc(item2, ">", item1), item2.compareTo(item1), is(Matchers.greaterThan(0)));
+
+            assertThat(desc(item2, "==", item3), item2.compareTo(item3), is(0));
+            assertThat(desc(item3, "==", item2), item3.compareTo(item2), is(0));
+
+            assertThat(desc(item3, "<", item4), item3.compareTo(item4), is(Matchers.lessThan(0)));
+            assertThat(desc(item4, ">", item3), item4.compareTo(item3), is(Matchers.greaterThan(0)));
+        }
+    }
+
+    protected static String desc(Object item1, final String op, Object item2) {
+        return nullSafe(item1) + op + nullSafe(item2);
+    }
+
+    private static String nullSafe(Object item) {
+        return item != null? item.toString(): "null";
+    }
+
+    /**
+     * Syntax sugar to remove boilerplate from subclasses.
+     */
+    @SafeVarargs
+    public static <E> List<E> listOf(E... elements) {
+        return _Lists.of(elements);
+    }
+
+
+}
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 46d5b3f..715cdfd 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.core.unittestsupport.config.IsisConfigurationLegacy;
-import org.apache.isis.core.unittestsupport.config.internal._Config;
+import org.apache.isis.core.config.unittestsupport.IsisConfigurationLegacy;
+import org.apache.isis.core.config.unittestsupport.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 14d7eda..1d5a259 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.core.unittestsupport.config.internal._Config;
+import org.apache.isis.core.config.unittestsupport.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 94e7ddb..4d9d805 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.core.unittestsupport.config.IsisConfigurationLegacy;
-import org.apache.isis.core.unittestsupport.config.internal._Config;
+import org.apache.isis.core.config.unittestsupport.IsisConfigurationLegacy;
+import org.apache.isis.core.config.unittestsupport.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 314d13f..3d84b04 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.core.unittestsupport.config.IsisConfigurationLegacy;
-import org.apache.isis.core.unittestsupport.config.internal._Config;
+import org.apache.isis.core.config.unittestsupport.IsisConfigurationLegacy;
+import org.apache.isis.core.config.unittestsupport.internal._Config;
 
 class IsisConfiguration_whitespaceTest {
 
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/IsisConfigurationLegacy.java b/core/config/src/test/java/org/apache/isis/core/config/unittestsupport/IsisConfigurationLegacy.java
similarity index 99%
rename from core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/IsisConfigurationLegacy.java
rename to core/config/src/test/java/org/apache/isis/core/config/unittestsupport/IsisConfigurationLegacy.java
index 280af75..ae90f1a 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/IsisConfigurationLegacy.java
+++ b/core/config/src/test/java/org/apache/isis/core/config/unittestsupport/IsisConfigurationLegacy.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.core.unittestsupport.config;
+package org.apache.isis.core.config.unittestsupport;
 
 import java.awt.Color;
 import java.awt.Font;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/internal/_Config.java b/core/config/src/test/java/org/apache/isis/core/config/unittestsupport/internal/_Config.java
similarity index 96%
rename from core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/internal/_Config.java
rename to core/config/src/test/java/org/apache/isis/core/config/unittestsupport/internal/_Config.java
index 4aa4c99..5f225ba 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/internal/_Config.java
+++ b/core/config/src/test/java/org/apache/isis/core/config/unittestsupport/internal/_Config.java
@@ -16,13 +16,13 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.core.unittestsupport.config.internal;
+package org.apache.isis.core.config.unittestsupport.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.core.unittestsupport.config.IsisConfigurationLegacy;
+import org.apache.isis.core.config.unittestsupport.IsisConfigurationLegacy;
 
 import lombok.val;
 
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/internal/_Config_Instance.java b/core/config/src/test/java/org/apache/isis/core/config/unittestsupport/internal/_Config_Instance.java
similarity index 97%
rename from core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/internal/_Config_Instance.java
rename to core/config/src/test/java/org/apache/isis/core/config/unittestsupport/internal/_Config_Instance.java
index 75edf17..b80d80e 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/internal/_Config_Instance.java
+++ b/core/config/src/test/java/org/apache/isis/core/config/unittestsupport/internal/_Config_Instance.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.core.unittestsupport.config.internal;
+package org.apache.isis.core.config.unittestsupport.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.core.unittestsupport.config.IsisConfigurationLegacy;
+import org.apache.isis.core.config.unittestsupport.IsisConfigurationLegacy;
 
 import static org.apache.isis.core.commons.internal.base._With.computeIfAbsent;
 
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/internal/_Config_LifecycleResource.java b/core/config/src/test/java/org/apache/isis/core/config/unittestsupport/internal/_Config_LifecycleResource.java
similarity index 96%
rename from core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/internal/_Config_LifecycleResource.java
rename to core/config/src/test/java/org/apache/isis/core/config/unittestsupport/internal/_Config_LifecycleResource.java
index 648c83a..5142e0c 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/internal/_Config_LifecycleResource.java
+++ b/core/config/src/test/java/org/apache/isis/core/config/unittestsupport/internal/_Config_LifecycleResource.java
@@ -16,13 +16,13 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.core.unittestsupport.config.internal;
+package org.apache.isis.core.config.unittestsupport.internal;
 
 import java.util.Map;
 import java.util.Optional;
 
 import org.apache.isis.core.commons.internal.base._Lazy;
-import org.apache.isis.core.unittestsupport.config.IsisConfigurationLegacy;
+import org.apache.isis.core.config.unittestsupport.IsisConfigurationLegacy;
 
 import static org.apache.isis.core.commons.internal.base._With.requires;
 
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/internal/_Config_Parsers.java b/core/config/src/test/java/org/apache/isis/core/config/unittestsupport/internal/_Config_Parsers.java
similarity index 98%
rename from core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/internal/_Config_Parsers.java
rename to core/config/src/test/java/org/apache/isis/core/config/unittestsupport/internal/_Config_Parsers.java
index 8b16995..6bef0a1 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/internal/_Config_Parsers.java
+++ b/core/config/src/test/java/org/apache/isis/core/config/unittestsupport/internal/_Config_Parsers.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.core.unittestsupport.config.internal;
+package org.apache.isis.core.config.unittestsupport.internal;
 
 import java.awt.Color;
 import java.awt.Font;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/internal/_Config_trim.java b/core/config/src/test/java/org/apache/isis/core/config/unittestsupport/internal/_Config_trim.java
similarity index 95%
rename from core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/internal/_Config_trim.java
rename to core/config/src/test/java/org/apache/isis/core/config/unittestsupport/internal/_Config_trim.java
index 6fdf7e1..aa19617 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/internal/_Config_trim.java
+++ b/core/config/src/test/java/org/apache/isis/core/config/unittestsupport/internal/_Config_trim.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.core.unittestsupport.config.internal;
+package org.apache.isis.core.config.unittestsupport.internal;
 
 import java.util.Map;
 
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_configTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_configTest.java
index ac12b31..73c6ee8 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_configTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_configTest.java
@@ -26,7 +26,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import org.apache.isis.core.metamodel.context.MetaModelContext;
 import org.apache.isis.core.unittestsupport.config.IsisConfigurationLegacy;
-import org.apache.isis.core.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config._Config;
 
 import lombok.val;
 
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_forTesting.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_forTesting.java
index 7f5e7aa..cab5e78 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_forTesting.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_forTesting.java
@@ -52,7 +52,7 @@ import org.apache.isis.core.security.authentication.AuthenticationSessionProvide
 import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
 import org.apache.isis.core.security.authorization.manager.AuthorizationManager;
 import org.apache.isis.core.unittestsupport.config.IsisConfigurationLegacy;
-import org.apache.isis.core.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config._Config;
 
 import lombok.Builder;
 import lombok.Getter;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java
index c85f1f5..d96a1ee 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java
@@ -41,7 +41,7 @@ import org.apache.isis.core.metamodel.progmodel.ProgrammingModelAbstract;
 import org.apache.isis.core.metamodel.progmodel.ProgrammingModelInitFilterDefault;
 import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorAbstract;
 import org.apache.isis.core.metamodel.specloader.validator.ValidationFailures;
-import org.apache.isis.core.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config._Config;
 import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
 
 import lombok.val;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/defaults/DefaultedFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/defaults/DefaultedFacetFactoryTest.java
index 7fea461..0359702 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/defaults/DefaultedFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/defaults/DefaultedFacetFactoryTest.java
@@ -24,7 +24,7 @@ import org.apache.isis.applib.annotation.Defaulted;
 import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
 import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessClassContext;
 import org.apache.isis.core.metamodel.facets.object.defaults.annotcfg.DefaultedFacetAnnotationElseConfigurationFactory;
-import org.apache.isis.core.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config._Config;
 
 public class DefaultedFacetFactoryTest extends AbstractFacetFactoryTest {
 
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
index 7e0ebdd..b7b63bd 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
@@ -61,7 +61,7 @@ import org.apache.isis.core.metamodel.facets.object.publishedobject.PublishedObj
 import org.apache.isis.core.metamodel.facets.object.viewmodel.ViewModelFacet;
 import org.apache.isis.core.metamodel.facets.objectvalue.choices.ChoicesFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecId;
-import org.apache.isis.core.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config._Config;
 
 import lombok.val;
 
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFactoryTest.java
index fea2797..ff7aa04 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFactoryTest.java
@@ -47,7 +47,7 @@ import org.apache.isis.core.metamodel.facets.members.cssclassfa.CssClassFaFacet;
 import org.apache.isis.core.metamodel.facets.members.cssclassfa.CssClassFaPosition;
 import org.apache.isis.core.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacet;
 import org.apache.isis.core.metamodel.facets.object.plural.PluralFacet;
-import org.apache.isis.core.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config._Config;
 
 public class DomainObjectLayoutFactoryTest extends AbstractFacetFactoryJUnit4TestCase {
 
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacetAnnotationOrConfigurationFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacetAnnotationOrConfigurationFactoryTest.java
index b9d0fa2..776f10d 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacetAnnotationOrConfigurationFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacetAnnotationOrConfigurationFactoryTest.java
@@ -35,7 +35,7 @@ import org.apache.isis.core.metamodel.facets.object.value.annotcfg.ValueFacetAnn
 import org.apache.isis.core.metamodel.facets.object.value.annotcfg.ValueFacetAnnotationOrConfigurationFactory;
 import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueSemanticsProviderUtil;
 import org.apache.isis.core.metamodel.facets.objectvalue.typicallen.TypicalLengthFacet;
-import org.apache.isis.core.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config._Config;
 
 public class ValueFacetAnnotationOrConfigurationFactoryTest extends AbstractFacetFactoryTest {
 
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
index f4821dc..cdfe4af 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
@@ -76,7 +76,7 @@ import org.apache.isis.core.metamodel.facets.properties.update.modify.PropertySe
 import org.apache.isis.core.metamodel.spec.ManagedObject;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.core.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config._Config;
 
 import lombok.val;
 
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigDecimalValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigDecimalValueSemanticsProviderTest.java
index 9f6d7fa..20dc05e 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigDecimalValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigDecimalValueSemanticsProviderTest.java
@@ -32,7 +32,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.object.parseable.TextEntryParseException;
-import org.apache.isis.core.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config._Config;
 
 public class BigDecimalValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
 
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigIntValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigIntValueSemanticsProviderTest.java
index ab68e5e..75eaf05 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigIntValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigIntValueSemanticsProviderTest.java
@@ -32,7 +32,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.object.parseable.TextEntryParseException;
-import org.apache.isis.core.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config._Config;
 
 public class BigIntValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
 
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ByteValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ByteValueSemanticsProviderTest.java
index 046dd4c..41ab4b0 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ByteValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ByteValueSemanticsProviderTest.java
@@ -31,7 +31,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
 import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
 import org.apache.isis.core.metamodel.facets.value.bytes.ByteValueSemanticsProviderAbstract;
 import org.apache.isis.core.metamodel.facets.value.bytes.ByteWrapperValueSemanticsProvider;
-import org.apache.isis.core.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config._Config;
 
 public class ByteValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
 
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/DoubleValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/DoubleValueSemanticsProviderTest.java
index aeefa19..2faebe9 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/DoubleValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/DoubleValueSemanticsProviderTest.java
@@ -30,7 +30,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
 import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
 import org.apache.isis.core.metamodel.facets.value.doubles.DoubleWrapperValueSemanticsProvider;
-import org.apache.isis.core.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config._Config;
 
 public class DoubleValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
 
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/FloatValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/FloatValueSemanticsProviderTest.java
index d6f669c..728c347 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/FloatValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/FloatValueSemanticsProviderTest.java
@@ -31,7 +31,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
 import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
 import org.apache.isis.core.metamodel.facets.value.floats.FloatValueSemanticsProviderAbstract;
 import org.apache.isis.core.metamodel.facets.value.floats.FloatWrapperValueSemanticsProvider;
-import org.apache.isis.core.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config._Config;
 
 public class FloatValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
 
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/IntValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/IntValueSemanticsProviderTest.java
index 552f950..76ff5b4 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/IntValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/IntValueSemanticsProviderTest.java
@@ -31,7 +31,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
 import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
 import org.apache.isis.core.metamodel.facets.value.integer.IntValueSemanticsProviderAbstract;
 import org.apache.isis.core.metamodel.facets.value.integer.IntWrapperValueSemanticsProvider;
-import org.apache.isis.core.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config._Config;
 
 public class IntValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
 
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlDateValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlDateValueSemanticsProviderTest.java
index c2c1fa9..c667fbf 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlDateValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlDateValueSemanticsProviderTest.java
@@ -36,7 +36,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
 import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
 import org.apache.isis.core.metamodel.facets.value.datesql.JavaSqlDateValueSemanticsProvider;
-import org.apache.isis.core.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config._Config;
 
 public class JavaSqlDateValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
 
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlTimeValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlTimeValueSemanticsProviderTest.java
index e55359b..b079f17 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlTimeValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlTimeValueSemanticsProviderTest.java
@@ -33,7 +33,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.timesql.JavaSqlTimeValueSemanticsProvider;
-import org.apache.isis.core.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config._Config;
 
 public class JavaSqlTimeValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
 
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaUtilDateValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaUtilDateValueSemanticsProviderTest.java
index 1b71aaf..79dc56b 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaUtilDateValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaUtilDateValueSemanticsProviderTest.java
@@ -35,7 +35,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
 import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
 import org.apache.isis.core.metamodel.facets.value.dateutil.JavaUtilDateValueSemanticsProvider;
-import org.apache.isis.core.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config._Config;
 
 public class JavaUtilDateValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
 
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/LongValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/LongValueSemanticsProviderTest.java
index e248f7d..26332d0 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/LongValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/LongValueSemanticsProviderTest.java
@@ -31,7 +31,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
 import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
 import org.apache.isis.core.metamodel.facets.value.longs.LongValueSemanticsProviderAbstract;
 import org.apache.isis.core.metamodel.facets.value.longs.LongWrapperValueSemanticsProvider;
-import org.apache.isis.core.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config._Config;
 
 public class LongValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
 
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ShortValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ShortValueSemanticsProviderTest.java
index 7962e7d..2a1cc5d 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ShortValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ShortValueSemanticsProviderTest.java
@@ -31,7 +31,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
 import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
 import org.apache.isis.core.metamodel.facets.value.shortint.ShortValueSemanticsProviderAbstract;
 import org.apache.isis.core.metamodel.facets.value.shortint.ShortWrapperValueSemanticsProvider;
-import org.apache.isis.core.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config._Config;
 
 public class ShortValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
 
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
index 069873f..fb5d10a 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
@@ -46,7 +46,7 @@ import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet;
 import org.apache.isis.core.metamodel.facets.object.parseable.parser.ParseableFacetUsingParser;
 import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueSemanticsProviderAndFacetAbstract;
 import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
-import org.apache.isis.core.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config._Config;
 import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
 import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
 
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProviderTest.java
index e2a4186..f88b233 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProviderTest.java
@@ -32,7 +32,7 @@ import static org.junit.Assert.assertThat;
 import org.apache.isis.applib.services.inject.ServiceInjector;
 import org.apache.isis.core.metamodel.MetaModelContext_forTesting;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config._Config;
 import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
 
 public class JodaLocalDateTimeValueSemanticsProviderTest {
diff --git a/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
index 3ddcfae..df7def1 100644
--- a/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
+++ b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
@@ -72,7 +72,7 @@ import org.apache.isis.core.runtimeservices.wrapper.dom.employees.EmployeeReposi
 import org.apache.isis.core.runtimeservices.wrapper.dom.employees.EmployeeRepositoryImpl;
 import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
 import org.apache.isis.core.security.authentication.standard.SimpleSession;
-import org.apache.isis.core.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config._Config;
 import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
 import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
 import org.apache.isis.schema.cmd.v2.CommandDto;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/AbstractApplyToAllContractTest.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/AbstractApplyToAllContractTest.java
index bfbe7cd..40edf72 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/AbstractApplyToAllContractTest.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/AbstractApplyToAllContractTest.java
@@ -34,6 +34,10 @@ import org.apache.isis.core.unittestsupport.utils.IndentPrinter;
 /**
  * Provides some basic infrastructure to iterate over all entity types and
  * apply some contract test.
+ *
+ * <p>
+ *     Used by domain apps only.
+ * </p>
  */
 public abstract class AbstractApplyToAllContractTest {
 
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/bidir/BidirectionalRelationshipContractTestAbstract.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/bidir/BidirectionalRelationshipContractTestAbstract.java
index 31123c8..7f9e556 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/bidir/BidirectionalRelationshipContractTestAbstract.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/bidir/BidirectionalRelationshipContractTestAbstract.java
@@ -47,6 +47,11 @@ import static org.apache.isis.core.commons.internal.reflection._Reflect.withMeth
 import static org.apache.isis.core.commons.internal.reflection._Reflect.withName;
 import static org.apache.isis.core.unittestsupport.utils.ReflectUtils.withParametersAssignableFrom;
 
+/**
+ * <p>
+ *     Used by domain apps only.
+ * </p>
+ */
 public abstract class BidirectionalRelationshipContractTestAbstract extends AbstractApplyToAllContractTest implements Instantiators {
 
     private final InstantiatorMap instantiatorMap;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/comparable/ComparableContractTest_compareTo.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/comparable/ComparableContractTest_compareTo.java
index f948a39..d415281 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/comparable/ComparableContractTest_compareTo.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/comparable/ComparableContractTest_compareTo.java
@@ -23,6 +23,13 @@ import java.util.List;
 
 import org.junit.Test;
 
+/**
+ * <p>
+ *     Used by core and domain apps.
+ * </p>
+ *
+ * @param <T>
+ */
 public abstract class ComparableContractTest_compareTo<T extends Comparable<T>> {
 
     /**
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/files/Files.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/files/Files.java
index a71376a..b04cf82 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/files/Files.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/files/Files.java
@@ -22,6 +22,11 @@ import java.io.File;
 import java.io.FileFilter;
 import java.io.FilenameFilter;
 
+/**
+ * <p>
+ *     Used by domain apps only.
+ * </p>
+ */
 public final class Files {
 
     Files() {
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jaxb/JaxbMatchers.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jaxb/JaxbMatchers.java
index e711fc0..d566261 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jaxb/JaxbMatchers.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jaxb/JaxbMatchers.java
@@ -40,7 +40,9 @@ import org.apache.isis.core.commons.internal.base._Casts;
 import org.apache.isis.core.commons.internal.resources._Resources;
 
 /**
- * For example usage, see <a href="https://github.com/isisaddons/isis-module-publishmq">Isis addons' publishmq module</a> (non-ASF)
+ * <p>
+ *     Used by domain apps only.
+ * </p>
  */
 public class JaxbMatchers {
 
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2.java
index 38f3fb8..010bb6c 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2.java
@@ -64,6 +64,10 @@ import junit.framework.AssertionFailedError;
  * The class also adds some convenience methods, and uses a factory method to
  * make it explicit whether the context can mock only interfaces or interfaces
  * and classes.
+ *
+ * <p>
+ *     Used by domain apps only.
+ * </p>
  */
 public class JUnitRuleMockery2 extends JUnit4Mockery implements MethodRule {
 
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/soap/SoapEndpointPublishingRule.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/soap/SoapEndpointPublishingRule.java
index f9bedd2..c99305c 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/soap/SoapEndpointPublishingRule.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/soap/SoapEndpointPublishingRule.java
@@ -30,7 +30,9 @@ import static org.apache.isis.core.commons.internal.base._NullSafe.stream;
 
 
 /**
- * For example usage, see <a href="https://github.com/isisaddons/isis-module-publishmq">Isis addons' publishmq module</a> (non-ASF)
+ * <p>
+ *     Used by domain apps only.
+ * </p>
  */
 public class SoapEndpointPublishingRule implements TestRule {
 
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/sortedsets/SortedSetsContractTestAbstract.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/sortedsets/SortedSetsContractTestAbstract.java
index f1b8545..5ad38f4 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/sortedsets/SortedSetsContractTestAbstract.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/sortedsets/SortedSetsContractTestAbstract.java
@@ -32,6 +32,11 @@ 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;
 
+/**
+ * <p>
+ *     Used by domain apps only.
+ * </p>
+ */
 public abstract class SortedSetsContractTestAbstract extends AbstractApplyToAllContractTest {
 
     protected SortedSetsContractTestAbstract(
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/streams/NullPrintStream.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/streams/NullPrintStream.java
index 41be8c2..c72beb7 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/streams/NullPrintStream.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/streams/NullPrintStream.java
@@ -24,6 +24,11 @@ import java.io.OutputStream;
 import java.io.PrintStream;
 import java.util.concurrent.Callable;
 
+/**
+ * <p>
+ *     Used by domain apps only.
+ * </p>
+ */
 public class NullPrintStream extends PrintStream {
     public NullPrintStream() {
         super(new NullByteArrayOutputStream());
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/utils/CollectUtils.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/utils/CollectUtils.java
index 5b84644..5e4fe00 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/utils/CollectUtils.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/utils/CollectUtils.java
@@ -20,6 +20,11 @@ package org.apache.isis.core.unittestsupport.utils;
 
 import java.util.Set;
 
+/**
+ * <p>
+ *     Used by domain apps only.
+ * </p>
+ */
 public class CollectUtils {
 
     public static <T> T firstIn(final Set<T> set) {
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/utils/IndentPrinter.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/utils/IndentPrinter.java
index 24b0aff..f82eedb 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/utils/IndentPrinter.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/utils/IndentPrinter.java
@@ -24,6 +24,10 @@ import java.io.Writer;
 
 /**
  * Adapted from <tt>groovy.util.IndentPrinter</tt> (published under ASL 2.0).
+ *
+ * <p>
+ *     Used by domain apps only.
+ * </p>
  */
 public class IndentPrinter {
 
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/utils/ReflectUtils.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/utils/ReflectUtils.java
index b4cc3ab..5ddc9d1 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/utils/ReflectUtils.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/utils/ReflectUtils.java
@@ -27,6 +27,11 @@ import javax.jdo.annotations.Persistent;
 
 import org.apache.isis.core.commons.internal.base._Strings;
 
+/**
+ * <p>
+ *     Used by domain apps only.
+ * </p>
+ */
 public class ReflectUtils {
 
     public static <T> Predicate<Field> withTypeAssignableFrom(final Class<T> type) {
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/utils/StringUtils.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/utils/StringUtils.java
index 97f7b1d..3d5ef74 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/utils/StringUtils.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/utils/StringUtils.java
@@ -20,6 +20,11 @@ package org.apache.isis.core.unittestsupport.utils;
 
 import java.lang.reflect.Field;
 
+/**
+ * <p>
+ *     Used by domain apps only.
+ * </p>
+ */
 public class StringUtils {
 
     public static String capitalize(final String str) {
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/value/ValueTypeContractTestAbstract.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/value/ValueTypeContractTestAbstract.java
index 4734fcc..7871005 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/value/ValueTypeContractTestAbstract.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/value/ValueTypeContractTestAbstract.java
@@ -35,6 +35,10 @@ import static org.junit.Assume.assumeThat;
  * Contract test for value types ({@link #equals(Object) equals} and
  * {@link #hashCode() hashCode}), and also {@link Comparable#compareTo(Object) compareTo} for
  * any value types that also are {@link Comparable}
+ *
+ * <p>
+ *     Used by core and domain apps only.
+ * </p>
  */
 public abstract class ValueTypeContractTestAbstract<T> {
 
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/BidirectionalRelationshipContractTestAll.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/bidir/BidirectionalRelationshipContractTestAll.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/BidirectionalRelationshipContractTestAll.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/bidir/BidirectionalRelationshipContractTestAll.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/ChildDomainObject.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/bidir/ChildDomainObject.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/ChildDomainObject.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/bidir/ChildDomainObject.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/InstantiatorForChildDomainObject.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/bidir/InstantiatorForChildDomainObject.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/InstantiatorForChildDomainObject.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/bidir/InstantiatorForChildDomainObject.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/ParentDomainObject.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/bidir/ParentDomainObject.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/ParentDomainObject.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/bidir/ParentDomainObject.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/PeerDomainObject.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/bidir/PeerDomainObject.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/PeerDomainObject.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/bidir/PeerDomainObject.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/PeerDomainObjectForTesting.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/bidir/PeerDomainObjectForTesting.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/PeerDomainObjectForTesting.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/bidir/PeerDomainObjectForTesting.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/comparable/CategorizedDomainObject.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/comparable/CategorizedDomainObject.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/comparable/CategorizedDomainObject.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/comparable/CategorizedDomainObject.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/comparable/CategorizedDomainObjectComparableContractTest_compareTo.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/comparable/CategorizedDomainObjectComparableContractTest_compareTo.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/comparable/CategorizedDomainObjectComparableContractTest_compareTo.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/comparable/CategorizedDomainObjectComparableContractTest_compareTo.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/files/FilesTest_deleteFiles.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/files/FilesTest_deleteFiles.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/files/FilesTest_deleteFiles.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/files/FilesTest_deleteFiles.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/CollaboratingUsingConstructorInjection.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/CollaboratingUsingConstructorInjection.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/CollaboratingUsingConstructorInjection.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/CollaboratingUsingConstructorInjection.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/CollaboratingUsingSetterInjection.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/CollaboratingUsingSetterInjection.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/CollaboratingUsingSetterInjection.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/CollaboratingUsingSetterInjection.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/Collaborator.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/Collaborator.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/Collaborator.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/Collaborator.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/ImposteriserTestUsingCodegenPlugin.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/ImposteriserTestUsingCodegenPlugin.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/ImposteriserTestUsingCodegenPlugin.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/ImposteriserTestUsingCodegenPlugin.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/IsisActionsTest_returnNewTransientInstance.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/IsisActionsTest_returnNewTransientInstance.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/IsisActionsTest_returnNewTransientInstance.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/IsisActionsTest_returnNewTransientInstance.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JMockActionsTest_returnArgument.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JMockActionsTest_returnArgument.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JMockActionsTest_returnArgument.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JMockActionsTest_returnArgument.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JMockActionsTest_returnEach.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JMockActionsTest_returnEach.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JMockActionsTest_returnEach.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JMockActionsTest_returnEach.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_constructorInjection_happyCase.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_constructorInjection_happyCase.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_constructorInjection_happyCase.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_constructorInjection_happyCase.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_noClassUnderTest.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_noClassUnderTest.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_noClassUnderTest.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_noClassUnderTest.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_twoClassesUnderTest.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_twoClassesUnderTest.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_twoClassesUnderTest.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_twoClassesUnderTest.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_setterInjection_happyCase.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_setterInjection_happyCase.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_setterInjection_happyCase.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_setterInjection_happyCase.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithAllowing.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithAllowing.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithAllowing.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithAllowing.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithChecking.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithChecking.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithChecking.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithChecking.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithIgnoring.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithIgnoring.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithIgnoring.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithIgnoring.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_happyCase.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_happyCase.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_happyCase.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_happyCase.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_sadCase.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_sadCase.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_sadCase.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_sadCase.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_happyCase.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_happyCase.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_happyCase.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_happyCase.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_sadCase.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_sadCase.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_sadCase.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_sadCase.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/sortedsets/SomeDomainObject.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/sortedsets/SomeDomainObject.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/sortedsets/SomeDomainObject.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/sortedsets/SomeDomainObject.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/sortedsets/SortedSetsContractTestAll.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/sortedsets/SortedSetsContractTestAll.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/sortedsets/SortedSetsContractTestAll.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/sortedsets/SortedSetsContractTestAll.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/value/ValueTypeContractTestAbstract_BigIntegerTest.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/value/ValueTypeContractTestAbstract_BigIntegerTest.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/value/ValueTypeContractTestAbstract_BigIntegerTest.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/value/ValueTypeContractTestAbstract_BigIntegerTest.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/value/ValueTypeContractTestAbstract_ColorTest.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/value/ValueTypeContractTestAbstract_ColorTest.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/value/ValueTypeContractTestAbstract_ColorTest.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/value/ValueTypeContractTestAbstract_ColorTest.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/value/ValueTypeContractTestAbstract_StringTest.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/value/ValueTypeContractTestAbstract_StringTest.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/value/ValueTypeContractTestAbstract_StringTest.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/value/ValueTypeContractTestAbstract_StringTest.java
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 e3b93f3..714f83a 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.core.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config._Config;
 
 public class PercentageValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
     private PercentageValueSemanticsProvider adapter;