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 2021/06/22 09:19:26 UTC
[isis] branch ISIS-2756 updated: ISIS-2756: reorgs the classes in
unittestsupport's applib
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2756
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/ISIS-2756 by this push:
new dcefe9f ISIS-2756: reorgs the classes in unittestsupport's applib
dcefe9f is described below
commit dcefe9f576750558b91d10b6d5753b9aa60dbdb7
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Jun 22 10:19:11 2021 +0100
ISIS-2756: reorgs the classes in unittestsupport's applib
---
.../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 | 2 +-
.../applib/services/FakeDataServiceTest.java | 2 +-
.../applib/{dom => }/assertions/Asserting.java | 2 +-
.../AbstractApplyToAllContractTest.java | 4 +-
...irectionalRelationshipContractTestAbstract.java | 24 ++--
.../applib/{core => dom}/bidir/Child.java | 2 +-
.../applib/{core => dom}/bidir/Instantiator.java | 2 +-
.../{core => dom}/bidir/InstantiatorMap.java | 2 +-
.../{core => dom}/bidir/InstantiatorSimple.java | 2 +-
.../applib/{core => dom}/bidir/Instantiators.java | 2 +-
.../applib/{core => dom}/bidir/Parent.java | 2 +-
.../ComparableContractTest_compareTo.java | 2 +-
.../comparable/ComparableContractTester.java | 2 +-
.../pojo}/AbstractBeanPropertiesTest.java | 4 +-
.../pojo}/FixtureDatumFactoriesForAnyPojo.java | 2 +-
.../pojo}/FixtureDatumFactoriesForApplib.java | 2 +-
.../pojo}/FixtureDatumFactoriesForJoda.java | 2 +-
.../pojo}/FixtureDatumFactoriesForTime.java | 2 +-
.../applib/{bean => dom/pojo}/PojoTester.java | 2 +-
.../sortedsets/SortedSetsContractTestAbstract.java | 4 +-
.../value/ValueTypeContractTestAbstract.java | 2 +-
.../unittestsupport/applib/dom/valuetypes/VT.java | 148 ---------------------
.../applib/{core/utils => io}/IndentPrinter.java | 2 +-
.../{core/streams => io}/NullPrintStream.java | 2 +-
.../jmocking/ImposteriserUsingCodegenPlugin.java | 2 +-
.../applib/{core => }/jmocking/Imposterisers.java | 2 +-
.../{core => }/jmocking/InjectIntoJMockAction.java | 2 +-
.../applib/{core => }/jmocking/IsisActions.java | 2 +-
.../applib/{core => }/jmocking/JMockActions.java | 2 +-
.../{core => }/jmocking/JUnitRuleMockery2.java | 2 +-
.../applib/{core => }/jmocking/MyMockomatic.java | 2 +-
.../{core => }/jmocking/PostponedAction.java | 2 +-
.../applib/{dom => }/matchers/IsisMatchers.java | 2 +-
.../{core/jaxb => matchers}/JaxbMatchers.java | 2 +-
.../applib/{core => }/soap/SoapEndpoint.java | 2 +-
.../soap/SoapEndpointPublishingRule.java | 16 +--
.../applib/{core => }/soap/SoapEndpointSpec.java | 2 +-
.../{core => }/soap/SoapPublishedEndpoints.java | 2 +-
.../applib/{core/utils => util}/CollectUtils.java | 2 +-
.../{core/files/Files.java => util/FileUtils.java} | 4 +-
.../ReflectUtils.java => util/InjectUtils.java} | 4 +-
.../applib/{dom/reflect => util}/ReflectUtils.java | 6 +-
.../applib/{core/utils => util}/StringUtils.java | 2 +-
.../applib/bean/PojoTesterTest_interference.java | 2 +
.../BidirectionalRelationshipContractTestAll.java | 5 +-
.../bidir/InstantiatorForChildDomainObject.java | 2 +
...mainObjectComparableContractTest_compareTo.java | 2 +
...s_Test.java => Files_deleteFileUtils_Test.java} | 13 +-
.../ImposteriserTestUsingCodegenPlugin_Test.java | 1 +
...IsisActionsTest_returnNewTransientInstance.java | 3 +
.../jmocking/JMockActionsTest_returnArgument.java | 4 +-
.../core/jmocking/JMockActionsTest_returnEach.java | 4 +-
.../core/jmocking/JUnitRuleMockery2Test.java | 3 +-
..._autoWiring_constructorInjection_happyCase.java | 5 +-
...y2Test_autoWiring_sadCase_noClassUnderTest.java | 3 +-
...est_autoWiring_sadCase_twoClassesUnderTest.java | 5 +-
...2Test_autoWiring_setterInjection_happyCase.java | 5 +-
...RuleMockery2Test_mockAnnotatedWithAllowing.java | 7 +-
...RuleMockery2Test_mockAnnotatedWithIgnoring.java | 7 +-
...kery2Test_mockAnnotatedWithNever_happyCase.java | 7 +-
...ockery2Test_mockAnnotatedWithNever_sadCase.java | 7 +-
...ockery2Test_mockAnnotatedWithOne_happyCase.java | 7 +-
...eMockery2Test_mockAnnotatedWithOne_sadCase.java | 7 +-
.../core/sortedsets/SortedSetsContractTestAll.java | 2 +
...lueTypeContractTestAbstract_BigIntegerTest.java | 2 +
.../ValueTypeContractTestAbstract_ColorTest.java | 2 +
.../ValueTypeContractTestAbstract_StringTest.java | 2 +
.../adoc/modules/ROOT/pages/ro-spec.adoc | 3 +-
79 files changed, 151 insertions(+), 263 deletions(-)
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 dce5b78..527e849 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
@@ -24,7 +24,7 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.testing.unittestsupport.applib.core.comparable.ComparableContractTester;
+import org.apache.isis.testing.unittestsupport.applib.dom.comparable.ComparableContractTester;
public class ComparableByCodeContractTester<T extends WithCodeComparable<T>> {
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 eb5d6a1..07e1e20 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
@@ -24,7 +24,7 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.testing.unittestsupport.applib.core.comparable.ComparableContractTester;
+import org.apache.isis.testing.unittestsupport.applib.dom.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 04c571c..eae45f4 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
@@ -24,7 +24,7 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.testing.unittestsupport.applib.core.comparable.ComparableContractTester;
+import org.apache.isis.testing.unittestsupport.applib.dom.comparable.ComparableContractTester;
public class ComparableByNameContractTester<T extends WithNameComparable<T>> {
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 9bf22d2..b04a7d0 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
@@ -24,7 +24,7 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.testing.unittestsupport.applib.core.comparable.ComparableContractTester;
+import org.apache.isis.testing.unittestsupport.applib.dom.comparable.ComparableContractTester;
public class ComparableByReferenceContractTester<T extends WithReferenceComparable<T>> {
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 570f759..6e1c63c 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
@@ -24,7 +24,7 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.testing.unittestsupport.applib.core.comparable.ComparableContractTester;
+import org.apache.isis.testing.unittestsupport.applib.dom.comparable.ComparableContractTester;
public class ComparableByTitleContractTester<T extends WithTitleComparable<T>> {
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 805b0ec..4b01531 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
@@ -18,7 +18,7 @@
*/
package org.apache.isis.subdomains.base.applib.with;
-import org.apache.isis.testing.unittestsupport.applib.core.bidir.Instantiator;
+import org.apache.isis.testing.unittestsupport.applib.dom.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 eb1bd09..98e7aba 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
@@ -18,7 +18,7 @@
*/
package org.apache.isis.subdomains.base.applib.with;
-import org.apache.isis.testing.unittestsupport.applib.core.bidir.Instantiator;
+import org.apache.isis.testing.unittestsupport.applib.dom.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 fdbeae7..1e62d3d 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
@@ -18,7 +18,7 @@
*/
package org.apache.isis.subdomains.base.applib.with;
-import org.apache.isis.testing.unittestsupport.applib.core.bidir.Instantiator;
+import org.apache.isis.testing.unittestsupport.applib.dom.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 6e3d65d..02ffbbc 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
@@ -18,7 +18,7 @@
*/
package org.apache.isis.subdomains.base.applib.with;
-import org.apache.isis.testing.unittestsupport.applib.core.bidir.Instantiator;
+import org.apache.isis.testing.unittestsupport.applib.dom.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 5372461..a7de93f 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
@@ -20,7 +20,7 @@ package org.apache.isis.subdomains.base.applib.with;
import org.joda.time.LocalDate;
-import org.apache.isis.testing.unittestsupport.applib.core.bidir.Instantiator;
+import org.apache.isis.testing.unittestsupport.applib.dom.bidir.Instantiator;
public class InstantiatorForWithStartDate implements Instantiator {
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 f0f1ee1..1905529 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
@@ -28,7 +28,7 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-import org.apache.isis.testing.unittestsupport.applib.core.jmocking.JUnitRuleMockery2;
+import org.apache.isis.testing.unittestsupport.applib.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 5bc5374..30b389e 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
@@ -33,7 +33,7 @@ import org.junit.rules.ExpectedException;
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.testing.unittestsupport.applib.core.jmocking.JUnitRuleMockery2;
+import org.apache.isis.testing.unittestsupport.applib.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 c55e217..8fcb5ab 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
@@ -47,7 +47,7 @@ import org.apache.isis.applib.value.Clob;
import org.apache.isis.applib.value.Password;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.collections._Sets;
-import org.apache.isis.testing.unittestsupport.applib.core.jmocking.JUnitRuleMockery2;
+import org.apache.isis.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2;
public class FakeDataServiceTest {
diff --git a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/assertions/Asserting.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/assertions/Asserting.java
similarity index 94%
rename from testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/assertions/Asserting.java
rename to testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/assertions/Asserting.java
index 9fc05d7..65a5a26 100644
--- a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/assertions/Asserting.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/assertions/Asserting.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.testing.unittestsupport.applib.dom.assertions;
+package org.apache.isis.testing.unittestsupport.applib.assertions;
/**
* @since 2.0 {@index}
diff --git a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/AbstractApplyToAllContractTest.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/AbstractApplyToAllContractTest.java
similarity index 95%
rename from testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/AbstractApplyToAllContractTest.java
rename to testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/AbstractApplyToAllContractTest.java
index 3d6745f..df76493 100644
--- a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/AbstractApplyToAllContractTest.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/AbstractApplyToAllContractTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.testing.unittestsupport.applib.core;
+package org.apache.isis.testing.unittestsupport.applib.dom;
import java.io.PrintStream;
import java.io.PrintWriter;
@@ -29,7 +29,7 @@ import java.util.TreeSet;
import org.junit.Test;
import org.apache.isis.commons.internal._Constants;
-import org.apache.isis.testing.unittestsupport.applib.core.utils.IndentPrinter;
+import org.apache.isis.testing.unittestsupport.applib.io.IndentPrinter;
/**
* Provides some basic infrastructure to iterate over all entity types and
diff --git a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/bidir/BidirectionalRelationshipContractTestAbstract.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/bidir/BidirectionalRelationshipContractTestAbstract.java
similarity index 96%
rename from testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/bidir/BidirectionalRelationshipContractTestAbstract.java
rename to testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/bidir/BidirectionalRelationshipContractTestAbstract.java
index 556cc53..f0269b6 100644
--- a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/bidir/BidirectionalRelationshipContractTestAbstract.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/bidir/BidirectionalRelationshipContractTestAbstract.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.testing.unittestsupport.applib.core.bidir;
+package org.apache.isis.testing.unittestsupport.applib.dom.bidir;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
@@ -37,17 +37,17 @@ import static org.hamcrest.Matchers.greaterThan;
import static org.hamcrest.MatcherAssert.assertThat;
-import org.apache.isis.testing.unittestsupport.applib.core.AbstractApplyToAllContractTest;
-import org.apache.isis.testing.unittestsupport.applib.core.utils.CollectUtils;
-import org.apache.isis.testing.unittestsupport.applib.core.utils.ReflectUtils;
-import org.apache.isis.testing.unittestsupport.applib.core.utils.StringUtils;
+import org.apache.isis.testing.unittestsupport.applib.dom.AbstractApplyToAllContractTest;
+import org.apache.isis.testing.unittestsupport.applib.util.CollectUtils;
+import org.apache.isis.testing.unittestsupport.applib.util.InjectUtils;
+import org.apache.isis.testing.unittestsupport.applib.util.StringUtils;
import static org.apache.isis.commons.internal.collections._Collections.toHashSet;
import static org.apache.isis.commons.internal.reflection._Reflect.streamAllFields;
import static org.apache.isis.commons.internal.reflection._Reflect.streamAllMethods;
import static org.apache.isis.commons.internal.reflection._Reflect.withMethodParametersCount;
import static org.apache.isis.commons.internal.reflection._Reflect.withName;
-import static org.apache.isis.testing.unittestsupport.applib.core.utils.ReflectUtils.withParametersAssignableFrom;
+import static org.apache.isis.testing.unittestsupport.applib.util.InjectUtils.withParametersAssignableFrom;
/**
* @since 2.0 {@index}
@@ -66,7 +66,7 @@ public abstract class BidirectionalRelationshipContractTestAbstract extends Abst
@Override
protected void applyContractTest(Class<?> entityType) {
final Set<Field> mappedByFields = streamAllFields(entityType, true)
- .filter(ReflectUtils.persistentMappedBy)
+ .filter(InjectUtils.persistentMappedBy)
.collect(toHashSet());
for (Field mappedByField : mappedByFields) {
@@ -107,7 +107,7 @@ public abstract class BidirectionalRelationshipContractTestAbstract extends Abst
final Set<Method> addToMethods = streamAllMethods(p.entityType, true)
.filter(withConcreteMethodNamed(addToMethod))
.filter(withMethodParametersCount(1))
- .filter(ReflectUtils.withEntityParameter())
+ .filter(InjectUtils.withEntityParameter())
.collect(toHashSet());
if(addToMethods.size() != 1) {
@@ -122,7 +122,7 @@ public abstract class BidirectionalRelationshipContractTestAbstract extends Abst
final Set<Method> removeFromMethods = streamAllMethods(p.entityType, true)
.filter(withConcreteMethodNamed(removeFromMethod))
.filter(withMethodParametersCount(1))
- .filter(ReflectUtils.withEntityParameter())
+ .filter(InjectUtils.withEntityParameter())
.collect(toHashSet());
if(removeFromMethods.size() != 1) {
@@ -147,7 +147,7 @@ public abstract class BidirectionalRelationshipContractTestAbstract extends Abst
final Set<Method> modifyMethods = streamAllMethods(p.entityType, true)
.filter(withConcreteMethodNamed(modifyMethod))
.filter(withMethodParametersCount(1))
- .filter(ReflectUtils.withEntityParameter())
+ .filter(InjectUtils.withEntityParameter())
.collect(toHashSet());
if(modifyMethods.size() != 1) {
@@ -227,7 +227,7 @@ public abstract class BidirectionalRelationshipContractTestAbstract extends Abst
// mappedBy field
final Set<Field> parentFields = streamAllFields(c.entityType, true)
.filter(withName(p.mappedBy))
- .filter(ReflectUtils.withTypeAssignableFrom(p.entityType))
+ .filter(InjectUtils.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));
@@ -238,7 +238,7 @@ public abstract class BidirectionalRelationshipContractTestAbstract extends Abst
final Set<Method> getterMethods = streamAllMethods(c.entityType, true)
.filter(withConcreteMethodNamed(getterMethod))
.filter(withMethodParametersCount(0))
- .filter(ReflectUtils.withReturnTypeAssignableFrom(p.entityType))
+ .filter(InjectUtils.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/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/bidir/Child.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/bidir/Child.java
similarity index 96%
rename from testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/bidir/Child.java
rename to testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/bidir/Child.java
index 14b7303..58bbe24 100644
--- a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/bidir/Child.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/bidir/Child.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.testing.unittestsupport.applib.core.bidir;
+package org.apache.isis.testing.unittestsupport.applib.dom.bidir;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
diff --git a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/bidir/Instantiator.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/bidir/Instantiator.java
similarity index 94%
rename from testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/bidir/Instantiator.java
rename to testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/bidir/Instantiator.java
index c56e0eb..4d0786a 100644
--- a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/bidir/Instantiator.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/bidir/Instantiator.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.testing.unittestsupport.applib.core.bidir;
+package org.apache.isis.testing.unittestsupport.applib.dom.bidir;
/**
* @since 2.0 {@index}
diff --git a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/bidir/InstantiatorMap.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/bidir/InstantiatorMap.java
similarity index 96%
rename from testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/bidir/InstantiatorMap.java
rename to testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/bidir/InstantiatorMap.java
index 882cb51..641bc9b 100644
--- a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/bidir/InstantiatorMap.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/bidir/InstantiatorMap.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.testing.unittestsupport.applib.core.bidir;
+package org.apache.isis.testing.unittestsupport.applib.dom.bidir;
import java.util.HashMap;
import java.util.Map;
diff --git a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/bidir/InstantiatorSimple.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/bidir/InstantiatorSimple.java
similarity index 94%
rename from testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/bidir/InstantiatorSimple.java
rename to testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/bidir/InstantiatorSimple.java
index f6965e2..a4c710e 100644
--- a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/bidir/InstantiatorSimple.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/bidir/InstantiatorSimple.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.testing.unittestsupport.applib.core.bidir;
+package org.apache.isis.testing.unittestsupport.applib.dom.bidir;
/**
* @since 2.0 {@index}
diff --git a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/bidir/Instantiators.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/bidir/Instantiators.java
similarity index 93%
rename from testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/bidir/Instantiators.java
rename to testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/bidir/Instantiators.java
index 9cee6cb..dfd7d5d 100644
--- a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/bidir/Instantiators.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/bidir/Instantiators.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.testing.unittestsupport.applib.core.bidir;
+package org.apache.isis.testing.unittestsupport.applib.dom.bidir;
/**
* @since 2.0 {@index}
diff --git a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/bidir/Parent.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/bidir/Parent.java
similarity index 97%
rename from testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/bidir/Parent.java
rename to testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/bidir/Parent.java
index 0316d93..0a73a86 100644
--- a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/bidir/Parent.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/bidir/Parent.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.testing.unittestsupport.applib.core.bidir;
+package org.apache.isis.testing.unittestsupport.applib.dom.bidir;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
diff --git a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/comparable/ComparableContractTest_compareTo.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/comparable/ComparableContractTest_compareTo.java
similarity index 95%
rename from testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/comparable/ComparableContractTest_compareTo.java
rename to testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/comparable/ComparableContractTest_compareTo.java
index 0791540..c50be1d 100644
--- a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/comparable/ComparableContractTest_compareTo.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/comparable/ComparableContractTest_compareTo.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.testing.unittestsupport.applib.core.comparable;
+package org.apache.isis.testing.unittestsupport.applib.dom.comparable;
import java.util.Arrays;
import java.util.List;
diff --git a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/comparable/ComparableContractTester.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/comparable/ComparableContractTester.java
similarity index 97%
rename from testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/comparable/ComparableContractTester.java
rename to testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/comparable/ComparableContractTester.java
index 8ba7f12..fd76c66 100644
--- a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/comparable/ComparableContractTester.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/comparable/ComparableContractTester.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.testing.unittestsupport.applib.core.comparable;
+package org.apache.isis.testing.unittestsupport.applib.dom.comparable;
import java.util.List;
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/dom/pojo/AbstractBeanPropertiesTest.java
similarity index 92%
rename from testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/bean/AbstractBeanPropertiesTest.java
rename to testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/pojo/AbstractBeanPropertiesTest.java
index f5c903f..1078d8f 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/dom/pojo/AbstractBeanPropertiesTest.java
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.testing.unittestsupport.applib.bean;
+package org.apache.isis.testing.unittestsupport.applib.dom.pojo;
import org.jmock.auto.Mock;
import org.junit.Rule;
import org.apache.isis.applib.services.repository.RepositoryService;
-import org.apache.isis.testing.unittestsupport.applib.core.jmocking.JUnitRuleMockery2;
+import org.apache.isis.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2;
/**
* @since 2.0 {@index}
diff --git a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/bean/FixtureDatumFactoriesForAnyPojo.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/pojo/FixtureDatumFactoriesForAnyPojo.java
similarity index 95%
rename from testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/bean/FixtureDatumFactoriesForAnyPojo.java
rename to testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/pojo/FixtureDatumFactoriesForAnyPojo.java
index c3648ab..9dd32f8 100644
--- a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/bean/FixtureDatumFactoriesForAnyPojo.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/pojo/FixtureDatumFactoriesForAnyPojo.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.testing.unittestsupport.applib.bean;
+package org.apache.isis.testing.unittestsupport.applib.dom.pojo;
/**
* @since 2.0 {@index}
diff --git a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/bean/FixtureDatumFactoriesForApplib.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/pojo/FixtureDatumFactoriesForApplib.java
similarity index 96%
rename from testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/bean/FixtureDatumFactoriesForApplib.java
rename to testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/pojo/FixtureDatumFactoriesForApplib.java
index 9775c07..1baa856 100644
--- a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/bean/FixtureDatumFactoriesForApplib.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/pojo/FixtureDatumFactoriesForApplib.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.testing.unittestsupport.applib.bean;
+package org.apache.isis.testing.unittestsupport.applib.dom.pojo;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.applib.value.Clob;
diff --git a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/bean/FixtureDatumFactoriesForJoda.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/pojo/FixtureDatumFactoriesForJoda.java
similarity index 96%
rename from testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/bean/FixtureDatumFactoriesForJoda.java
rename to testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/pojo/FixtureDatumFactoriesForJoda.java
index 0f81018..097881f 100644
--- a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/bean/FixtureDatumFactoriesForJoda.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/pojo/FixtureDatumFactoriesForJoda.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.testing.unittestsupport.applib.bean;
+package org.apache.isis.testing.unittestsupport.applib.dom.pojo;
import org.joda.time.DateTime;
import org.joda.time.LocalDate;
diff --git a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/bean/FixtureDatumFactoriesForTime.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/pojo/FixtureDatumFactoriesForTime.java
similarity index 97%
rename from testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/bean/FixtureDatumFactoriesForTime.java
rename to testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/pojo/FixtureDatumFactoriesForTime.java
index c5b269d..92d66c5 100644
--- a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/bean/FixtureDatumFactoriesForTime.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/pojo/FixtureDatumFactoriesForTime.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.testing.unittestsupport.applib.bean;
+package org.apache.isis.testing.unittestsupport.applib.dom.pojo;
import java.time.LocalDate;
import java.time.LocalDateTime;
diff --git a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/bean/PojoTester.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/pojo/PojoTester.java
similarity index 99%
rename from testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/bean/PojoTester.java
rename to testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/pojo/PojoTester.java
index ee13199..7dd9381 100644
--- a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/bean/PojoTester.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/pojo/PojoTester.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.testing.unittestsupport.applib.bean;
+package org.apache.isis.testing.unittestsupport.applib.dom.pojo;
import java.io.File;
import java.lang.reflect.InvocationTargetException;
diff --git a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/sortedsets/SortedSetsContractTestAbstract.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/sortedsets/SortedSetsContractTestAbstract.java
similarity index 94%
rename from testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/sortedsets/SortedSetsContractTestAbstract.java
rename to testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/sortedsets/SortedSetsContractTestAbstract.java
index 67d4790..4c4edf7 100644
--- a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/sortedsets/SortedSetsContractTestAbstract.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/sortedsets/SortedSetsContractTestAbstract.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.testing.unittestsupport.applib.core.sortedsets;
+package org.apache.isis.testing.unittestsupport.applib.dom.sortedsets;
import java.lang.reflect.Field;
import java.util.Collection;
@@ -27,7 +27,7 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import org.apache.isis.commons.internal.reflection._Reflect;
-import org.apache.isis.testing.unittestsupport.applib.core.AbstractApplyToAllContractTest;
+import org.apache.isis.testing.unittestsupport.applib.dom.AbstractApplyToAllContractTest;
import static org.apache.isis.commons.internal.collections._Collections.toHashSet;
import static org.apache.isis.commons.internal.reflection._Reflect.withTypeAssignableTo;
diff --git a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/value/ValueTypeContractTestAbstract.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/value/ValueTypeContractTestAbstract.java
similarity index 98%
rename from testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/value/ValueTypeContractTestAbstract.java
rename to testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/value/ValueTypeContractTestAbstract.java
index 58a4b9c..80f2c6f 100644
--- a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/value/ValueTypeContractTestAbstract.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/value/ValueTypeContractTestAbstract.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.testing.unittestsupport.applib.core.value;
+package org.apache.isis.testing.unittestsupport.applib.dom.value;
import java.util.List;
diff --git a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/valuetypes/VT.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/valuetypes/VT.java
deleted file mode 100644
index a224457..0000000
--- a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/valuetypes/VT.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * 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.testing.unittestsupport.applib.dom.valuetypes;
-
-//import org.incode.module.base.dom.valuetypes.AbstractInterval;
-//import org.incode.module.base.dom.valuetypes.LocalDateInterval;
-
-/**
- * Factory methods for value types
- */
-public final class VT {
-
-// private VT(){}
-//
-// // //////////////////////////////////////
-//
-// public static LocalDateInterval ldi(String intervalStr) {
-// return intervalStr != null? LocalDateInterval.parseString(intervalStr) : null;
-// }
-//
-// public static LocalDateInterval ldi(LocalDate st, LocalDate endDate, AbstractInterval.IntervalEnding intervalEnding) {
-// return new LocalDateInterval(st, endDate, intervalEnding);
-// }
-//
-// public static LocalDateInterval ldix(LocalDate st, LocalDate endDate) {
-// return ldi(st, endDate, AbstractInterval.IntervalEnding.EXCLUDING_END_DATE);
-// }
-//
-// // //////////////////////////////////////
-//
-// /**
-// *
-// * @param dateStr - in form "yyyy-MM-dd"
-// */
-// public static LocalDate ld(String dateStr) {
-// return dateStr != null? LocalDate.parse(dateStr) : null;
-// }
-//
-// public static LocalDate ld(int yyyy, int mm, int dd) {
-// return LocalDate.of(yyyy,mm,dd);
-// }
-//
-// // //////////////////////////////////////
-//
-// public static BigInteger bi(int val) {
-// return BigInteger.valueOf(val);
-// }
-// public static BigInteger bi(Integer val) {
-// return val != null ? bi(val): null;
-// }
-//
-// // //////////////////////////////////////
-//
-// public static BigDecimal bd(String str) {
-// return new BigDecimal(str);
-// }
-//
-// public static BigDecimal bd(double val) {
-// return BigDecimal.valueOf(val);
-// }
-// public static BigDecimal bd(double v, int scale) {
-// return bd(v).setScale(scale);
-// }
-// public static BigDecimal bd(double v, int scale, RoundingMode roundingMode) {
-// return bd(v).setScale(scale, roundingMode);
-// }
-// public static BigDecimal bd2(double v) {
-// return bd(v, 2);
-// }
-// public static BigDecimal bd2hup(double v) {
-// return bd(v,2, RoundingMode.HALF_UP);
-// }
-// public static BigDecimal bd4(double v) {
-// return bd(v,4);
-// }
-//
-//
-// public static BigDecimal bd(Double val) {
-// return val != null? bd(val.doubleValue()): null;
-// }
-// public static BigDecimal bd(Double val, int scale) {
-// return val != null? bd(val.doubleValue(), scale): null;
-// }
-// public static BigDecimal bd(Double val, int scale, RoundingMode roundingMode) {
-// return val != null? bd(val.doubleValue(), scale, roundingMode): null;
-// }
-// public static BigDecimal bd2(Double val) {
-// return val != null? bd2(val.doubleValue()): null;
-// }
-// public static BigDecimal bd2hup(Double val) {
-// return val != null? bd2hup(val.doubleValue()): null;
-// }
-// public static BigDecimal bd4(Double val) {
-// return val != null? bd4(val.doubleValue()): null;
-// }
-//
-//
-// public static BigDecimal bd(int val) {
-// return BigDecimal.valueOf(val);
-// }
-// public static BigDecimal bd(int val, int newScale) {
-// return bd(val).setScale(newScale);
-// }
-// public static BigDecimal bd1(int val) {
-// return bd(val, 1);
-// }
-// public static BigDecimal bd2(int val) {
-// return bd(val, 2);
-// }
-// public static BigDecimal bd4(int val) {
-// return bd(val, 4);
-// }
-//
-//
-// public static BigDecimal bd(Integer val) {
-// return val != null? bd(val.intValue()): null;
-// }
-// public static BigDecimal bd(Integer val, int newScale) {
-// return val != null? bd(val.intValue(), newScale): null;
-// }
-// public static BigDecimal bd1(Integer val) {
-// return val != null? bd1(val.intValue()): null;
-// }
-// public static BigDecimal bd2(Integer val) {
-// return val != null? bd2(val.intValue()): null;
-// }
-// public static BigDecimal bd4(Integer val) {
-// return val != null? bd4(val.intValue()): null;
-// }
-
-}
-
diff --git a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/utils/IndentPrinter.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/io/IndentPrinter.java
similarity index 98%
rename from testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/utils/IndentPrinter.java
rename to testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/io/IndentPrinter.java
index a365228..c128309 100644
--- a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/utils/IndentPrinter.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/io/IndentPrinter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.testing.unittestsupport.applib.core.utils;
+package org.apache.isis.testing.unittestsupport.applib.io;
import java.io.IOException;
import java.io.PrintWriter;
diff --git a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/streams/NullPrintStream.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/io/NullPrintStream.java
similarity index 98%
rename from testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/streams/NullPrintStream.java
rename to testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/io/NullPrintStream.java
index 6855e6f..2873adb 100644
--- a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/streams/NullPrintStream.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/io/NullPrintStream.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.testing.unittestsupport.applib.core.streams;
+package org.apache.isis.testing.unittestsupport.applib.io;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
diff --git a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/ImposteriserUsingCodegenPlugin.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/jmocking/ImposteriserUsingCodegenPlugin.java
similarity index 97%
rename from testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/ImposteriserUsingCodegenPlugin.java
rename to testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/jmocking/ImposteriserUsingCodegenPlugin.java
index ff8b74c..a9c9a39 100644
--- a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/ImposteriserUsingCodegenPlugin.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/jmocking/ImposteriserUsingCodegenPlugin.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.testing.unittestsupport.applib.core.jmocking;
+package org.apache.isis.testing.unittestsupport.applib.jmocking;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
diff --git a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/Imposterisers.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/jmocking/Imposterisers.java
similarity index 94%
rename from testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/Imposterisers.java
rename to testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/jmocking/Imposterisers.java
index 35f8e2b..f06c31f 100644
--- a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/Imposterisers.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/jmocking/Imposterisers.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.testing.unittestsupport.applib.core.jmocking;
+package org.apache.isis.testing.unittestsupport.applib.jmocking;
import org.jmock.api.Imposteriser;
diff --git a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/InjectIntoJMockAction.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/jmocking/InjectIntoJMockAction.java
similarity index 96%
rename from testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/InjectIntoJMockAction.java
rename to testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/jmocking/InjectIntoJMockAction.java
index 800217e..31c3844 100644
--- a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/InjectIntoJMockAction.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/jmocking/InjectIntoJMockAction.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.testing.unittestsupport.applib.core.jmocking;
+package org.apache.isis.testing.unittestsupport.applib.jmocking;
import java.lang.reflect.Method;
diff --git a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/IsisActions.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/jmocking/IsisActions.java
similarity index 96%
rename from testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/IsisActions.java
rename to testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/jmocking/IsisActions.java
index 638cab2..77d44b7 100644
--- a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/IsisActions.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/jmocking/IsisActions.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.testing.unittestsupport.applib.core.jmocking;
+package org.apache.isis.testing.unittestsupport.applib.jmocking;
import org.hamcrest.Description;
import org.jmock.api.Action;
diff --git a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/JMockActions.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/jmocking/JMockActions.java
similarity index 97%
rename from testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/JMockActions.java
rename to testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/jmocking/JMockActions.java
index 847dcff..7db9e32 100644
--- a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/JMockActions.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/jmocking/JMockActions.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.testing.unittestsupport.applib.core.jmocking;
+package org.apache.isis.testing.unittestsupport.applib.jmocking;
import java.util.Arrays;
import java.util.Collection;
diff --git a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/JUnitRuleMockery2.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/jmocking/JUnitRuleMockery2.java
similarity index 99%
rename from testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/JUnitRuleMockery2.java
rename to testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/jmocking/JUnitRuleMockery2.java
index 620e8dd..407eff6 100644
--- a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/JUnitRuleMockery2.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/jmocking/JUnitRuleMockery2.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.testing.unittestsupport.applib.core.jmocking;
+package org.apache.isis.testing.unittestsupport.applib.jmocking;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
diff --git a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/MyMockomatic.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/jmocking/MyMockomatic.java
similarity index 98%
rename from testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/MyMockomatic.java
rename to testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/jmocking/MyMockomatic.java
index cce7358..c18dfb0 100644
--- a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/MyMockomatic.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/jmocking/MyMockomatic.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.testing.unittestsupport.applib.core.jmocking;
+package org.apache.isis.testing.unittestsupport.applib.jmocking;
import java.lang.reflect.Field;
import java.util.ArrayList;
diff --git a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/PostponedAction.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/jmocking/PostponedAction.java
similarity index 95%
rename from testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/PostponedAction.java
rename to testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/jmocking/PostponedAction.java
index f7712ba..abe0a2a 100644
--- a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/PostponedAction.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/jmocking/PostponedAction.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.testing.unittestsupport.applib.core.jmocking;
+package org.apache.isis.testing.unittestsupport.applib.jmocking;
import java.util.function.Supplier;
diff --git a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/matchers/IsisMatchers.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/matchers/IsisMatchers.java
similarity index 99%
rename from testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/matchers/IsisMatchers.java
rename to testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/matchers/IsisMatchers.java
index 612fa22..8ee9074 100644
--- a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/matchers/IsisMatchers.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/matchers/IsisMatchers.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.testing.unittestsupport.applib.dom.matchers;
+package org.apache.isis.testing.unittestsupport.applib.matchers;
import java.io.File;
import java.io.IOException;
diff --git a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/jaxb/JaxbMatchers.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/matchers/JaxbMatchers.java
similarity index 98%
rename from testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/jaxb/JaxbMatchers.java
rename to testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/matchers/JaxbMatchers.java
index a69cab3..d7dff65 100644
--- a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/jaxb/JaxbMatchers.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/matchers/JaxbMatchers.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.testing.unittestsupport.applib.core.jaxb;
+package org.apache.isis.testing.unittestsupport.applib.matchers;
import java.io.CharArrayWriter;
import java.io.IOException;
diff --git a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/soap/SoapEndpoint.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/soap/SoapEndpoint.java
similarity index 96%
rename from testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/soap/SoapEndpoint.java
rename to testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/soap/SoapEndpoint.java
index 2260fe1..2895035 100644
--- a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/soap/SoapEndpoint.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/soap/SoapEndpoint.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.testing.unittestsupport.applib.core.soap;
+package org.apache.isis.testing.unittestsupport.applib.soap;
import javax.xml.ws.Endpoint;
diff --git a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/soap/SoapEndpointPublishingRule.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/soap/SoapEndpointPublishingRule.java
similarity index 82%
rename from testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/soap/SoapEndpointPublishingRule.java
rename to testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/soap/SoapEndpointPublishingRule.java
index aa9d521..c7d06a3 100644
--- a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/soap/SoapEndpointPublishingRule.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/soap/SoapEndpointPublishingRule.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.testing.unittestsupport.applib.core.soap;
+package org.apache.isis.testing.unittestsupport.applib.soap;
import java.util.ArrayList;
import java.util.List;
@@ -35,32 +35,32 @@ import static org.apache.isis.commons.internal.base._NullSafe.stream;
public class SoapEndpointPublishingRule implements TestRule {
public SoapEndpointPublishingRule(final Class<?> endpointClass, final String endpointAddress) {
- PublishedEndpoints.instance().publishIfRequired(
+ SoapPublishedEndpoints.instance().publishIfRequired(
new SoapEndpointSpec(endpointClass, endpointAddress));
}
public SoapEndpointPublishingRule(Class<?>... endpointClasses) {
- PublishedEndpoints.instance().publishIfRequired(
+ SoapPublishedEndpoints.instance().publishIfRequired(
stream(endpointClasses)
.map(SoapEndpointSpec::asSoapEndpointSpec)
.collect(Collectors.toCollection(ArrayList::new)));
}
public SoapEndpointPublishingRule(final List<Class<?>> endpointClasses) {
- PublishedEndpoints.instance().publishIfRequired(
+ SoapPublishedEndpoints.instance().publishIfRequired(
stream(endpointClasses)
.map(SoapEndpointSpec::asSoapEndpointSpec)
.collect(Collectors.toCollection(ArrayList::new)));
}
public SoapEndpointPublishingRule(SoapEndpointSpec... soapEndpointSpecs) {
- PublishedEndpoints.instance().publishIfRequired(
+ SoapPublishedEndpoints.instance().publishIfRequired(
stream(soapEndpointSpecs)
.collect(Collectors.toCollection(ArrayList::new)));
}
public SoapEndpointPublishingRule(final Iterable<SoapEndpointSpec> soapEndpointSpecs) {
- PublishedEndpoints.instance().publishIfRequired(
+ SoapPublishedEndpoints.instance().publishIfRequired(
stream(soapEndpointSpecs)
.collect(Collectors.toCollection(ArrayList::new)));
}
@@ -72,11 +72,11 @@ public class SoapEndpointPublishingRule implements TestRule {
}
public String getEndpointAddress(Class<?> endpointClass) {
- return PublishedEndpoints.instance().getEndpointAddress(endpointClass);
+ return SoapPublishedEndpoints.instance().getEndpointAddress(endpointClass);
}
public <T> T getEndpointImplementor(Class<T> endpointClass) {
- return PublishedEndpoints.instance().getEndpointImplementor(endpointClass);
+ return SoapPublishedEndpoints.instance().getEndpointImplementor(endpointClass);
}
}
diff --git a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/soap/SoapEndpointSpec.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/soap/SoapEndpointSpec.java
similarity index 97%
rename from testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/soap/SoapEndpointSpec.java
rename to testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/soap/SoapEndpointSpec.java
index 924158e..0ef428b 100644
--- a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/soap/SoapEndpointSpec.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/soap/SoapEndpointSpec.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.testing.unittestsupport.applib.core.soap;
+package org.apache.isis.testing.unittestsupport.applib.soap;
import java.util.function.Supplier;
diff --git a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/soap/SoapPublishedEndpoints.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/soap/SoapPublishedEndpoints.java
similarity index 98%
rename from testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/soap/SoapPublishedEndpoints.java
rename to testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/soap/SoapPublishedEndpoints.java
index 85d5684..c3c51d7 100644
--- a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/soap/SoapPublishedEndpoints.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/soap/SoapPublishedEndpoints.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.testing.unittestsupport.applib.core.soap;
+package org.apache.isis.testing.unittestsupport.applib.soap;
import java.util.ArrayList;
import java.util.List;
diff --git a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/utils/CollectUtils.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/util/CollectUtils.java
similarity index 93%
rename from testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/utils/CollectUtils.java
rename to testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/util/CollectUtils.java
index e5c0b49..278184c 100644
--- a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/utils/CollectUtils.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/util/CollectUtils.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.testing.unittestsupport.applib.core.utils;
+package org.apache.isis.testing.unittestsupport.applib.util;
import java.util.Set;
diff --git a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/files/Files.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/util/FileUtils.java
similarity index 97%
rename from testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/files/Files.java
rename to testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/util/FileUtils.java
index cf9bf6b..b35654c 100644
--- a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/files/Files.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/util/FileUtils.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.testing.unittestsupport.applib.core.files;
+package org.apache.isis.testing.unittestsupport.applib.util;
import java.io.File;
import java.io.FileFilter;
@@ -32,7 +32,7 @@ import lombok.experimental.UtilityClass;
* @since 2.0 {@index}
*/
@UtilityClass
-public final class Files {
+public final class FileUtils {
public enum Recursion {
diff --git a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/utils/ReflectUtils.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/util/InjectUtils.java
similarity index 96%
rename from testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/utils/ReflectUtils.java
rename to testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/util/InjectUtils.java
index 35456fa..851485a 100644
--- a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/utils/ReflectUtils.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/util/InjectUtils.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.testing.unittestsupport.applib.core.utils;
+package org.apache.isis.testing.unittestsupport.applib.util;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
@@ -30,7 +30,7 @@ import org.apache.isis.commons.internal.base._Strings;
/**
* @since 2.0 {@index}
*/
-public class ReflectUtils {
+public class InjectUtils {
public static <T> Predicate<Field> withTypeAssignableFrom(final Class<T> type) {
return (Field input)-> input != null && input.getType().isAssignableFrom(type);
diff --git a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/reflect/ReflectUtils.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/util/ReflectUtils.java
similarity index 93%
rename from testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/reflect/ReflectUtils.java
rename to testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/util/ReflectUtils.java
index 9654a0e..c5ecec6 100644
--- a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/reflect/ReflectUtils.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/util/ReflectUtils.java
@@ -16,19 +16,19 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.testing.unittestsupport.applib.dom.reflect;
+package org.apache.isis.testing.unittestsupport.applib.util;
import org.apache.isis.commons.internal.reflection._Reflect;
import lombok.val;
+import lombok.experimental.UtilityClass;
/**
* @since 2.0 {@index}
*/
+@UtilityClass
public class ReflectUtils {
- private ReflectUtils() { }
-
public static void inject(
final Object target,
final String fieldName,
diff --git a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/utils/StringUtils.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/util/StringUtils.java
similarity index 95%
rename from testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/utils/StringUtils.java
rename to testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/util/StringUtils.java
index 4fb2c29..6480672 100644
--- a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/core/utils/StringUtils.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/util/StringUtils.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.testing.unittestsupport.applib.core.utils;
+package org.apache.isis.testing.unittestsupport.applib.util;
import java.lang.reflect.Field;
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/bean/PojoTesterTest_interference.java b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/bean/PojoTesterTest_interference.java
index 3d92f26..e957551 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/bean/PojoTesterTest_interference.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/bean/PojoTesterTest_interference.java
@@ -24,6 +24,8 @@ import org.junit.rules.ExpectedException;
import static org.hamcrest.Matchers.containsString;
+import org.apache.isis.testing.unittestsupport.applib.dom.pojo.PojoTester;
+
public class PojoTesterTest_interference {
@Rule
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/bidir/BidirectionalRelationshipContractTestAll.java b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/bidir/BidirectionalRelationshipContractTestAll.java
index 3145486..3ab274b 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/bidir/BidirectionalRelationshipContractTestAll.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/bidir/BidirectionalRelationshipContractTestAll.java
@@ -19,12 +19,15 @@
package org.apache.isis.testing.unittestsupport.applib.core.bidir;
import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.testing.unittestsupport.applib.dom.bidir.BidirectionalRelationshipContractTestAbstract;
+import org.apache.isis.testing.unittestsupport.applib.dom.bidir.Instantiator;
+import org.apache.isis.testing.unittestsupport.applib.dom.bidir.InstantiatorSimple;
public class BidirectionalRelationshipContractTestAll extends BidirectionalRelationshipContractTestAbstract {
public BidirectionalRelationshipContractTestAll() {
super("org.apache.isis.core.unittestsupport.bidir",
- _Maps.<Class<?>,Instantiator>unmodifiable(
+ _Maps.<Class<?>, Instantiator>unmodifiable(
// no instantiator need be registered for ParentDomainObject.class;
// will default to using new InstantiatorSimple(AgreementForTesting.class),
ChildDomainObject.class, new InstantiatorForChildDomainObject(),
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/bidir/InstantiatorForChildDomainObject.java b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/bidir/InstantiatorForChildDomainObject.java
index 8879e0a..bf76c24 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/bidir/InstantiatorForChildDomainObject.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/bidir/InstantiatorForChildDomainObject.java
@@ -20,6 +20,8 @@ package org.apache.isis.testing.unittestsupport.applib.core.bidir;
import java.util.SortedSet;
+import org.apache.isis.testing.unittestsupport.applib.dom.bidir.Instantiator;
+
/**
* To ensure that different ({@link Comparable}) {@link ChildDomainObject}s
* are not equivalent when placed into the {@link ParentDomainObject#getChildren() children} (a {@link SortedSet}.)
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/comparable/CategorizedDomainObjectComparableContractTest_compareTo.java b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/comparable/CategorizedDomainObjectComparableContractTest_compareTo.java
index 7275f52..26c95cf 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/comparable/CategorizedDomainObjectComparableContractTest_compareTo.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/comparable/CategorizedDomainObjectComparableContractTest_compareTo.java
@@ -20,6 +20,8 @@ package org.apache.isis.testing.unittestsupport.applib.core.comparable;
import java.util.List;
+import org.apache.isis.testing.unittestsupport.applib.dom.comparable.ComparableContractTest_compareTo;
+
public class CategorizedDomainObjectComparableContractTest_compareTo extends ComparableContractTest_compareTo<CategorizedDomainObject> {
@Override
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/files/Files_deleteFiles_Test.java b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/files/Files_deleteFileUtils_Test.java
similarity index 87%
rename from testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/files/Files_deleteFiles_Test.java
rename to testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/files/Files_deleteFileUtils_Test.java
index 739a9ed..7d56362 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/files/Files_deleteFiles_Test.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/files/Files_deleteFileUtils_Test.java
@@ -29,16 +29,17 @@ import org.jmock.auto.Mock;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.isis.testing.unittestsupport.applib.core.jmocking.JUnitRuleMockery2;
+import org.apache.isis.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2;
+import org.apache.isis.testing.unittestsupport.applib.util.FileUtils;
-public class Files_deleteFiles_Test {
+public class Files_deleteFileUtils_Test {
@Rule
public JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(JUnitRuleMockery2.Mode.INTERFACES_AND_CLASSES);
@Mock
- private Files.Deleter deleter;
+ private FileUtils.Deleter deleter;
@Test
public void test() throws IOException {
@@ -53,10 +54,10 @@ public class Files_deleteFiles_Test {
}
});
- Files.deleteFiles(
+ FileUtils.deleteFiles(
new File("xml/objects").getAbsoluteFile(),
- Files.filterFileNameExtension(".xml"),
- Files.Recursion.DO_RECURSE,
+ FileUtils.filterFileNameExtension(".xml"),
+ FileUtils.Recursion.DO_RECURSE,
deleter);
}
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/ImposteriserTestUsingCodegenPlugin_Test.java b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/ImposteriserTestUsingCodegenPlugin_Test.java
index 50045ad..d9ffe3d 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/ImposteriserTestUsingCodegenPlugin_Test.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/ImposteriserTestUsingCodegenPlugin_Test.java
@@ -26,6 +26,7 @@ import static org.junit.jupiter.api.Assertions.fail;
import org.apache.isis.commons.internal.context._Context;
import org.apache.isis.commons.internal.reflection._Reflect;
+import org.apache.isis.testing.unittestsupport.applib.jmocking.Imposterisers;
import java.io.File;
import java.net.URL;
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/IsisActionsTest_returnNewTransientInstance.java b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/IsisActionsTest_returnNewTransientInstance.java
index df6a3e9..4425138 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/IsisActionsTest_returnNewTransientInstance.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/IsisActionsTest_returnNewTransientInstance.java
@@ -31,6 +31,9 @@ import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
+import org.apache.isis.testing.unittestsupport.applib.jmocking.IsisActions;
+import org.apache.isis.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2;
+
public class IsisActionsTest_returnNewTransientInstance {
// we can't use the 'real' DomainObjectConainter because applib depends on this module, not vice versa
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/JMockActionsTest_returnArgument.java b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/JMockActionsTest_returnArgument.java
index 75b1a75..fd8e19d 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/JMockActionsTest_returnArgument.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/JMockActionsTest_returnArgument.java
@@ -27,7 +27,9 @@ import org.junit.Test;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-import org.apache.isis.testing.unittestsupport.applib.core.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.testing.unittestsupport.applib.jmocking.JMockActions;
+import org.apache.isis.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2;
+import org.apache.isis.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.Mode;
public class JMockActionsTest_returnArgument {
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/JMockActionsTest_returnEach.java b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/JMockActionsTest_returnEach.java
index 521f85b..b6faade 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/JMockActionsTest_returnEach.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/JMockActionsTest_returnEach.java
@@ -27,7 +27,9 @@ import org.junit.Test;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-import org.apache.isis.testing.unittestsupport.applib.core.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.testing.unittestsupport.applib.jmocking.JMockActions;
+import org.apache.isis.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2;
+import org.apache.isis.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.Mode;
public class JMockActionsTest_returnEach {
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/JUnitRuleMockery2Test.java b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/JUnitRuleMockery2Test.java
index 50e1f5f..e8582c9 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/JUnitRuleMockery2Test.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/JUnitRuleMockery2Test.java
@@ -24,7 +24,8 @@ import org.jmock.auto.Mock;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.isis.testing.unittestsupport.applib.core.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2;
+import org.apache.isis.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.Mode;
public class JUnitRuleMockery2Test {
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/JUnitRuleMockery2Test_autoWiring_constructorInjection_happyCase.java b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/JUnitRuleMockery2Test_autoWiring_constructorInjection_happyCase.java
index 8d5b55b..396f745 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/JUnitRuleMockery2Test_autoWiring_constructorInjection_happyCase.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/JUnitRuleMockery2Test_autoWiring_constructorInjection_happyCase.java
@@ -28,8 +28,9 @@ import static org.hamcrest.Matchers.not;
import static org.hamcrest.Matchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
-import org.apache.isis.testing.unittestsupport.applib.core.jmocking.JUnitRuleMockery2.ClassUnderTest;
-import org.apache.isis.testing.unittestsupport.applib.core.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2;
+import org.apache.isis.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.ClassUnderTest;
+import org.apache.isis.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.Mode;
public class JUnitRuleMockery2Test_autoWiring_constructorInjection_happyCase {
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_noClassUnderTest.java b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_noClassUnderTest.java
index 81dba0b..084e1bc 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_noClassUnderTest.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_noClassUnderTest.java
@@ -23,7 +23,8 @@ import org.jmock.auto.Mock;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.isis.testing.unittestsupport.applib.core.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2;
+import org.apache.isis.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.Mode;
public class JUnitRuleMockery2Test_autoWiring_sadCase_noClassUnderTest {
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_twoClassesUnderTest.java b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_twoClassesUnderTest.java
index d368996..95da9b3 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_twoClassesUnderTest.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_twoClassesUnderTest.java
@@ -24,8 +24,9 @@ import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.isis.testing.unittestsupport.applib.core.jmocking.JUnitRuleMockery2.ClassUnderTest;
-import org.apache.isis.testing.unittestsupport.applib.core.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2;
+import org.apache.isis.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.ClassUnderTest;
+import org.apache.isis.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.Mode;
public class JUnitRuleMockery2Test_autoWiring_sadCase_twoClassesUnderTest {
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/JUnitRuleMockery2Test_autoWiring_setterInjection_happyCase.java b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/JUnitRuleMockery2Test_autoWiring_setterInjection_happyCase.java
index 71ed449..0f3b886 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/JUnitRuleMockery2Test_autoWiring_setterInjection_happyCase.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/JUnitRuleMockery2Test_autoWiring_setterInjection_happyCase.java
@@ -28,8 +28,9 @@ import static org.hamcrest.Matchers.not;
import static org.hamcrest.Matchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
-import org.apache.isis.testing.unittestsupport.applib.core.jmocking.JUnitRuleMockery2.ClassUnderTest;
-import org.apache.isis.testing.unittestsupport.applib.core.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2;
+import org.apache.isis.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.ClassUnderTest;
+import org.apache.isis.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.Mode;
public class JUnitRuleMockery2Test_autoWiring_setterInjection_happyCase {
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithAllowing.java b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithAllowing.java
index e5af524..934cd96 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithAllowing.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithAllowing.java
@@ -23,9 +23,10 @@ import org.jmock.auto.Mock;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.isis.testing.unittestsupport.applib.core.jmocking.JUnitRuleMockery2.Allowing;
-import org.apache.isis.testing.unittestsupport.applib.core.jmocking.JUnitRuleMockery2.ClassUnderTest;
-import org.apache.isis.testing.unittestsupport.applib.core.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2;
+import org.apache.isis.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.Allowing;
+import org.apache.isis.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.ClassUnderTest;
+import org.apache.isis.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.Mode;
public class JUnitRuleMockery2Test_mockAnnotatedWithAllowing {
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithIgnoring.java b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithIgnoring.java
index a18f21c..65b3100 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithIgnoring.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithIgnoring.java
@@ -23,9 +23,10 @@ import org.jmock.auto.Mock;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.isis.testing.unittestsupport.applib.core.jmocking.JUnitRuleMockery2.ClassUnderTest;
-import org.apache.isis.testing.unittestsupport.applib.core.jmocking.JUnitRuleMockery2.Ignoring;
-import org.apache.isis.testing.unittestsupport.applib.core.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2;
+import org.apache.isis.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.ClassUnderTest;
+import org.apache.isis.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.Ignoring;
+import org.apache.isis.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.Mode;
public class JUnitRuleMockery2Test_mockAnnotatedWithIgnoring {
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_happyCase.java b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_happyCase.java
index 9914c04..369f26b 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_happyCase.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_happyCase.java
@@ -23,9 +23,10 @@ import org.jmock.auto.Mock;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.isis.testing.unittestsupport.applib.core.jmocking.JUnitRuleMockery2.ClassUnderTest;
-import org.apache.isis.testing.unittestsupport.applib.core.jmocking.JUnitRuleMockery2.Mode;
-import org.apache.isis.testing.unittestsupport.applib.core.jmocking.JUnitRuleMockery2.Never;
+import org.apache.isis.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2;
+import org.apache.isis.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.ClassUnderTest;
+import org.apache.isis.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.Never;
public class JUnitRuleMockery2Test_mockAnnotatedWithNever_happyCase {
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_sadCase.java b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_sadCase.java
index 1e1950b..59aa46e 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_sadCase.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_sadCase.java
@@ -24,9 +24,10 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
-import org.apache.isis.testing.unittestsupport.applib.core.jmocking.JUnitRuleMockery2.ClassUnderTest;
-import org.apache.isis.testing.unittestsupport.applib.core.jmocking.JUnitRuleMockery2.Mode;
-import org.apache.isis.testing.unittestsupport.applib.core.jmocking.JUnitRuleMockery2.Never;
+import org.apache.isis.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2;
+import org.apache.isis.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.ClassUnderTest;
+import org.apache.isis.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.Never;
public class JUnitRuleMockery2Test_mockAnnotatedWithNever_sadCase {
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_happyCase.java b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_happyCase.java
index 7d0a9ef..0e9c387 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_happyCase.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_happyCase.java
@@ -23,9 +23,10 @@ import org.jmock.auto.Mock;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.isis.testing.unittestsupport.applib.core.jmocking.JUnitRuleMockery2.ClassUnderTest;
-import org.apache.isis.testing.unittestsupport.applib.core.jmocking.JUnitRuleMockery2.Mode;
-import org.apache.isis.testing.unittestsupport.applib.core.jmocking.JUnitRuleMockery2.One;
+import org.apache.isis.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2;
+import org.apache.isis.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.ClassUnderTest;
+import org.apache.isis.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.One;
public class JUnitRuleMockery2Test_mockAnnotatedWithOne_happyCase {
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_sadCase.java b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_sadCase.java
index afe3be4..898779e 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_sadCase.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_sadCase.java
@@ -24,9 +24,10 @@ import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.isis.testing.unittestsupport.applib.core.jmocking.JUnitRuleMockery2.ClassUnderTest;
-import org.apache.isis.testing.unittestsupport.applib.core.jmocking.JUnitRuleMockery2.Mode;
-import org.apache.isis.testing.unittestsupport.applib.core.jmocking.JUnitRuleMockery2.One;
+import org.apache.isis.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2;
+import org.apache.isis.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.ClassUnderTest;
+import org.apache.isis.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2.One;
public class JUnitRuleMockery2Test_mockAnnotatedWithOne_sadCase {
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/sortedsets/SortedSetsContractTestAll.java b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/sortedsets/SortedSetsContractTestAll.java
index 8408101..238e127 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/sortedsets/SortedSetsContractTestAll.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/sortedsets/SortedSetsContractTestAll.java
@@ -18,6 +18,8 @@
*/
package org.apache.isis.testing.unittestsupport.applib.core.sortedsets;
+import org.apache.isis.testing.unittestsupport.applib.dom.sortedsets.SortedSetsContractTestAbstract;
+
public class SortedSetsContractTestAll extends SortedSetsContractTestAbstract {
public SortedSetsContractTestAll() {
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/value/ValueTypeContractTestAbstract_BigIntegerTest.java b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/value/ValueTypeContractTestAbstract_BigIntegerTest.java
index 502d249..d5df946 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/value/ValueTypeContractTestAbstract_BigIntegerTest.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/value/ValueTypeContractTestAbstract_BigIntegerTest.java
@@ -22,6 +22,8 @@ import java.math.BigInteger;
import java.util.Arrays;
import java.util.List;
+import org.apache.isis.testing.unittestsupport.applib.dom.value.ValueTypeContractTestAbstract;
+
public class ValueTypeContractTestAbstract_BigIntegerTest extends ValueTypeContractTestAbstract<BigInteger> {
@Override
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/value/ValueTypeContractTestAbstract_ColorTest.java b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/value/ValueTypeContractTestAbstract_ColorTest.java
index 87ac44f..818f948 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/value/ValueTypeContractTestAbstract_ColorTest.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/value/ValueTypeContractTestAbstract_ColorTest.java
@@ -22,6 +22,8 @@ import java.awt.Color;
import java.util.Arrays;
import java.util.List;
+import org.apache.isis.testing.unittestsupport.applib.dom.value.ValueTypeContractTestAbstract;
+
public class ValueTypeContractTestAbstract_ColorTest extends ValueTypeContractTestAbstract<Color> {
diff --git a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/value/ValueTypeContractTestAbstract_StringTest.java b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/value/ValueTypeContractTestAbstract_StringTest.java
index 6081acf..6f2cfae 100644
--- a/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/value/ValueTypeContractTestAbstract_StringTest.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/core/value/ValueTypeContractTestAbstract_StringTest.java
@@ -21,6 +21,8 @@ package org.apache.isis.testing.unittestsupport.applib.core.value;
import java.util.Arrays;
import java.util.List;
+import org.apache.isis.testing.unittestsupport.applib.dom.value.ValueTypeContractTestAbstract;
+
public class ValueTypeContractTestAbstract_StringTest extends ValueTypeContractTestAbstract<String> {
@Override
diff --git a/viewers/restfulobjects/adoc/modules/ROOT/pages/ro-spec.adoc b/viewers/restfulobjects/adoc/modules/ROOT/pages/ro-spec.adoc
index d7b7635..3ea649d 100644
--- a/viewers/restfulobjects/adoc/modules/ROOT/pages/ro-spec.adoc
+++ b/viewers/restfulobjects/adoc/modules/ROOT/pages/ro-spec.adoc
@@ -119,8 +119,7 @@ chapter.
The Restful Objects viewer supports the `x-ro-follow-links` query parameter in a way very similar to that suggested in the RO spec (section link:https://www.restfulobjects.org/spec/1.0/section-e/chapter-34.html#34.4-minimizing-round-trips-(x-ro-follow-links)[34.4]), the main point being to avoid the "N+1" problem of too many (slow) network calls.
For example, using this feature one can load a grid of data in a single call.
-(That said, the xref:vro:ROOT:simplified-representations.adoc[simplified representations]
-supported by Restful Objects viewer also support this use case, albeit in way that deviates from the RO spec).
+(That said, the xref:vro:ROOT:content-negotiation/apache-isis-v2-profile.adoc[Apache Isis v2 simplified representation] supported by Restful Objects viewer also support this use case, albeit in way that deviates from the RO spec).
For example, with an app containing three entities, `Grandparent`, `Parent` and `ChildJdo` that define a hierarchy of 1:m relationships, we could define the following queries: