You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2020/01/29 19:38:29 UTC
[isis] branch ISIS-2062 updated (d6cbdd4 -> 021b3c3)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch ISIS-2062
in repository https://gitbox.apache.org/repos/asf/isis.git.
from d6cbdd4 ISIS-2062: docs
new 0c43914 ISIS-2273: moves detached tests for unittestsupport, copies a couple also used by config or applib
new 87e2f4f ISIS-2273: adds junit deps for applib
new 62c0443 ISIS-2273: fixes compile issues for applib, I hope
new c99d8bb ISIS-2273: fixes failing test
new 6965983 ISIS-2273: fixes failing test
new 1373b64 ISIS-2273: fixes failing test
new 35b5f99 ISIS-2273: fixes failing test
new 6f22c4e ISIS-2273: fixes failing test for metamodel
new b4468a2 ISIS-2273: fixing compile issues
new 93bcf46 ISIS-2273: copies jmock2 into metamodel's own test
new f24e9cb ISIS-2273: fixing classpath for runtimeservices
new 2d22da9 ISIS-2273: fixing classpath for shiro
new b399593 ISIS-2273: fixing classpath for shiro
new 94c5347 ISIS-2273: fixing classpath for shiro and RO viewer
new 83216d2 ISIS-2273: more fixing of classpath
new 9efa59c ISIS-2273: more fixing of classpath
new f9b4578 ISIS-2273: more fixing of classpath
new 7fd51ff ISIS-2273: removing core references to isis-core-unittestsupport
new 1b8db46 ISIS-2273: removing core references to isis-core-unittestsupport
new a18905c ISIS-2273: fixes classpath on runtime
new b288330 ISIS-2273: removing core references to isis-core-unittestsupport
new d244d2d ISIS-2273: removing core references to isis-core-unittestsupport, ctd
new a47b833 ISIS-2273: removing core references to isis-core-unittestsupport, ctd
new ff27d74 ISIS-2273: removing core references to isis-core-unittestsupport, ctd
new 021b3c3 ISIS-2273: removing core references to isis-core-unittestsupport, ctd
The 25 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
api/applib/pom.xml | 44 ++++++++-
.../services/i18n/TranslatableStringTest.java | 4 +-
.../ComparableContractTest_compareTo.java | 9 +-
.../unittestsupport}/ComparableContractTester.java | 2 +-
.../ValueTypeContractTestAbstract.java | 6 +-
.../applib/util/ObjectContractsTest_compareTo.java | 3 +-
.../ObjectContractsTest_equals_and_hashCode.java | 2 +-
.../applib/util/schema/CommonDtoUtils_Test.java | 4 +-
.../schema/CommonDtoUtils_setValueOn_Test.java | 4 +-
core/codegen-bytebuddy/pom.xml | 16 ----
core/config/pom.xml | 27 +++++-
.../config/IsisConfiguration_createSubsetTest.java | 4 +-
.../core/config/IsisConfiguration_primingTest.java | 2 +-
.../config/IsisConfiguration_specialCharTest.java | 4 +-
.../config/IsisConfiguration_whitespaceTest.java | 4 +-
.../unittestsupport}/IsisConfigurationLegacy.java | 2 +-
.../config/unittestsupport}/internal/_Config.java | 4 +-
.../internal/_Config_Instance.java | 4 +-
.../internal/_Config_LifecycleResource.java | 4 +-
.../unittestsupport}/internal/_Config_Parsers.java | 2 +-
.../unittestsupport}/internal/_Config_trim.java | 2 +-
core/detached-tests/pom.xml | 50 ++++++++--
...RuleMockery2Test_mockAnnotatedWithChecking.java | 61 ------------
core/metamodel/pom.xml | 106 ++++++++++++++++++++-
.../metamodel/MetaModelContext_configTest.java | 4 +-
.../metamodel/MetaModelContext_forTesting.java | 4 +-
.../oid/CollectionOidTest_valueSemantics.java | 2 +-
...dDefaultTest_valueSemantics_whenPersistent.java | 2 +-
.../commons/internal/reflection/ReflectTest.java | 2 +-
.../facets/AbstractFacetFactoryJUnit4TestCase.java | 4 +-
.../metamodel/facets/AbstractFacetFactoryTest.java | 2 +-
.../metamodel/facets/ObjectAdapterUtilsTest.java | 4 +-
.../actions/ActionMethodsFacetFactoryTest.java | 2 +-
.../prototype/PrototypeFacetAbstractTest.java | 2 +-
.../CollectionFieldMethodsFacetFactoryTest.java | 4 +-
.../collections/JavaCollectionFacetTest.java | 4 +-
.../ViewModelSemanticCheckingFacetFactoryTest.java | 4 +-
.../object/defaults/DefaultedFacetFactoryTest.java | 2 +-
.../DomainObjectAnnotationFacetFactoryTest.java | 2 +-
.../DomainObjectLayoutFactoryTest.java | 2 +-
.../TitleFacetViaTitleAnnotationTest.java | 4 +-
.../facets/object/mixin/MixinIntendedAs.java | 0
.../object/mixin/MixinIntendedAsActionTest.java | 0
.../parseable/ParseableFacetUsingParserTest.java | 4 +-
...eFacetAnnotationOrConfigurationFactoryTest.java | 2 +-
.../ordering/memberorder/DeweyOrderSetTest.java | 2 +-
.../MemberOrderAnnotationFacetFactoryTest.java | 2 +-
.../memberorder/MemberOrderComparatorTest.java | 2 +-
.../facets/param/name/ParameterNameFacetTest.java | 0
...romptStyleFacetFromPropertyAnnotation_Test.java | 2 +-
.../PropertyAnnotationFacetFactoryTest.java | 2 +-
.../BigDecimalValueSemanticsProviderTest.java | 2 +-
.../value/BigIntValueSemanticsProviderTest.java | 2 +-
.../value/ByteValueSemanticsProviderTest.java | 2 +-
.../value/DoubleValueSemanticsProviderTest.java | 2 +-
.../value/FloatValueSemanticsProviderTest.java | 2 +-
.../ImageValueSemanticsProviderAbstractTest.java | 6 +-
.../value/IntValueSemanticsProviderTest.java | 2 +-
.../JavaSqlDateValueSemanticsProviderTest.java | 2 +-
.../JavaSqlTimeValueSemanticsProviderTest.java | 2 +-
.../JavaUtilDateValueSemanticsProviderTest.java | 2 +-
.../value/LongValueSemanticsProviderTest.java | 2 +-
.../value/ShortValueSemanticsProviderTest.java | 2 +-
.../ValueSemanticsProviderAbstractTestCase.java | 6 +-
...odaLocalDateTimeValueSemanticsProviderTest.java | 4 +-
...jectAssociationPredicatesTest_visibleWhere.java | 4 +-
.../services/appfeat/ApplicationFeatureIdTest.java | 4 +-
.../ApplicationFeatureRepositoryDefaultTest.java | 2 +-
...zerForRecoverableException_recognizes_Test.java | 4 +-
.../metamodel/MetaModelServiceDefaultTest.java | 4 +-
.../spec/ObjectSpecIdTest_valueSemantics.java | 2 +-
.../specloader/SpecificationCacheDefaultTest.java | 4 +-
...ionParameterAbstractTest_getId_and_getName.java | 5 +-
.../specimpl/ObjectAssociationAbstractTest.java | 4 +-
...ObjectAssociationAbstractTest_alwaysHidden.java | 4 +-
.../jmocking/ImposteriserUsingCodegenPlugin.java | 2 +-
.../unittestsupport/jmocking/Imposterisers.java | 2 +-
.../jmocking/InjectIntoJMockAction.java | 2 +-
.../unittestsupport/jmocking/IsisActions.java | 2 +-
.../unittestsupport/jmocking/JMockActions.java | 2 +-
.../jmocking/JUnitRuleMockery2.java | 6 +-
.../unittestsupport/jmocking/MyMockomatic.java | 2 +-
.../unittestsupport/jmocking/PostponedAction.java | 2 +-
core/runtime/pom.xml | 58 ++++++++++-
.../system/ObjectActionLayoutXmlDefaultTest.java | 5 +-
.../system/OneToManyAssociationDefaultTest.java | 4 +-
core/runtimeservices/pom.xml | 55 ++++++++++-
.../core/runtimeservices/i18n/po/PoReaderTest.java | 2 +-
.../wrapper/WrapperFactoryDefaultTest.java | 2 +-
.../WrapperFactoryDefault_wrappedObject_Test.java | 10 +-
...actoryDefault_wrappedObject_transient_Test.java | 6 +-
.../proxy/ProxyCreatorTestUsingCodegenPlugin.java | 0
core/security/pom.xml | 12 ++-
core/unittestsupport/.gitignore | 1 -
.../AbstractApplyToAllContractTest.java | 4 +
...irectionalRelationshipContractTestAbstract.java | 5 +
.../ComparableContractTest_compareTo.java | 7 ++
.../isis/core/unittestsupport/files/Files.java | 5 +
.../core/unittestsupport/jaxb/JaxbMatchers.java | 4 +-
.../jmocking/JUnitRuleMockery2.java | 4 +
.../soap/SoapEndpointPublishingRule.java | 4 +-
.../sortedsets/SortedSetsContractTestAbstract.java | 5 +
.../unittestsupport/streams/NullPrintStream.java | 5 +
.../core/unittestsupport/utils/CollectUtils.java | 5 +
.../core/unittestsupport/utils/IndentPrinter.java | 4 +
.../core/unittestsupport/utils/ReflectUtils.java | 5 +
.../core/unittestsupport/utils/StringUtils.java | 5 +
.../value/ValueTypeContractTestAbstract.java | 4 +
.../BidirectionalRelationshipContractTestAll.java | 0
.../unittestsupport/bidir/ChildDomainObject.java | 0
.../bidir/InstantiatorForChildDomainObject.java | 0
.../unittestsupport/bidir/ParentDomainObject.java | 0
.../unittestsupport/bidir/PeerDomainObject.java | 0
.../bidir/PeerDomainObjectForTesting.java | 0
.../comparable/CategorizedDomainObject.java | 0
...mainObjectComparableContractTest_compareTo.java | 0
.../files/Files_deleteFiles_Test.java} | 2 +-
.../CollaboratingUsingConstructorInjection.java | 0
.../CollaboratingUsingSetterInjection.java | 0
.../unittestsupport/jmocking/Collaborator.java | 0
.../ImposteriserTestUsingCodegenPlugin_Test.java} | 4 +-
...IsisActionsTest_returnNewTransientInstance.java | 0
.../jmocking/JMockActionsTest_returnArgument.java | 0
.../jmocking/JMockActionsTest_returnEach.java | 0
.../jmocking/JUnitRuleMockery2Test.java | 0
..._autoWiring_constructorInjection_happyCase.java | 0
...y2Test_autoWiring_sadCase_noClassUnderTest.java | 0
...est_autoWiring_sadCase_twoClassesUnderTest.java | 0
...2Test_autoWiring_setterInjection_happyCase.java | 0
...RuleMockery2Test_mockAnnotatedWithAllowing.java | 6 --
...RuleMockery2Test_mockAnnotatedWithIgnoring.java | 0
...kery2Test_mockAnnotatedWithNever_happyCase.java | 0
...ockery2Test_mockAnnotatedWithNever_sadCase.java | 0
...ockery2Test_mockAnnotatedWithOne_happyCase.java | 0
...eMockery2Test_mockAnnotatedWithOne_sadCase.java | 0
.../sortedsets/SomeDomainObject.java | 0
.../sortedsets/SortedSetsContractTestAll.java | 0
...lueTypeContractTestAbstract_BigIntegerTest.java | 0
.../ValueTypeContractTestAbstract_ColorTest.java | 0
.../ValueTypeContractTestAbstract_StringTest.java | 0
core/unittestsupport/src/test/resources/.gitignore | 1 +
.../src/test/resources/signed.jar | Bin
.../xml/objects/CUS.xml | 0
.../xml/objects/CUS/1.txt | 0
.../xml/objects/CUS/1.xml | 0
.../xml/objects/CUS/2.xml | 0
core/webapp/pom.xml | 12 ---
extensions/security/shiro-realm-ldap/impl/pom.xml | 6 --
incubator/core/jsr303/pom.xml | 12 ---
legacy/extensions/core/applib/pom.xml | 27 ++++--
legacy/extensions/core/commons/pom.xml | 26 +++--
legacy/extensions/core/metamodel/pom.xml | 35 +++++--
.../PercentageValueSemanticsProviderTest.java | 5 +-
legacy/extensions/core/runtime/pom.xml | 13 ---
legacy/mappings/restclient/pom.xml | 4 +-
legacy/testing/mavenplugin/pom.xml | 5 -
persistence/jdo/datanucleus-5/pom.xml | 59 ++++++++++--
.../adapterfactory/pojo/PojoAdapterTest.java | 4 +-
.../runtime/system/ObjectMemberAbstractTest.java | 4 +-
...AnnotationFacetFactoryTest_refineMetaModel.java | 4 +-
security/keycloak/pom.xml | 6 --
security/shiro/pom.xml | 63 ++++++++++--
...AuthenticatorOrAuthorizorTest_authenticate.java | 4 +-
...ticatorOrAuthorizorTest_isVisibleInAnyRole.java | 8 +-
subdomains/excel/applib/pom.xml | 2 +-
.../fixturescripts/ExcelDemoToDoItem_tearDown.java | 1 -
subdomains/excel/integtests/pom.xml | 4 -
subdomains/xdocreport/applib/pom.xml | 7 --
testing/fakedata/integtests/pom.xml | 4 -
testing/unittestsupport/applib/pom.xml | 52 +++++++++-
viewers/restfulobjects/jaxrs-resteasy-4/pom.xml | 5 -
viewers/restfulobjects/rendering/pom.xml | 55 ++++++++++-
.../JsonValueEncoderTest_appendValueAndFormat.java | 2 +-
.../JsonValueEncoderTest_asAdapter.java | 2 +-
.../JsonValueEncoderTest_asObject.java | 2 +-
viewers/restfulobjects/viewer/pom.xml | 60 +++++++++++-
..._ensureCompatibleAcceptHeader_ContractTest.java | 6 +-
.../context/ResourceContext_getArg_Test.java | 12 +--
...tsApplicationExceptionMapper_Test_Contract.java | 2 +-
...ulObjectsSessionFilter_lookupPassThru_Test.java | 2 +-
viewers/wicket/model/pom.xml | 50 +++++++++-
.../wicket/model/models/EntityModel_hintsTest.java | 2 +-
.../ScalarModel_isScalarSubtypingAnyOf_Test.java | 2 +-
viewers/wicket/ui/pom.xml | 20 ++--
.../datepicker/TextFieldWithDateTimePicker.java | 11 ---
...ollectionContentsSelectorDropdownPanelTest.java | 4 +-
.../jdkdates/DateConverterForJavaSqlDateTest.java | 4 +-
.../jdkdates/DateConverterForJavaUtilDateTest.java | 4 +-
.../jodatime/DateConverterForJodaDateTimeTest.java | 4 +-
.../DateConverterForJodaLocalDateTest.java | 4 +-
.../DateConverterForJodaLocalDateTimeTest.java | 4 +-
.../DateConverterForJdk8LocalDateTest.java | 4 +-
.../DateConverterForJdk8LocalDateTimeTest.java | 4 +-
.../DateConverterForJdk8OffsetDateTimeTest.java | 4 +-
...tAdapterMementoProviderForValueChoicesTest.java | 2 +-
viewers/wicket/viewer/pom.xml | 53 +++++++++--
...uthenticatedWebSessionForIsis_Authenticate.java | 2 +-
...thenticatedWebSessionForIsis_Instantiation.java | 4 +-
.../AuthenticatedWebSessionForIsis_SignIn.java | 2 +-
...uthenticatedWebSessionForIsis_TestAbstract.java | 4 +-
.../wicketapp/IsisWicketApplication_Defaults.java | 4 +-
.../wicketapp/IsisWicketApplication_Pages.java | 4 +-
202 files changed, 1015 insertions(+), 461 deletions(-)
copy {core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/comparable => api/applib/src/test/java/org/apache/isis/applib/unittestsupport}/ComparableContractTest_compareTo.java (93%)
copy {core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/comparable => api/applib/src/test/java/org/apache/isis/applib/unittestsupport}/ComparableContractTester.java (97%)
copy {core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/value => api/applib/src/test/java/org/apache/isis/applib/unittestsupport}/ValueTypeContractTestAbstract.java (97%)
rename core/{unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config => config/src/test/java/org/apache/isis/core/config/unittestsupport}/IsisConfigurationLegacy.java (99%)
rename core/{unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config => config/src/test/java/org/apache/isis/core/config/unittestsupport}/internal/_Config.java (96%)
rename core/{unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config => config/src/test/java/org/apache/isis/core/config/unittestsupport}/internal/_Config_Instance.java (97%)
rename core/{unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config => config/src/test/java/org/apache/isis/core/config/unittestsupport}/internal/_Config_LifecycleResource.java (96%)
rename core/{unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config => config/src/test/java/org/apache/isis/core/config/unittestsupport}/internal/_Config_Parsers.java (98%)
rename core/{unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config => config/src/test/java/org/apache/isis/core/config/unittestsupport}/internal/_Config_trim.java (95%)
delete mode 100644 core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithChecking.java
rename core/{detached-tests/src/test/java/org/apache/isis/core => metamodel/src/test/java/org/apache/isis/core/metamodel}/commons/internal/reflection/ReflectTest.java (98%)
rename core/{detached-tests => metamodel}/src/test/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinIntendedAs.java (100%)
rename core/{detached-tests => metamodel}/src/test/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinIntendedAsActionTest.java (100%)
rename core/{detached-tests => metamodel}/src/test/java/org/apache/isis/core/metamodel/facets/param/name/ParameterNameFacetTest.java (100%)
copy core/{unittestsupport/src/main/java/org/apache/isis/core => metamodel/src/test/java/org/apache/isis/core/metamodel}/unittestsupport/jmocking/ImposteriserUsingCodegenPlugin.java (98%)
copy core/{unittestsupport/src/main/java/org/apache/isis/core => metamodel/src/test/java/org/apache/isis/core/metamodel}/unittestsupport/jmocking/Imposterisers.java (94%)
copy core/{unittestsupport/src/main/java/org/apache/isis/core => metamodel/src/test/java/org/apache/isis/core/metamodel}/unittestsupport/jmocking/InjectIntoJMockAction.java (97%)
copy core/{unittestsupport/src/main/java/org/apache/isis/core => metamodel/src/test/java/org/apache/isis/core/metamodel}/unittestsupport/jmocking/IsisActions.java (96%)
copy core/{unittestsupport/src/main/java/org/apache/isis/core => metamodel/src/test/java/org/apache/isis/core/metamodel}/unittestsupport/jmocking/JMockActions.java (97%)
copy core/{unittestsupport/src/main/java/org/apache/isis/core => metamodel/src/test/java/org/apache/isis/core/metamodel}/unittestsupport/jmocking/JUnitRuleMockery2.java (98%)
copy core/{unittestsupport/src/main/java/org/apache/isis/core => metamodel/src/test/java/org/apache/isis/core/metamodel}/unittestsupport/jmocking/MyMockomatic.java (98%)
copy core/{unittestsupport/src/main/java/org/apache/isis/core => metamodel/src/test/java/org/apache/isis/core/metamodel}/unittestsupport/jmocking/PostponedAction.java (95%)
rename core/{detached-tests => runtimeservices}/src/test/java/org/apache/isis/core/runtimeservices/wrapper/proxy/ProxyCreatorTestUsingCodegenPlugin.java (100%)
delete mode 100644 core/unittestsupport/.gitignore
rename core/{detached-tests => unittestsupport}/src/test/java/org/apache/isis/core/unittestsupport/bidir/BidirectionalRelationshipContractTestAll.java (100%)
rename core/{detached-tests => unittestsupport}/src/test/java/org/apache/isis/core/unittestsupport/bidir/ChildDomainObject.java (100%)
rename core/{detached-tests => unittestsupport}/src/test/java/org/apache/isis/core/unittestsupport/bidir/InstantiatorForChildDomainObject.java (100%)
rename core/{detached-tests => unittestsupport}/src/test/java/org/apache/isis/core/unittestsupport/bidir/ParentDomainObject.java (100%)
rename core/{detached-tests => unittestsupport}/src/test/java/org/apache/isis/core/unittestsupport/bidir/PeerDomainObject.java (100%)
rename core/{detached-tests => unittestsupport}/src/test/java/org/apache/isis/core/unittestsupport/bidir/PeerDomainObjectForTesting.java (100%)
rename core/{detached-tests => unittestsupport}/src/test/java/org/apache/isis/core/unittestsupport/comparable/CategorizedDomainObject.java (100%)
rename core/{detached-tests => unittestsupport}/src/test/java/org/apache/isis/core/unittestsupport/comparable/CategorizedDomainObjectComparableContractTest_compareTo.java (100%)
rename core/{detached-tests/src/test/java/org/apache/isis/core/unittestsupport/files/FilesTest_deleteFiles.java => unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/files/Files_deleteFiles_Test.java} (98%)
rename core/{detached-tests => unittestsupport}/src/test/java/org/apache/isis/core/unittestsupport/jmocking/CollaboratingUsingConstructorInjection.java (100%)
rename core/{detached-tests => unittestsupport}/src/test/java/org/apache/isis/core/unittestsupport/jmocking/CollaboratingUsingSetterInjection.java (100%)
rename core/{detached-tests => unittestsupport}/src/test/java/org/apache/isis/core/unittestsupport/jmocking/Collaborator.java (100%)
rename core/{detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/ImposteriserTestUsingCodegenPlugin.java => unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/ImposteriserTestUsingCodegenPlugin_Test.java} (98%)
rename core/{detached-tests => unittestsupport}/src/test/java/org/apache/isis/core/unittestsupport/jmocking/IsisActionsTest_returnNewTransientInstance.java (100%)
rename core/{detached-tests => unittestsupport}/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JMockActionsTest_returnArgument.java (100%)
rename core/{detached-tests => unittestsupport}/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JMockActionsTest_returnEach.java (100%)
rename core/{detached-tests => unittestsupport}/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test.java (100%)
rename core/{detached-tests => unittestsupport}/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_constructorInjection_happyCase.java (100%)
rename core/{detached-tests => unittestsupport}/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_noClassUnderTest.java (100%)
rename core/{detached-tests => unittestsupport}/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_twoClassesUnderTest.java (100%)
rename core/{detached-tests => unittestsupport}/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_setterInjection_happyCase.java (100%)
rename core/{detached-tests => unittestsupport}/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithAllowing.java (89%)
rename core/{detached-tests => unittestsupport}/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithIgnoring.java (100%)
rename core/{detached-tests => unittestsupport}/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_happyCase.java (100%)
rename core/{detached-tests => unittestsupport}/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_sadCase.java (100%)
rename core/{detached-tests => unittestsupport}/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_happyCase.java (100%)
rename core/{detached-tests => unittestsupport}/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_sadCase.java (100%)
rename core/{detached-tests => unittestsupport}/src/test/java/org/apache/isis/core/unittestsupport/sortedsets/SomeDomainObject.java (100%)
rename core/{detached-tests => unittestsupport}/src/test/java/org/apache/isis/core/unittestsupport/sortedsets/SortedSetsContractTestAll.java (100%)
rename core/{detached-tests => unittestsupport}/src/test/java/org/apache/isis/core/unittestsupport/value/ValueTypeContractTestAbstract_BigIntegerTest.java (100%)
rename core/{detached-tests => unittestsupport}/src/test/java/org/apache/isis/core/unittestsupport/value/ValueTypeContractTestAbstract_ColorTest.java (100%)
rename core/{detached-tests => unittestsupport}/src/test/java/org/apache/isis/core/unittestsupport/value/ValueTypeContractTestAbstract_StringTest.java (100%)
create mode 100644 core/unittestsupport/src/test/resources/.gitignore
rename core/{detached-tests => unittestsupport}/src/test/resources/signed.jar (100%)
rename core/{detached-tests => unittestsupport}/xml/objects/CUS.xml (100%)
rename core/{detached-tests => unittestsupport}/xml/objects/CUS/1.txt (100%)
rename core/{detached-tests => unittestsupport}/xml/objects/CUS/1.xml (100%)
rename core/{detached-tests => unittestsupport}/xml/objects/CUS/2.xml (100%)
[isis] 12/25: ISIS-2273: fixing classpath for shiro
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2062
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 2d22da9310dbb6c0fab71c962ee41c598828b2ca
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jan 29 17:56:19 2020 +0000
ISIS-2273: fixing classpath for shiro
---
security/shiro/pom.xml | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/security/shiro/pom.xml b/security/shiro/pom.xml
index 6ef0ca5..e17ed06 100644
--- a/security/shiro/pom.xml
+++ b/security/shiro/pom.xml
@@ -73,6 +73,13 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-config</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
<scope>test</scope>
</dependency>
[isis] 16/25: ISIS-2273: more fixing of classpath
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2062
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 9efa59c18b17d35ebb567436b5b094d6907c65b3
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jan 29 18:10:33 2020 +0000
ISIS-2273: more fixing of classpath
---
.../facets/value/PercentageValueSemanticsProviderTest.java | 3 ++-
persistence/jdo/datanucleus-5/pom.xml | 7 +++++++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/legacy/extensions/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/PercentageValueSemanticsProviderTest.java b/legacy/extensions/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/PercentageValueSemanticsProviderTest.java
index b46f63f..fa23222 100644
--- a/legacy/extensions/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/PercentageValueSemanticsProviderTest.java
+++ b/legacy/extensions/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/PercentageValueSemanticsProviderTest.java
@@ -23,6 +23,7 @@ import org.junit.Before;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
import org.apache.isis.core.config.unittestsupport.internal._Config;
import org.apache.isis.legacy.applib.value.Percentage;
@@ -72,7 +73,7 @@ public class PercentageValueSemanticsProviderTest extends ValueSemanticsProvider
@Test
public void testParseTextEntryWithBlank() {
final Percentage parsed = adapter.parseTextEntry(percentage, "");
- assertEquals(null, parsed);
+ assertNull(parsed);
}
@Test
diff --git a/persistence/jdo/datanucleus-5/pom.xml b/persistence/jdo/datanucleus-5/pom.xml
index 622eaea..f1a7062 100644
--- a/persistence/jdo/datanucleus-5/pom.xml
+++ b/persistence/jdo/datanucleus-5/pom.xml
@@ -112,6 +112,13 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-config</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-runtimeservices</artifactId>
<type>test-jar</type>
<scope>test</scope>
[isis] 05/25: ISIS-2273: fixes failing test
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2062
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 696598328ec5a5afa19b1e6daa3c8597df24efab
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jan 29 17:03:36 2020 +0000
ISIS-2273: fixes failing test
---
core/detached-tests/src/test/resources/signed.jar | Bin 2997 -> 0 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/core/detached-tests/src/test/resources/signed.jar b/core/detached-tests/src/test/resources/signed.jar
deleted file mode 100644
index bdcf481..0000000
Binary files a/core/detached-tests/src/test/resources/signed.jar and /dev/null differ
[isis] 03/25: ISIS-2273: fixes compile issues for applib, I hope
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2062
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 62c04433314374edf98fdb6b98231497ec6903eb
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jan 29 16:56:16 2020 +0000
ISIS-2273: fixes compile issues for applib, I hope
---
api/applib/pom.xml | 23 ++++
.../services/i18n/TranslatableStringTest.java | 4 +-
.../ValueTypeContractTestAbstract.java | 132 +++++++++++++++++++++
.../applib/util/ObjectContractsTest_compareTo.java | 3 +-
.../ObjectContractsTest_equals_and_hashCode.java | 2 +-
.../applib/util/schema/CommonDtoUtils_Test.java | 4 +-
.../schema/CommonDtoUtils_setValueOn_Test.java | 4 +-
7 files changed, 164 insertions(+), 8 deletions(-)
diff --git a/api/applib/pom.xml b/api/applib/pom.xml
index 79d46a7..27c0b2b 100644
--- a/api/applib/pom.xml
+++ b/api/applib/pom.xml
@@ -109,6 +109,29 @@
</dependency>
<dependency>
+ <groupId>org.jmock</groupId>
+ <artifactId>jmock</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jmock</groupId>
+ <artifactId>jmock-junit4</artifactId>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit-dep</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.bytebuddy</groupId>
+ <artifactId>byte-buddy</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+
+ <dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>test</scope>
diff --git a/api/applib/src/test/java/org/apache/isis/applib/services/i18n/TranslatableStringTest.java b/api/applib/src/test/java/org/apache/isis/applib/services/i18n/TranslatableStringTest.java
index 0f6defe..53c33cd 100644
--- a/api/applib/src/test/java/org/apache/isis/applib/services/i18n/TranslatableStringTest.java
+++ b/api/applib/src/test/java/org/apache/isis/applib/services/i18n/TranslatableStringTest.java
@@ -20,13 +20,13 @@ package org.apache.isis.applib.services.i18n;
import org.jmock.Expectations;
import org.jmock.auto.Mock;
+import org.jmock.integration.junit4.JUnitRuleMockery;
import org.junit.Rule;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
public class TranslatableStringTest {
@@ -79,7 +79,7 @@ public class TranslatableStringTest {
public static class Translate extends TranslatableStringTest {
@Rule
- public JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(JUnitRuleMockery2.Mode.INTERFACES_AND_CLASSES);
+ public final JUnitRuleMockery context = new JUnitRuleMockery();
@Mock
private TranslationService mockTranslationService;
diff --git a/api/applib/src/test/java/org/apache/isis/applib/unittestsupport/ValueTypeContractTestAbstract.java b/api/applib/src/test/java/org/apache/isis/applib/unittestsupport/ValueTypeContractTestAbstract.java
new file mode 100644
index 0000000..6ae88b7
--- /dev/null
+++ b/api/applib/src/test/java/org/apache/isis/applib/unittestsupport/ValueTypeContractTestAbstract.java
@@ -0,0 +1,132 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.isis.applib.unittestsupport;
+
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.greaterThan;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assume.assumeThat;
+
+/**
+ * Contract test for value types ({@link #equals(Object) equals} and
+ * {@link #hashCode() hashCode}), and also {@link Comparable#compareTo(Object) compareTo} for
+ * any value types that also are {@link Comparable}
+ *
+ * <p>
+ * Used by core and domain apps only.
+ * </p>
+ */
+public abstract class ValueTypeContractTestAbstract<T> {
+
+ @Before
+ public void setUp() throws Exception {
+ assertSizeAtLeast(getObjectsWithSameValue(), 2);
+ assertSizeAtLeast(getObjectsWithDifferentValue(), 1);
+ }
+
+ private void assertSizeAtLeast(final List<T> objects, final int i) {
+ assertThat(objects, is(notNullValue()));
+ assertThat(objects.size(), is(greaterThan(i - 1)));
+ }
+
+ @Test
+ public void notEqualToNull() throws Exception {
+ for (final T o1 : getObjectsWithSameValue()) {
+ assertThat(o1.equals(null), is(false));
+ }
+ for (final T o1 : getObjectsWithDifferentValue()) {
+ assertThat(o1.equals(null), is(false));
+ }
+ }
+
+ @Test
+ public void reflexiveAndSymmetric() throws Exception {
+ for (final T o1 : getObjectsWithSameValue()) {
+ for (final T o2 : getObjectsWithSameValue()) {
+ assertThat(o1.equals(o2), is(true));
+ assertThat(o2.equals(o1), is(true));
+ assertThat(o1.hashCode(), is(equalTo(o2.hashCode())));
+ }
+ }
+ }
+
+ @Test
+ public void notEqual() throws Exception {
+ for (final T o1 : getObjectsWithSameValue()) {
+ for (final T o2 : getObjectsWithDifferentValue()) {
+ assertThat(o1.equals(o2), is(false));
+ assertThat(o2.equals(o1), is(false));
+ }
+ }
+ }
+
+ @Test
+ public void transitiveWhenEqual() throws Exception {
+ for (final T o1 : getObjectsWithSameValue()) {
+ for (final T o2 : getObjectsWithSameValue()) {
+ for (final Object o3 : getObjectsWithSameValue()) {
+ assertThat(o1.equals(o2), is(true));
+ assertThat(o2.equals(o3), is(true));
+ assertThat(o1.equals(o3), is(true));
+ }
+ }
+ }
+ }
+
+ @Test
+ @SuppressWarnings({ "rawtypes", "unchecked" })
+ public void comparableEquivalence() throws Exception {
+ for (final T o1 : getObjectsWithSameValue()) {
+ assumeThat(o1 instanceof Comparable, is(true));
+ Comparable c1 = (Comparable)o1;
+
+ for (final T o2 : getObjectsWithSameValue()) {
+ assumeThat(o2 instanceof Comparable, is(true));
+ Comparable c2 = (Comparable)o2;
+
+ assertThat(c1.compareTo(c2), is(0));
+ assertThat(c2.compareTo(c1), is(0));
+ }
+
+ for (final T o2 : getObjectsWithDifferentValue()) {
+ assumeThat(o2 instanceof Comparable, is(true));
+ Comparable c2 = (Comparable)o2;
+
+ final int x = c1.compareTo(c2);
+ final int y = c2.compareTo(c1);
+ assertThat(x, is(not(0)));
+
+ assertThat(x, is(-y));
+ }
+ }
+ }
+
+ protected abstract List<T> getObjectsWithSameValue();
+
+ protected abstract List<T> getObjectsWithDifferentValue();
+
+}
diff --git a/api/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_compareTo.java b/api/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_compareTo.java
index dc545f2..34bef57 100644
--- a/api/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_compareTo.java
+++ b/api/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_compareTo.java
@@ -20,7 +20,8 @@ import java.util.List;
import org.junit.Before;
-import org.apache.isis.core.unittestsupport.comparable.ComparableContractTest_compareTo;
+import org.apache.isis.applib.unittestsupport.ComparableContractTest_compareTo;
+
public class ObjectContractsTest_compareTo extends ComparableContractTest_compareTo<InvoiceItem> {
diff --git a/api/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_equals_and_hashCode.java b/api/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_equals_and_hashCode.java
index 3b2d109..84b915b 100644
--- a/api/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_equals_and_hashCode.java
+++ b/api/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_equals_and_hashCode.java
@@ -20,8 +20,8 @@ import java.util.List;
import org.junit.Before;
+import org.apache.isis.applib.unittestsupport.ValueTypeContractTestAbstract;
import org.apache.isis.core.commons.internal.collections._Lists;
-import org.apache.isis.core.unittestsupport.value.ValueTypeContractTestAbstract;
public class ObjectContractsTest_equals_and_hashCode extends ValueTypeContractTestAbstract<InvoiceItem3> {
diff --git a/api/applib/src/test/java/org/apache/isis/applib/util/schema/CommonDtoUtils_Test.java b/api/applib/src/test/java/org/apache/isis/applib/util/schema/CommonDtoUtils_Test.java
index dd99621..e7791fd 100644
--- a/api/applib/src/test/java/org/apache/isis/applib/util/schema/CommonDtoUtils_Test.java
+++ b/api/applib/src/test/java/org/apache/isis/applib/util/schema/CommonDtoUtils_Test.java
@@ -19,6 +19,7 @@
package org.apache.isis.applib.util.schema;
import org.jmock.auto.Mock;
+import org.jmock.integration.junit4.JUnitRuleMockery;
import org.junit.Assert;
import org.junit.Rule;
import org.junit.Test;
@@ -29,7 +30,6 @@ import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
import org.apache.isis.applib.services.bookmark.BookmarkService;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.schema.cmd.v2.MapDto;
import org.apache.isis.schema.common.v2.ValueDto;
import org.apache.isis.schema.common.v2.ValueType;
@@ -37,7 +37,7 @@ import org.apache.isis.schema.common.v2.ValueType;
public class CommonDtoUtils_Test {
@Rule
- public JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(JUnitRuleMockery2.Mode.INTERFACES_AND_CLASSES);
+ public JUnitRuleMockery context = new JUnitRuleMockery();
@Mock
private BookmarkService mockBookmarkService;
diff --git a/api/applib/src/test/java/org/apache/isis/applib/util/schema/CommonDtoUtils_setValueOn_Test.java b/api/applib/src/test/java/org/apache/isis/applib/util/schema/CommonDtoUtils_setValueOn_Test.java
index 50184ea..d4968ff 100644
--- a/api/applib/src/test/java/org/apache/isis/applib/util/schema/CommonDtoUtils_setValueOn_Test.java
+++ b/api/applib/src/test/java/org/apache/isis/applib/util/schema/CommonDtoUtils_setValueOn_Test.java
@@ -19,6 +19,7 @@
package org.apache.isis.applib.util.schema;
import org.jmock.auto.Mock;
+import org.jmock.integration.junit4.JUnitRuleMockery;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Rule;
@@ -31,7 +32,6 @@ import static org.hamcrest.CoreMatchers.nullValue;
import org.apache.isis.applib.services.bookmark.BookmarkService;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.applib.value.Clob;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.schema.common.v2.BlobDto;
import org.apache.isis.schema.common.v2.ClobDto;
import org.apache.isis.schema.common.v2.ValueDto;
@@ -40,7 +40,7 @@ import org.apache.isis.schema.common.v2.ValueType;
public class CommonDtoUtils_setValueOn_Test {
@Rule
- public JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(JUnitRuleMockery2.Mode.INTERFACES_AND_CLASSES);
+ public JUnitRuleMockery context = new JUnitRuleMockery();
@Mock
private BookmarkService mockBookmarkService;
[isis] 22/25: ISIS-2273: removing core references to
isis-core-unittestsupport, ctd
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2062
in repository https://gitbox.apache.org/repos/asf/isis.git
commit d244d2d304d1924011681d47e7854b6370e66317
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jan 29 19:04:45 2020 +0000
ISIS-2273: removing core references to isis-core-unittestsupport, ctd
---
core/detached-tests/pom.xml | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/core/detached-tests/pom.xml b/core/detached-tests/pom.xml
index 43a20e4..f125a90 100644
--- a/core/detached-tests/pom.xml
+++ b/core/detached-tests/pom.xml
@@ -42,6 +42,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-commons</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
@@ -51,6 +52,34 @@
</dependency>
<dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-config</artifactId>
<type>test-jar</type>
[isis] 21/25: ISIS-2273: removing core references to
isis-core-unittestsupport
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2062
in repository https://gitbox.apache.org/repos/asf/isis.git
commit b2883300569d0943e14edb04bdfcaf8439df46ef
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jan 29 18:57:59 2020 +0000
ISIS-2273: removing core references to isis-core-unittestsupport
---
.../system/OneToManyAssociationDefaultTest.java | 4 +-
core/runtimeservices/pom.xml | 46 +++++++++++++++-
.../core/runtimeservices/i18n/po/PoReaderTest.java | 2 +-
.../wrapper/WrapperFactoryDefaultTest.java | 2 +-
.../WrapperFactoryDefault_wrappedObject_Test.java | 6 +--
...actoryDefault_wrappedObject_transient_Test.java | 6 +--
...RuleMockery2Test_mockAnnotatedWithAllowing.java | 6 ---
...RuleMockery2Test_mockAnnotatedWithChecking.java | 61 ----------------------
legacy/extensions/core/applib/pom.xml | 22 ++++++++
legacy/extensions/core/commons/pom.xml | 21 ++++++++
legacy/extensions/core/metamodel/pom.xml | 22 ++++++++
persistence/jdo/datanucleus-5/pom.xml | 50 ++++++++++++++++--
.../adapterfactory/pojo/PojoAdapterTest.java | 4 +-
.../runtime/system/ObjectMemberAbstractTest.java | 4 +-
...AnnotationFacetFactoryTest_refineMetaModel.java | 4 +-
security/shiro/pom.xml | 51 ++++++++++++++++++
...AuthenticatorOrAuthorizorTest_authenticate.java | 4 +-
...ticatorOrAuthorizorTest_isVisibleInAnyRole.java | 4 +-
subdomains/excel/applib/pom.xml | 5 ++
viewers/restfulobjects/rendering/pom.xml | 52 +++++++++++++++++-
.../JsonValueEncoderTest_appendValueAndFormat.java | 2 +-
.../JsonValueEncoderTest_asAdapter.java | 2 +-
.../JsonValueEncoderTest_asObject.java | 2 +-
viewers/restfulobjects/viewer/pom.xml | 50 ++++++++++++++++--
..._ensureCompatibleAcceptHeader_ContractTest.java | 2 +-
.../context/ResourceContext_getArg_Test.java | 4 +-
...tsApplicationExceptionMapper_Test_Contract.java | 2 +-
...ulObjectsSessionFilter_lookupPassThru_Test.java | 2 +-
viewers/wicket/model/pom.xml | 45 ++++++++++++++++
.../wicket/model/models/EntityModel_hintsTest.java | 2 +-
.../ScalarModel_isScalarSubtypingAnyOf_Test.java | 2 +-
...ollectionContentsSelectorDropdownPanelTest.java | 4 +-
.../jdkdates/DateConverterForJavaSqlDateTest.java | 4 +-
.../jdkdates/DateConverterForJavaUtilDateTest.java | 4 +-
.../jodatime/DateConverterForJodaDateTimeTest.java | 4 +-
.../DateConverterForJodaLocalDateTest.java | 4 +-
.../DateConverterForJodaLocalDateTimeTest.java | 4 +-
.../DateConverterForJdk8LocalDateTest.java | 4 +-
.../DateConverterForJdk8LocalDateTimeTest.java | 4 +-
.../DateConverterForJdk8OffsetDateTimeTest.java | 4 +-
...tAdapterMementoProviderForValueChoicesTest.java | 2 +-
viewers/wicket/viewer/pom.xml | 41 +++++++++++++++
...uthenticatedWebSessionForIsis_Authenticate.java | 2 +-
...thenticatedWebSessionForIsis_Instantiation.java | 4 +-
.../AuthenticatedWebSessionForIsis_SignIn.java | 2 +-
...uthenticatedWebSessionForIsis_TestAbstract.java | 4 +-
.../wicketapp/IsisWicketApplication_Defaults.java | 4 +-
.../wicketapp/IsisWicketApplication_Pages.java | 4 +-
48 files changed, 456 insertions(+), 134 deletions(-)
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationDefaultTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationDefaultTest.java
index 887ba15..4ae2a96 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationDefaultTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationDefaultTest.java
@@ -44,8 +44,8 @@ import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.specloader.specimpl.OneToManyAssociationDefault;
import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class OneToManyAssociationDefaultTest {
diff --git a/core/runtimeservices/pom.xml b/core/runtimeservices/pom.xml
index b44927c..3909c2f 100644
--- a/core/runtimeservices/pom.xml
+++ b/core/runtimeservices/pom.xml
@@ -97,7 +97,51 @@
<scope>test</scope>
</dependency>
- <!-- HSQL-DB -->
+ <dependency>
+ <groupId>org.jmock</groupId>
+ <artifactId>jmock</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jmock</groupId>
+ <artifactId>jmock-junit4</artifactId>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit-dep</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.bytebuddy</groupId>
+ <artifactId>byte-buddy</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- HSQL-DB -->
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
diff --git a/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/i18n/po/PoReaderTest.java b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/i18n/po/PoReaderTest.java
index 4b18dd9..fe8a925 100644
--- a/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/i18n/po/PoReaderTest.java
+++ b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/i18n/po/PoReaderTest.java
@@ -36,7 +36,7 @@ import org.apache.isis.applib.services.i18n.LocaleProvider;
import org.apache.isis.applib.services.i18n.TranslationsResolver;
import org.apache.isis.core.commons.collections.Can;
import org.apache.isis.core.commons.internal.collections._Lists;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2;
public class PoReaderTest {
diff --git a/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefaultTest.java b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefaultTest.java
index eb3c2f7..9950770 100644
--- a/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefaultTest.java
+++ b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefaultTest.java
@@ -33,7 +33,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.applib.services.wrapper.WrappingObject;
import org.apache.isis.core.commons.internal.plugins.codegen.ProxyFactoryService;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2;
import lombok.RequiredArgsConstructor;
diff --git a/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
index 722bc0c..43e471a 100644
--- a/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
+++ b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
@@ -73,8 +73,8 @@ import org.apache.isis.core.runtimeservices.wrapper.dom.employees.EmployeeReposi
import org.apache.isis.core.runtimeservices.wrapper.dom.employees.EmployeeRepositoryImpl;
import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.security.authentication.standard.SimpleSession;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.schema.cmd.v2.CommandDto;
import lombok.val;
@@ -107,7 +107,7 @@ public class WrapperFactoryDefault_wrappedObject_Test {
@Mock private ManagedObject mockAdapterForStringSmith;
@Mock private ManagedObject mockAdapterForStringJones;
- private final SimpleSession session = new SimpleSession("tester", Collections.<String>emptyList());
+ private final SimpleSession session = new SimpleSession("tester", Collections.emptyList());
private EmployeeRepository employeeRepository;
diff --git a/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java
index dc8ae0e..d14e75b 100644
--- a/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java
+++ b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java
@@ -67,10 +67,10 @@ import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.core.runtimeservices.wrapper.dom.employees.Employee;
import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.security.authentication.standard.SimpleSession;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-import static org.apache.isis.core.unittestsupport.jmocking.PostponedAction.returnValuePostponed;
+import static org.apache.isis.core.metamodel.unittestsupport.jmocking.PostponedAction.returnValuePostponed;
import lombok.val;
diff --git a/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithAllowing.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithAllowing.java
index e22c5a6..eed29a7 100644
--- a/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithAllowing.java
+++ b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithAllowing.java
@@ -39,12 +39,6 @@ public class JUnitRuleMockery2Test_mockAnnotatedWithAllowing {
@ClassUnderTest
private CollaboratingUsingConstructorInjection collaborating;
- // no longer necessary :-)
- // @Before
- // public void setUp() throws Exception {
- // collaborating = (CollaboratingUsingConstructorInjection) context.getClassUnderTest();
- // }
-
@Test
public void invocationOnCollaboratorIsIgnored() {
collaborating.collaborateWithCollaborator();
diff --git a/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithChecking.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithChecking.java
deleted file mode 100644
index b71427d..0000000
--- a/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithChecking.java
+++ /dev/null
@@ -1,61 +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.core.unittestsupport.jmocking;
-
-import org.jmock.auto.Mock;
-import org.junit.Rule;
-import org.junit.Test;
-
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Checking;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.ClassUnderTest;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.ExpectationsOn;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-
-public class JUnitRuleMockery2Test_mockAnnotatedWithChecking {
-
- @Rule
- public JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(Mode.INTERFACES_AND_CLASSES);
-
- public static class ExpectCall extends ExpectationsOn<Collaborator> {
- public ExpectCall(Object mock) {
- super(mock);
- }
- {
- oneOf(mock()).doOtherStuff();
- }}
-
- @Checking(ExpectCall.class)
- @Mock
- private Collaborator collaborator;
-
- @ClassUnderTest
- private CollaboratingUsingConstructorInjection collaborating;
-
- // no longer necessary :-)
- // @Before
- // public void setUp() throws Exception {
- // collaborating = (CollaboratingUsingConstructorInjection) context.getClassUnderTest();
- // }
-
- @Test
- public void invocationOnCollaboratorIsIgnored() {
- collaborating.collaborateWithCollaborator();
- }
-}
diff --git a/legacy/extensions/core/applib/pom.xml b/legacy/extensions/core/applib/pom.xml
index c2b4d17..0189205 100644
--- a/legacy/extensions/core/applib/pom.xml
+++ b/legacy/extensions/core/applib/pom.xml
@@ -73,6 +73,28 @@
<!-- TEST DEPENDENCY -->
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
</project>
\ No newline at end of file
diff --git a/legacy/extensions/core/commons/pom.xml b/legacy/extensions/core/commons/pom.xml
index 5f82d24..ad64592 100644
--- a/legacy/extensions/core/commons/pom.xml
+++ b/legacy/extensions/core/commons/pom.xml
@@ -72,6 +72,27 @@
<!-- TEST DEPENDENCY -->
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
diff --git a/legacy/extensions/core/metamodel/pom.xml b/legacy/extensions/core/metamodel/pom.xml
index ad1853d..f7c68f6 100644
--- a/legacy/extensions/core/metamodel/pom.xml
+++ b/legacy/extensions/core/metamodel/pom.xml
@@ -93,6 +93,28 @@
<type>test-jar</type>
</dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
</project>
\ No newline at end of file
diff --git a/persistence/jdo/datanucleus-5/pom.xml b/persistence/jdo/datanucleus-5/pom.xml
index f95817b..f2c15c4 100644
--- a/persistence/jdo/datanucleus-5/pom.xml
+++ b/persistence/jdo/datanucleus-5/pom.xml
@@ -102,8 +102,30 @@
<!-- TESTING -->
-
- <dependency>
+
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-runtime</artifactId>
<type>test-jar</type>
@@ -130,7 +152,29 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
-
+
+ <dependency>
+ <groupId>org.jmock</groupId>
+ <artifactId>jmock</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jmock</groupId>
+ <artifactId>jmock-junit4</artifactId>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit-dep</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.bytebuddy</groupId>
+ <artifactId>byte-buddy</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
</dependencies>
diff --git a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
index d7350f5..10d7e3b 100644
--- a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
+++ b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
@@ -33,8 +33,8 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.persistence.adapter.PojoAdapter;
import org.apache.isis.core.security.authentication.AuthenticationSession;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class PojoAdapterTest {
diff --git a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
index 34e030f..2adf82b 100644
--- a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
+++ b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
@@ -63,8 +63,8 @@ import org.apache.isis.core.metamodel.specloader.specimpl.ObjectMemberAbstract;
import org.apache.isis.core.runtime.persistence.adapter.PojoAdapter;
import org.apache.isis.core.security.authentication.AuthenticationSession;
import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class ObjectMemberAbstractTest {
diff --git a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest_refineMetaModel.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest_refineMetaModel.java
index 75236c4..b928d12 100644
--- a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest_refineMetaModel.java
+++ b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest_refineMetaModel.java
@@ -37,8 +37,8 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidator;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorAbstract;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorVisiting.Visitor;
import org.apache.isis.core.metamodel.specloader.validator.ValidationFailures;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import lombok.val;
diff --git a/security/shiro/pom.xml b/security/shiro/pom.xml
index 2d77506..cc6c50a 100644
--- a/security/shiro/pom.xml
+++ b/security/shiro/pom.xml
@@ -86,6 +86,57 @@
<artifactId>shiro-web</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-metamodel</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jmock</groupId>
+ <artifactId>jmock</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jmock</groupId>
+ <artifactId>jmock-junit4</artifactId>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit-dep</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.bytebuddy</groupId>
+ <artifactId>byte-buddy</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
</dependencies>
</project>
diff --git a/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java b/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
index a9cb3d3..8942b2c 100644
--- a/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
+++ b/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
@@ -41,8 +41,8 @@ import org.apache.isis.core.security.authentication.AuthenticationRequestPasswor
import org.apache.isis.core.security.authentication.AuthenticationSession;
import org.apache.isis.security.shiro.authentication.AuthenticatorShiro;
import org.apache.isis.security.shiro.authorization.AuthorizorShiro;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import lombok.val;
diff --git a/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java b/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
index e4665fb..d74af73 100644
--- a/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
+++ b/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
@@ -39,8 +39,8 @@ import org.apache.isis.core.security.authentication.AuthenticationRequest;
import org.apache.isis.core.security.authentication.AuthenticationRequestPassword;
import org.apache.isis.security.shiro.authentication.AuthenticatorShiro;
import org.apache.isis.security.shiro.authorization.AuthorizorShiro;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import lombok.val;
diff --git a/subdomains/excel/applib/pom.xml b/subdomains/excel/applib/pom.xml
index c9baf99..27ce30b 100644
--- a/subdomains/excel/applib/pom.xml
+++ b/subdomains/excel/applib/pom.xml
@@ -71,6 +71,11 @@
</dependency>
<!-- test -->
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-unittestsupport</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
diff --git a/viewers/restfulobjects/rendering/pom.xml b/viewers/restfulobjects/rendering/pom.xml
index c2ea906..98822a7 100644
--- a/viewers/restfulobjects/rendering/pom.xml
+++ b/viewers/restfulobjects/rendering/pom.xml
@@ -47,8 +47,58 @@
</dependency>
<!-- TEST DEPENDENCIES -->
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-metamodel</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jmock</groupId>
+ <artifactId>jmock</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jmock</groupId>
+ <artifactId>jmock-junit4</artifactId>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit-dep</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.bytebuddy</groupId>
+ <artifactId>byte-buddy</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
- </dependencies>
+ </dependencies>
</project>
diff --git a/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_appendValueAndFormat.java b/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_appendValueAndFormat.java
index 6e8da50..6e0a806 100644
--- a/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_appendValueAndFormat.java
+++ b/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_appendValueAndFormat.java
@@ -39,7 +39,7 @@ import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
public class JsonValueEncoderTest_appendValueAndFormat {
diff --git a/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_asAdapter.java b/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_asAdapter.java
index 04062e7..37940f6 100644
--- a/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_asAdapter.java
+++ b/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_asAdapter.java
@@ -49,7 +49,7 @@ import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import lombok.val;
diff --git a/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_asObject.java b/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_asObject.java
index e45fd91..8126db3 100644
--- a/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_asObject.java
+++ b/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_asObject.java
@@ -37,7 +37,7 @@ import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2;
public class JsonValueEncoderTest_asObject {
diff --git a/viewers/restfulobjects/viewer/pom.xml b/viewers/restfulobjects/viewer/pom.xml
index ce9f713..7ce0a51 100644
--- a/viewers/restfulobjects/viewer/pom.xml
+++ b/viewers/restfulobjects/viewer/pom.xml
@@ -62,14 +62,58 @@
<!-- TEST DEPENDENCIES -->
-
- <dependency>
+
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-metamodel</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
-
+
+ <dependency>
+ <groupId>org.jmock</groupId>
+ <artifactId>jmock</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jmock</groupId>
+ <artifactId>jmock-junit4</artifactId>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit-dep</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.bytebuddy</groupId>
+ <artifactId>byte-buddy</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
</dependencies>
diff --git a/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
index 6afde19..e07c73c 100644
--- a/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
+++ b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
@@ -46,7 +46,7 @@ import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
import org.apache.isis.core.runtime.session.IsisSession;
import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.core.security.authentication.AuthenticationSession;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
import org.apache.isis.viewer.restfulobjects.applib.RestfulResponse.HttpStatusCode;
import org.apache.isis.viewer.restfulobjects.rendering.RestfulObjectsApplicationException;
diff --git a/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java
index 9a488ce..a257ca9 100644
--- a/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java
+++ b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java
@@ -41,8 +41,8 @@ import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
import org.apache.isis.core.runtime.session.IsisSession;
import org.apache.isis.core.security.authentication.AuthenticationSession;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
import org.apache.isis.viewer.restfulobjects.applib.RestfulRequest.RequestParameter;
diff --git a/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/RestfulObjectsApplicationExceptionMapper_Test_Contract.java b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/RestfulObjectsApplicationExceptionMapper_Test_Contract.java
index ca24e3b..ce7bb78 100644
--- a/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/RestfulObjectsApplicationExceptionMapper_Test_Contract.java
+++ b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/RestfulObjectsApplicationExceptionMapper_Test_Contract.java
@@ -31,7 +31,7 @@ import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.RestfulResponse.HttpStatusCode;
import org.apache.isis.viewer.restfulobjects.applib.util.JsonMapper;
diff --git a/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsSessionFilter_lookupPassThru_Test.java b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsSessionFilter_lookupPassThru_Test.java
index 9f2da79..b61f514 100644
--- a/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsSessionFilter_lookupPassThru_Test.java
+++ b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsSessionFilter_lookupPassThru_Test.java
@@ -31,7 +31,7 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2;
public class IsisRestfulObjectsSessionFilter_lookupPassThru_Test {
diff --git a/viewers/wicket/model/pom.xml b/viewers/wicket/model/pom.xml
index 75a2873..1590141 100644
--- a/viewers/wicket/model/pom.xml
+++ b/viewers/wicket/model/pom.xml
@@ -70,12 +70,57 @@
<!-- TEST DEPENDENCIES -->
<dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+
+ <dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-metamodel</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.jmock</groupId>
+ <artifactId>jmock</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jmock</groupId>
+ <artifactId>jmock-junit4</artifactId>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit-dep</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.bytebuddy</groupId>
+ <artifactId>byte-buddy</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
</dependencies>
diff --git a/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/EntityModel_hintsTest.java b/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/EntityModel_hintsTest.java
index f47979a..05aa366 100644
--- a/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/EntityModel_hintsTest.java
+++ b/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/EntityModel_hintsTest.java
@@ -33,7 +33,7 @@ import static org.junit.Assert.assertThat;
import org.apache.isis.core.metamodel.MetaModelContext_forTesting;
import org.apache.isis.core.metamodel.context.MetaModelContext;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import lombok.val;
diff --git a/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/ScalarModel_isScalarSubtypingAnyOf_Test.java b/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/ScalarModel_isScalarSubtypingAnyOf_Test.java
index 5130849..dc866a1 100644
--- a/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/ScalarModel_isScalarSubtypingAnyOf_Test.java
+++ b/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/ScalarModel_isScalarSubtypingAnyOf_Test.java
@@ -32,7 +32,7 @@ import org.apache.isis.core.metamodel.MetaModelContext_forTesting;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.objectmanager.ObjectManager;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import org.apache.isis.core.webapp.context.memento.ObjectMementoService;
diff --git a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionContentsSelectorDropdownPanelTest.java b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionContentsSelectorDropdownPanelTest.java
index 1b8ef3a..90b5cfd 100644
--- a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionContentsSelectorDropdownPanelTest.java
+++ b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionContentsSelectorDropdownPanelTest.java
@@ -31,8 +31,8 @@ import static org.junit.Assert.assertThat;
import org.apache.isis.core.metamodel.MetaModelContext_forTesting;
import org.apache.isis.core.metamodel.context.MetaModelContext;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.viewer.wicket.ui.ComponentFactory;
import org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable.CollectionContentsAsAjaxTablePanelFactory;
import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
diff --git a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaSqlDateTest.java b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaSqlDateTest.java
index 91e5cfb..0fef181 100644
--- a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaSqlDateTest.java
+++ b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaSqlDateTest.java
@@ -27,8 +27,8 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
public class DateConverterForJavaSqlDateTest {
diff --git a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaUtilDateTest.java b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaUtilDateTest.java
index 21c771f..7ad1c54 100644
--- a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaUtilDateTest.java
+++ b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaUtilDateTest.java
@@ -29,8 +29,8 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
public class DateConverterForJavaUtilDateTest {
diff --git a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaDateTimeTest.java b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaDateTimeTest.java
index b1b7b94..70f0ee7 100644
--- a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaDateTimeTest.java
+++ b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaDateTimeTest.java
@@ -28,8 +28,8 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
public class DateConverterForJodaDateTimeTest {
diff --git a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTest.java b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTest.java
index 28b307f..2e4977f 100644
--- a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTest.java
+++ b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTest.java
@@ -28,8 +28,8 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
public class DateConverterForJodaLocalDateTest {
diff --git a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTimeTest.java b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTimeTest.java
index 1a121de..64cb40a 100644
--- a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTimeTest.java
+++ b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTimeTest.java
@@ -28,8 +28,8 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
public class DateConverterForJodaLocalDateTimeTest {
diff --git a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8LocalDateTest.java b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8LocalDateTest.java
index 7802a55..5d0280c 100644
--- a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8LocalDateTest.java
+++ b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8LocalDateTest.java
@@ -29,8 +29,8 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
import org.apache.isis.viewer.wicket.ui.components.scalars.jdk8time.DateConverterForJdk8LocalDate;
diff --git a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8LocalDateTimeTest.java b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8LocalDateTimeTest.java
index 49529ac..97b95f1 100644
--- a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8LocalDateTimeTest.java
+++ b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8LocalDateTimeTest.java
@@ -29,8 +29,8 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
import org.apache.isis.viewer.wicket.ui.components.scalars.jdk8time.DateConverterForJdk8LocalDateTime;
diff --git a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8OffsetDateTimeTest.java b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8OffsetDateTimeTest.java
index 3d60b86..523694d 100644
--- a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8OffsetDateTimeTest.java
+++ b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8OffsetDateTimeTest.java
@@ -29,8 +29,8 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
import org.apache.isis.viewer.wicket.ui.components.scalars.jdk8time.DateConverterForJdk8OffsetDateTime;
diff --git a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ObjectAdapterMementoProviderForValueChoicesTest.java b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ObjectAdapterMementoProviderForValueChoicesTest.java
index 02b3459..13f3df2 100644
--- a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ObjectAdapterMementoProviderForValueChoicesTest.java
+++ b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ObjectAdapterMementoProviderForValueChoicesTest.java
@@ -35,7 +35,7 @@ import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.widgets.select2.providers.ObjectAdapterMementoProviderForValueChoices;
diff --git a/viewers/wicket/viewer/pom.xml b/viewers/wicket/viewer/pom.xml
index 3c6a348..435dcc2 100644
--- a/viewers/wicket/viewer/pom.xml
+++ b/viewers/wicket/viewer/pom.xml
@@ -170,8 +170,49 @@
<groupId>junit</groupId>
<artifactId>junit-dep</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>net.bytebuddy</groupId>
+ <artifactId>byte-buddy</artifactId>
+ </exclusion>
</exclusions>
</dependency>
+
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-metamodel</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jmock</groupId>
+ <artifactId>jmock</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
diff --git a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Authenticate.java b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Authenticate.java
index feae634..f807763 100644
--- a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Authenticate.java
+++ b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Authenticate.java
@@ -44,7 +44,7 @@ import org.apache.isis.core.security.authentication.manager.AuthenticationManage
import org.apache.isis.core.security.authentication.standard.Authenticator;
import org.apache.isis.core.security.authentication.standard.RandomCodeGeneratorDefault;
import org.apache.isis.core.security.authentication.standard.SimpleSession;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
public class AuthenticatedWebSessionForIsis_Authenticate {
diff --git a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Instantiation.java b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Instantiation.java
index 0fbed87..8ffbdc9 100644
--- a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Instantiation.java
+++ b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Instantiation.java
@@ -27,8 +27,8 @@ import org.jmock.auto.Mock;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class AuthenticatedWebSessionForIsis_Instantiation {
diff --git a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_SignIn.java b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_SignIn.java
index f379664..6962b43 100644
--- a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_SignIn.java
+++ b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_SignIn.java
@@ -41,7 +41,7 @@ import org.apache.isis.core.security.authentication.AuthenticationRequestPasswor
import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
import org.apache.isis.core.security.authentication.standard.Authenticator;
import org.apache.isis.core.security.authentication.standard.RandomCodeGeneratorDefault;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
public class AuthenticatedWebSessionForIsis_SignIn {
diff --git a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_TestAbstract.java b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_TestAbstract.java
index fd36163..5fe61fa 100644
--- a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_TestAbstract.java
+++ b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_TestAbstract.java
@@ -31,8 +31,8 @@ import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.applib.services.session.SessionLoggingService;
import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
public abstract class AuthenticatedWebSessionForIsis_TestAbstract {
diff --git a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_Defaults.java b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_Defaults.java
index 2deab61..535fb4e 100644
--- a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_Defaults.java
+++ b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_Defaults.java
@@ -33,8 +33,8 @@ import static org.hamcrest.Matchers.nullValue;
import static org.junit.Assert.assertThat;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.viewer.wicket.viewer.integration.AuthenticatedWebSessionForIsis;
import org.apache.isis.core.webapp.context.memento.ObjectMemento;
diff --git a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_Pages.java b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_Pages.java
index 111fb09..ec379a2 100644
--- a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_Pages.java
+++ b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_Pages.java
@@ -29,8 +29,8 @@ import org.junit.Test;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.viewer.wicket.model.models.PageType;
import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
import org.apache.isis.viewer.wicket.ui.pages.home.HomePage;
[isis] 04/25: ISIS-2273: fixes failing test
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2062
in repository https://gitbox.apache.org/repos/asf/isis.git
commit c99d8bbfd24e6d10c9c0e34bb25e76b480a44709
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jan 29 17:00:58 2020 +0000
ISIS-2273: fixes failing test
---
core/unittestsupport/.gitignore | 1 -
.../files/{FilesTest_deleteFiles.java => Files_deleteFiles_Test.java} | 2 +-
core/{detached-tests => unittestsupport}/xml/objects/CUS.xml | 0
core/{detached-tests => unittestsupport}/xml/objects/CUS/1.txt | 0
core/{detached-tests => unittestsupport}/xml/objects/CUS/1.xml | 0
core/{detached-tests => unittestsupport}/xml/objects/CUS/2.xml | 0
6 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/core/unittestsupport/.gitignore b/core/unittestsupport/.gitignore
deleted file mode 100644
index a48e45b..0000000
--- a/core/unittestsupport/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/target-ide
diff --git a/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/files/FilesTest_deleteFiles.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/files/Files_deleteFiles_Test.java
similarity index 98%
rename from core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/files/FilesTest_deleteFiles.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/files/Files_deleteFiles_Test.java
index a7ea30e..af8310e 100644
--- a/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/files/FilesTest_deleteFiles.java
+++ b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/files/Files_deleteFiles_Test.java
@@ -34,7 +34,7 @@ import org.apache.isis.core.unittestsupport.files.Files.Recursion;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-public class FilesTest_deleteFiles {
+public class Files_deleteFiles_Test {
@Rule
public JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(Mode.INTERFACES_AND_CLASSES);
diff --git a/core/detached-tests/xml/objects/CUS.xml b/core/unittestsupport/xml/objects/CUS.xml
similarity index 100%
rename from core/detached-tests/xml/objects/CUS.xml
rename to core/unittestsupport/xml/objects/CUS.xml
diff --git a/core/detached-tests/xml/objects/CUS/1.txt b/core/unittestsupport/xml/objects/CUS/1.txt
similarity index 100%
rename from core/detached-tests/xml/objects/CUS/1.txt
rename to core/unittestsupport/xml/objects/CUS/1.txt
diff --git a/core/detached-tests/xml/objects/CUS/1.xml b/core/unittestsupport/xml/objects/CUS/1.xml
similarity index 100%
rename from core/detached-tests/xml/objects/CUS/1.xml
rename to core/unittestsupport/xml/objects/CUS/1.xml
diff --git a/core/detached-tests/xml/objects/CUS/2.xml b/core/unittestsupport/xml/objects/CUS/2.xml
similarity index 100%
rename from core/detached-tests/xml/objects/CUS/2.xml
rename to core/unittestsupport/xml/objects/CUS/2.xml
[isis] 25/25: ISIS-2273: removing core references to
isis-core-unittestsupport, ctd
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2062
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 021b3c324b1d6d06fe9571faa312dc0f3db636a3
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jan 29 19:26:41 2020 +0000
ISIS-2273: removing core references to isis-core-unittestsupport, ctd
---
viewers/restfulobjects/viewer/pom.xml | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/viewers/restfulobjects/viewer/pom.xml b/viewers/restfulobjects/viewer/pom.xml
index 43c3b34..ea32ecd 100644
--- a/viewers/restfulobjects/viewer/pom.xml
+++ b/viewers/restfulobjects/viewer/pom.xml
@@ -28,7 +28,7 @@
<artifactId>isis-viewer-restfulobjects-viewer</artifactId>
- <name>Apache Isis Viewer - RO (Server)</name>
+ <name>Apache Isis Viewer - RO (Viewer)</name>
<properties>
<jar-plugin.automaticModuleName>org.apache.isis.viewer.restfulobjects.viewer</jar-plugin.automaticModuleName>
@@ -120,6 +120,12 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-codegen-bytebuddy</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
[isis] 07/25: ISIS-2273: fixes failing test
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2062
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 35b5f992afee30d1d615dd23083b077f6023adaa
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jan 29 17:08:42 2020 +0000
ISIS-2273: fixes failing test
---
core/unittestsupport/src/test/resources/.gitignore | 1 +
core/unittestsupport/src/test/resources/signed.jar | Bin 0 -> 2997 bytes
2 files changed, 1 insertion(+)
diff --git a/core/unittestsupport/src/test/resources/.gitignore b/core/unittestsupport/src/test/resources/.gitignore
new file mode 100644
index 0000000..72c5812
--- /dev/null
+++ b/core/unittestsupport/src/test/resources/.gitignore
@@ -0,0 +1 @@
+!signed.jar
\ No newline at end of file
diff --git a/core/unittestsupport/src/test/resources/signed.jar b/core/unittestsupport/src/test/resources/signed.jar
new file mode 100644
index 0000000..bdcf481
Binary files /dev/null and b/core/unittestsupport/src/test/resources/signed.jar differ
[isis] 13/25: ISIS-2273: fixing classpath for shiro
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2062
in repository https://gitbox.apache.org/repos/asf/isis.git
commit b399593c804ef95ed750dc62b07132fa5916ac2e
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jan 29 17:57:21 2020 +0000
ISIS-2273: fixing classpath for shiro
---
.../shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java b/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
index 19c0e4a..e065079 100644
--- a/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
+++ b/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
@@ -35,11 +35,11 @@ import static org.junit.Assert.assertThat;
import org.apache.isis.applib.Identifier;
import org.apache.isis.core.config.IsisConfiguration;
+import org.apache.isis.core.config.unittestsupport.IsisConfigurationLegacy;
import org.apache.isis.core.security.authentication.AuthenticationRequest;
import org.apache.isis.core.security.authentication.AuthenticationRequestPassword;
import org.apache.isis.security.shiro.authentication.AuthenticatorShiro;
import org.apache.isis.security.shiro.authorization.AuthorizorShiro;
-import org.apache.isis.core.unittestsupport.config.IsisConfigurationLegacy;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
[isis] 08/25: ISIS-2273: fixes failing test for metamodel
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2062
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 6f22c4ec8eabce0841cd05827ac520a1007eea6a
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jan 29 17:12:18 2020 +0000
ISIS-2273: fixes failing test for metamodel
reference config's test-jar instead
---
core/metamodel/pom.xml | 3 ++-
.../org/apache/isis/core/metamodel/MetaModelContext_forTesting.java | 6 +++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index 1721f76..5809749 100644
--- a/core/metamodel/pom.xml
+++ b/core/metamodel/pom.xml
@@ -116,8 +116,9 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
+ <artifactId>isis-core-config</artifactId>
<scope>test</scope>
+ <type>test-jar</type>
</dependency>
<dependency>
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_forTesting.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_forTesting.java
index cab5e78..da2fe83 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_forTesting.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_forTesting.java
@@ -39,6 +39,8 @@ import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.core.config.beans.IsisBeanTypeRegistry;
import org.apache.isis.core.config.beans.IsisBeanTypeRegistryHolder;
+import org.apache.isis.core.config.unittestsupport.IsisConfigurationLegacy;
+import org.apache.isis.core.config.unittestsupport.internal._Config;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.objectmanager.ObjectManager;
import org.apache.isis.core.metamodel.objectmanager.ObjectManagerDefault;
@@ -51,8 +53,6 @@ import org.apache.isis.core.security.authentication.AuthenticationSession;
import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
import org.apache.isis.core.security.authorization.manager.AuthorizationManager;
-import org.apache.isis.core.unittestsupport.config.IsisConfigurationLegacy;
-import org.apache.isis.core.unittestsupport.config._Config;
import lombok.Builder;
import lombok.Getter;
@@ -113,7 +113,7 @@ public final class MetaModelContext_forTesting implements MetaModelContext {
private List<Object> singletons;
//@Override
- public IsisConfigurationLegacy getConfigurationLegacy() {
+ public efereIsisConfigurationLegacy getConfigurationLegacy() {
return _Config.getConfiguration();
}
[isis] 09/25: ISIS-2273: fixing compile issues
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2062
in repository https://gitbox.apache.org/repos/asf/isis.git
commit b4468a2b09e1d70bc18fdf2e338bd53e65df11e6
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jan 29 17:30:59 2020 +0000
ISIS-2273: fixing compile issues
---
api/applib/pom.xml | 1 -
core/metamodel/pom.xml | 45 ++++++++++++++++++++++
.../metamodel/MetaModelContext_forTesting.java | 2 +-
.../oid/CollectionOidTest_valueSemantics.java | 2 +-
...dDefaultTest_valueSemantics_whenPersistent.java | 2 +-
5 files changed, 48 insertions(+), 4 deletions(-)
diff --git a/api/applib/pom.xml b/api/applib/pom.xml
index 27c0b2b..2b1f3e8 100644
--- a/api/applib/pom.xml
+++ b/api/applib/pom.xml
@@ -130,7 +130,6 @@
</exclusions>
</dependency>
-
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index 5809749..ba7c946 100644
--- a/core/metamodel/pom.xml
+++ b/core/metamodel/pom.xml
@@ -128,6 +128,51 @@
<scope>test</scope>
</dependency>
+ <!-- TEST -->
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jmock</groupId>
+ <artifactId>jmock</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jmock</groupId>
+ <artifactId>jmock-junit4</artifactId>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit-dep</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.bytebuddy</groupId>
+ <artifactId>byte-buddy</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_forTesting.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_forTesting.java
index da2fe83..7f989e0 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_forTesting.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_forTesting.java
@@ -113,7 +113,7 @@ public final class MetaModelContext_forTesting implements MetaModelContext {
private List<Object> singletons;
//@Override
- public efereIsisConfigurationLegacy getConfigurationLegacy() {
+ public IsisConfigurationLegacy getConfigurationLegacy() {
return _Config.getConfiguration();
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/CollectionOidTest_valueSemantics.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/CollectionOidTest_valueSemantics.java
index 2afaa7d..e1c5228 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/CollectionOidTest_valueSemantics.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/CollectionOidTest_valueSemantics.java
@@ -21,8 +21,8 @@ package org.apache.isis.core.metamodel.adapter.oid;
import java.util.Arrays;
import java.util.List;
+import org.apache.isis.applib.unittestsupport.ValueTypeContractTestAbstract;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
-import org.apache.isis.core.unittestsupport.value.ValueTypeContractTestAbstract;
public class CollectionOidTest_valueSemantics extends ValueTypeContractTestAbstract<ParentedOid> {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/RootOidDefaultTest_valueSemantics_whenPersistent.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/RootOidDefaultTest_valueSemantics_whenPersistent.java
index 715ef07..fa7fc68 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/RootOidDefaultTest_valueSemantics_whenPersistent.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/RootOidDefaultTest_valueSemantics_whenPersistent.java
@@ -21,8 +21,8 @@ package org.apache.isis.core.metamodel.adapter.oid;
import java.util.Arrays;
import java.util.List;
+import org.apache.isis.applib.unittestsupport.ValueTypeContractTestAbstract;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
-import org.apache.isis.core.unittestsupport.value.ValueTypeContractTestAbstract;
public class RootOidDefaultTest_valueSemantics_whenPersistent extends ValueTypeContractTestAbstract<RootOid> {
[isis] 19/25: ISIS-2273: removing core references to
isis-core-unittestsupport
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2062
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 1b8db46d5805dd4510794232b40161acc39b7025
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jan 29 18:34:53 2020 +0000
ISIS-2273: removing core references to isis-core-unittestsupport
---
core/runtime/pom.xml | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
index 542c6f0..80f9c47 100644
--- a/core/runtime/pom.xml
+++ b/core/runtime/pom.xml
@@ -81,6 +81,28 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<profiles>
[isis] 01/25: ISIS-2273: moves detached tests for unittestsupport,
copies a couple also used by config or applib
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2062
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 0c43914b4df4fcba855cf3dc3f73e3cf6f735b53
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jan 29 16:44:17 2020 +0000
ISIS-2273: moves detached tests for unittestsupport, copies a couple also used by config or applib
---
api/applib/pom.xml | 7 --
.../ComparableContractTest_compareTo.java | 9 ++-
.../unittestsupport/ComparableContractTester.java | 82 ++++++++++++++++++++++
.../config/IsisConfiguration_createSubsetTest.java | 4 +-
.../core/config/IsisConfiguration_primingTest.java | 2 +-
.../config/IsisConfiguration_specialCharTest.java | 4 +-
.../config/IsisConfiguration_whitespaceTest.java | 4 +-
.../unittestsupport}/IsisConfigurationLegacy.java | 2 +-
.../config/unittestsupport}/internal/_Config.java | 4 +-
.../internal/_Config_Instance.java | 4 +-
.../internal/_Config_LifecycleResource.java | 4 +-
.../unittestsupport}/internal/_Config_Parsers.java | 2 +-
.../unittestsupport}/internal/_Config_trim.java | 2 +-
.../metamodel/MetaModelContext_configTest.java | 2 +-
.../metamodel/MetaModelContext_forTesting.java | 2 +-
.../ViewModelSemanticCheckingFacetFactoryTest.java | 2 +-
.../object/defaults/DefaultedFacetFactoryTest.java | 2 +-
.../DomainObjectAnnotationFacetFactoryTest.java | 2 +-
.../DomainObjectLayoutFactoryTest.java | 2 +-
...eFacetAnnotationOrConfigurationFactoryTest.java | 2 +-
.../PropertyAnnotationFacetFactoryTest.java | 2 +-
.../BigDecimalValueSemanticsProviderTest.java | 2 +-
.../value/BigIntValueSemanticsProviderTest.java | 2 +-
.../value/ByteValueSemanticsProviderTest.java | 2 +-
.../value/DoubleValueSemanticsProviderTest.java | 2 +-
.../value/FloatValueSemanticsProviderTest.java | 2 +-
.../value/IntValueSemanticsProviderTest.java | 2 +-
.../JavaSqlDateValueSemanticsProviderTest.java | 2 +-
.../JavaSqlTimeValueSemanticsProviderTest.java | 2 +-
.../JavaUtilDateValueSemanticsProviderTest.java | 2 +-
.../value/LongValueSemanticsProviderTest.java | 2 +-
.../value/ShortValueSemanticsProviderTest.java | 2 +-
.../ValueSemanticsProviderAbstractTestCase.java | 2 +-
...odaLocalDateTimeValueSemanticsProviderTest.java | 2 +-
.../WrapperFactoryDefault_wrappedObject_Test.java | 2 +-
.../AbstractApplyToAllContractTest.java | 4 ++
...irectionalRelationshipContractTestAbstract.java | 5 ++
.../ComparableContractTest_compareTo.java | 7 ++
.../isis/core/unittestsupport/files/Files.java | 5 ++
.../core/unittestsupport/jaxb/JaxbMatchers.java | 4 +-
.../jmocking/JUnitRuleMockery2.java | 4 ++
.../soap/SoapEndpointPublishingRule.java | 4 +-
.../sortedsets/SortedSetsContractTestAbstract.java | 5 ++
.../unittestsupport/streams/NullPrintStream.java | 5 ++
.../core/unittestsupport/utils/CollectUtils.java | 5 ++
.../core/unittestsupport/utils/IndentPrinter.java | 4 ++
.../core/unittestsupport/utils/ReflectUtils.java | 5 ++
.../core/unittestsupport/utils/StringUtils.java | 5 ++
.../value/ValueTypeContractTestAbstract.java | 4 ++
.../BidirectionalRelationshipContractTestAll.java | 0
.../unittestsupport/bidir/ChildDomainObject.java | 0
.../bidir/InstantiatorForChildDomainObject.java | 0
.../unittestsupport/bidir/ParentDomainObject.java | 0
.../unittestsupport/bidir/PeerDomainObject.java | 0
.../bidir/PeerDomainObjectForTesting.java | 0
.../comparable/CategorizedDomainObject.java | 0
...mainObjectComparableContractTest_compareTo.java | 0
.../files/FilesTest_deleteFiles.java | 0
.../CollaboratingUsingConstructorInjection.java | 0
.../CollaboratingUsingSetterInjection.java | 0
.../unittestsupport/jmocking/Collaborator.java | 0
.../ImposteriserTestUsingCodegenPlugin.java | 0
...IsisActionsTest_returnNewTransientInstance.java | 0
.../jmocking/JMockActionsTest_returnArgument.java | 0
.../jmocking/JMockActionsTest_returnEach.java | 0
.../jmocking/JUnitRuleMockery2Test.java | 0
..._autoWiring_constructorInjection_happyCase.java | 0
...y2Test_autoWiring_sadCase_noClassUnderTest.java | 0
...est_autoWiring_sadCase_twoClassesUnderTest.java | 0
...2Test_autoWiring_setterInjection_happyCase.java | 0
...RuleMockery2Test_mockAnnotatedWithAllowing.java | 0
...RuleMockery2Test_mockAnnotatedWithChecking.java | 0
...RuleMockery2Test_mockAnnotatedWithIgnoring.java | 0
...kery2Test_mockAnnotatedWithNever_happyCase.java | 0
...ockery2Test_mockAnnotatedWithNever_sadCase.java | 0
...ockery2Test_mockAnnotatedWithOne_happyCase.java | 0
...eMockery2Test_mockAnnotatedWithOne_sadCase.java | 0
.../sortedsets/SomeDomainObject.java | 0
.../sortedsets/SortedSetsContractTestAll.java | 0
...lueTypeContractTestAbstract_BigIntegerTest.java | 0
.../ValueTypeContractTestAbstract_ColorTest.java | 0
.../ValueTypeContractTestAbstract_StringTest.java | 0
.../PercentageValueSemanticsProviderTest.java | 2 +-
83 files changed, 193 insertions(+), 49 deletions(-)
diff --git a/api/applib/pom.xml b/api/applib/pom.xml
index 44d7207..0f00fa0 100644
--- a/api/applib/pom.xml
+++ b/api/applib/pom.xml
@@ -91,13 +91,6 @@
<artifactId>annotations</artifactId>
</dependency>
- <!-- TESTS -->
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <scope>test</scope>
- </dependency>
-
</dependencies>
</project>
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/comparable/ComparableContractTest_compareTo.java b/api/applib/src/test/java/org/apache/isis/applib/unittestsupport/ComparableContractTest_compareTo.java
similarity index 93%
copy from core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/comparable/ComparableContractTest_compareTo.java
copy to api/applib/src/test/java/org/apache/isis/applib/unittestsupport/ComparableContractTest_compareTo.java
index f948a39..4d6abcd 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/comparable/ComparableContractTest_compareTo.java
+++ b/api/applib/src/test/java/org/apache/isis/applib/unittestsupport/ComparableContractTest_compareTo.java
@@ -16,13 +16,20 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.unittestsupport.comparable;
+package org.apache.isis.applib.unittestsupport;
import java.util.Arrays;
import java.util.List;
import org.junit.Test;
+/**
+ * <p>
+ * Used by core.
+ * </p>
+ *
+ * @param <T>
+ */
public abstract class ComparableContractTest_compareTo<T extends Comparable<T>> {
/**
diff --git a/api/applib/src/test/java/org/apache/isis/applib/unittestsupport/ComparableContractTester.java b/api/applib/src/test/java/org/apache/isis/applib/unittestsupport/ComparableContractTester.java
new file mode 100644
index 0000000..2145ab8
--- /dev/null
+++ b/api/applib/src/test/java/org/apache/isis/applib/unittestsupport/ComparableContractTester.java
@@ -0,0 +1,82 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.isis.applib.unittestsupport;
+
+import java.util.List;
+
+import org.hamcrest.Matchers;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+import org.apache.isis.core.commons.internal.collections._Lists;
+
+public class ComparableContractTester<T extends Comparable<T>> {
+
+
+ private final List<List<T>> orderedTuples;
+
+ /**
+ * Provide an array of tuples; each tuple should consist of 4 elements, whereby
+ * item0 < item1 = item2 < item3
+ *
+ * Typically item0 should be null valued (if supported by the impl).
+ */
+ public ComparableContractTester(List<List<T>> orderedTuples) {
+ this.orderedTuples = orderedTuples;
+ }
+
+ public void test() {
+
+ for(List<T> orderedTuple: orderedTuples) {
+
+ T item1 = orderedTuple.get(0);
+ T item2 = orderedTuple.get(1);
+ T item3 = orderedTuple.get(2);
+ T item4 = orderedTuple.get(3);
+
+ assertThat(desc(item1, "<", item2), item1.compareTo(item2), is(Matchers.lessThan(0)));
+ assertThat(desc(item2, ">", item1), item2.compareTo(item1), is(Matchers.greaterThan(0)));
+
+ assertThat(desc(item2, "==", item3), item2.compareTo(item3), is(0));
+ assertThat(desc(item3, "==", item2), item3.compareTo(item2), is(0));
+
+ assertThat(desc(item3, "<", item4), item3.compareTo(item4), is(Matchers.lessThan(0)));
+ assertThat(desc(item4, ">", item3), item4.compareTo(item3), is(Matchers.greaterThan(0)));
+ }
+ }
+
+ protected static String desc(Object item1, final String op, Object item2) {
+ return nullSafe(item1) + op + nullSafe(item2);
+ }
+
+ private static String nullSafe(Object item) {
+ return item != null? item.toString(): "null";
+ }
+
+ /**
+ * Syntax sugar to remove boilerplate from subclasses.
+ */
+ @SafeVarargs
+ public static <E> List<E> listOf(E... elements) {
+ return _Lists.of(elements);
+ }
+
+
+}
diff --git a/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_createSubsetTest.java b/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_createSubsetTest.java
index 46d5b3f..715cdfd 100644
--- a/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_createSubsetTest.java
+++ b/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_createSubsetTest.java
@@ -23,8 +23,8 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.apache.isis.core.unittestsupport.config.IsisConfigurationLegacy;
-import org.apache.isis.core.unittestsupport.config.internal._Config;
+import org.apache.isis.core.config.unittestsupport.IsisConfigurationLegacy;
+import org.apache.isis.core.config.unittestsupport.internal._Config;
import lombok.val;
diff --git a/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_primingTest.java b/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_primingTest.java
index 14d7eda..1d5a259 100644
--- a/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_primingTest.java
+++ b/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_primingTest.java
@@ -24,7 +24,7 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
-import org.apache.isis.core.unittestsupport.config.internal._Config;
+import org.apache.isis.core.config.unittestsupport.internal._Config;
import lombok.val;
diff --git a/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_specialCharTest.java b/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_specialCharTest.java
index 94e7ddb..4d9d805 100644
--- a/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_specialCharTest.java
+++ b/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_specialCharTest.java
@@ -23,8 +23,8 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.apache.isis.core.unittestsupport.config.IsisConfigurationLegacy;
-import org.apache.isis.core.unittestsupport.config.internal._Config;
+import org.apache.isis.core.config.unittestsupport.IsisConfigurationLegacy;
+import org.apache.isis.core.config.unittestsupport.internal._Config;
class IsisConfiguration_specialCharTest {
diff --git a/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_whitespaceTest.java b/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_whitespaceTest.java
index 314d13f..3d84b04 100644
--- a/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_whitespaceTest.java
+++ b/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_whitespaceTest.java
@@ -23,8 +23,8 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.apache.isis.core.unittestsupport.config.IsisConfigurationLegacy;
-import org.apache.isis.core.unittestsupport.config.internal._Config;
+import org.apache.isis.core.config.unittestsupport.IsisConfigurationLegacy;
+import org.apache.isis.core.config.unittestsupport.internal._Config;
class IsisConfiguration_whitespaceTest {
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/IsisConfigurationLegacy.java b/core/config/src/test/java/org/apache/isis/core/config/unittestsupport/IsisConfigurationLegacy.java
similarity index 99%
rename from core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/IsisConfigurationLegacy.java
rename to core/config/src/test/java/org/apache/isis/core/config/unittestsupport/IsisConfigurationLegacy.java
index 280af75..ae90f1a 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/IsisConfigurationLegacy.java
+++ b/core/config/src/test/java/org/apache/isis/core/config/unittestsupport/IsisConfigurationLegacy.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.unittestsupport.config;
+package org.apache.isis.core.config.unittestsupport;
import java.awt.Color;
import java.awt.Font;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/internal/_Config.java b/core/config/src/test/java/org/apache/isis/core/config/unittestsupport/internal/_Config.java
similarity index 96%
rename from core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/internal/_Config.java
rename to core/config/src/test/java/org/apache/isis/core/config/unittestsupport/internal/_Config.java
index 4aa4c99..5f225ba 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/internal/_Config.java
+++ b/core/config/src/test/java/org/apache/isis/core/config/unittestsupport/internal/_Config.java
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.unittestsupport.config.internal;
+package org.apache.isis.core.config.unittestsupport.internal;
import java.util.Map;
import org.apache.isis.core.commons.internal.collections._Maps;
import org.apache.isis.core.commons.internal.context._Context;
-import org.apache.isis.core.unittestsupport.config.IsisConfigurationLegacy;
+import org.apache.isis.core.config.unittestsupport.IsisConfigurationLegacy;
import lombok.val;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/internal/_Config_Instance.java b/core/config/src/test/java/org/apache/isis/core/config/unittestsupport/internal/_Config_Instance.java
similarity index 97%
rename from core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/internal/_Config_Instance.java
rename to core/config/src/test/java/org/apache/isis/core/config/unittestsupport/internal/_Config_Instance.java
index 75edf17..b80d80e 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/internal/_Config_Instance.java
+++ b/core/config/src/test/java/org/apache/isis/core/config/unittestsupport/internal/_Config_Instance.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.unittestsupport.config.internal;
+package org.apache.isis.core.config.unittestsupport.internal;
import java.awt.Color;
import java.awt.Font;
@@ -28,7 +28,7 @@ import javax.annotation.Nullable;
import org.apache.isis.core.commons.internal._Constants;
import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.core.commons.internal.collections._Maps;
-import org.apache.isis.core.unittestsupport.config.IsisConfigurationLegacy;
+import org.apache.isis.core.config.unittestsupport.IsisConfigurationLegacy;
import static org.apache.isis.core.commons.internal.base._With.computeIfAbsent;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/internal/_Config_LifecycleResource.java b/core/config/src/test/java/org/apache/isis/core/config/unittestsupport/internal/_Config_LifecycleResource.java
similarity index 96%
rename from core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/internal/_Config_LifecycleResource.java
rename to core/config/src/test/java/org/apache/isis/core/config/unittestsupport/internal/_Config_LifecycleResource.java
index 648c83a..5142e0c 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/internal/_Config_LifecycleResource.java
+++ b/core/config/src/test/java/org/apache/isis/core/config/unittestsupport/internal/_Config_LifecycleResource.java
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.unittestsupport.config.internal;
+package org.apache.isis.core.config.unittestsupport.internal;
import java.util.Map;
import java.util.Optional;
import org.apache.isis.core.commons.internal.base._Lazy;
-import org.apache.isis.core.unittestsupport.config.IsisConfigurationLegacy;
+import org.apache.isis.core.config.unittestsupport.IsisConfigurationLegacy;
import static org.apache.isis.core.commons.internal.base._With.requires;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/internal/_Config_Parsers.java b/core/config/src/test/java/org/apache/isis/core/config/unittestsupport/internal/_Config_Parsers.java
similarity index 98%
rename from core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/internal/_Config_Parsers.java
rename to core/config/src/test/java/org/apache/isis/core/config/unittestsupport/internal/_Config_Parsers.java
index 8b16995..6bef0a1 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/internal/_Config_Parsers.java
+++ b/core/config/src/test/java/org/apache/isis/core/config/unittestsupport/internal/_Config_Parsers.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.unittestsupport.config.internal;
+package org.apache.isis.core.config.unittestsupport.internal;
import java.awt.Color;
import java.awt.Font;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/internal/_Config_trim.java b/core/config/src/test/java/org/apache/isis/core/config/unittestsupport/internal/_Config_trim.java
similarity index 95%
rename from core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/internal/_Config_trim.java
rename to core/config/src/test/java/org/apache/isis/core/config/unittestsupport/internal/_Config_trim.java
index 6fdf7e1..aa19617 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/internal/_Config_trim.java
+++ b/core/config/src/test/java/org/apache/isis/core/config/unittestsupport/internal/_Config_trim.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.unittestsupport.config.internal;
+package org.apache.isis.core.config.unittestsupport.internal;
import java.util.Map;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_configTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_configTest.java
index ac12b31..73c6ee8 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_configTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_configTest.java
@@ -26,7 +26,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.unittestsupport.config.IsisConfigurationLegacy;
-import org.apache.isis.core.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config._Config;
import lombok.val;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_forTesting.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_forTesting.java
index 7f5e7aa..cab5e78 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_forTesting.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_forTesting.java
@@ -52,7 +52,7 @@ import org.apache.isis.core.security.authentication.AuthenticationSessionProvide
import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
import org.apache.isis.core.security.authorization.manager.AuthorizationManager;
import org.apache.isis.core.unittestsupport.config.IsisConfigurationLegacy;
-import org.apache.isis.core.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config._Config;
import lombok.Builder;
import lombok.Getter;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java
index c85f1f5..d96a1ee 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java
@@ -41,7 +41,7 @@ import org.apache.isis.core.metamodel.progmodel.ProgrammingModelAbstract;
import org.apache.isis.core.metamodel.progmodel.ProgrammingModelInitFilterDefault;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorAbstract;
import org.apache.isis.core.metamodel.specloader.validator.ValidationFailures;
-import org.apache.isis.core.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config._Config;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import lombok.val;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/defaults/DefaultedFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/defaults/DefaultedFacetFactoryTest.java
index 7fea461..0359702 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/defaults/DefaultedFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/defaults/DefaultedFacetFactoryTest.java
@@ -24,7 +24,7 @@ import org.apache.isis.applib.annotation.Defaulted;
import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessClassContext;
import org.apache.isis.core.metamodel.facets.object.defaults.annotcfg.DefaultedFacetAnnotationElseConfigurationFactory;
-import org.apache.isis.core.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config._Config;
public class DefaultedFacetFactoryTest extends AbstractFacetFactoryTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
index 7e0ebdd..b7b63bd 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
@@ -61,7 +61,7 @@ import org.apache.isis.core.metamodel.facets.object.publishedobject.PublishedObj
import org.apache.isis.core.metamodel.facets.object.viewmodel.ViewModelFacet;
import org.apache.isis.core.metamodel.facets.objectvalue.choices.ChoicesFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
-import org.apache.isis.core.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config._Config;
import lombok.val;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFactoryTest.java
index fea2797..ff7aa04 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFactoryTest.java
@@ -47,7 +47,7 @@ import org.apache.isis.core.metamodel.facets.members.cssclassfa.CssClassFaFacet;
import org.apache.isis.core.metamodel.facets.members.cssclassfa.CssClassFaPosition;
import org.apache.isis.core.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacet;
import org.apache.isis.core.metamodel.facets.object.plural.PluralFacet;
-import org.apache.isis.core.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config._Config;
public class DomainObjectLayoutFactoryTest extends AbstractFacetFactoryJUnit4TestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacetAnnotationOrConfigurationFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacetAnnotationOrConfigurationFactoryTest.java
index b9d0fa2..776f10d 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacetAnnotationOrConfigurationFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacetAnnotationOrConfigurationFactoryTest.java
@@ -35,7 +35,7 @@ import org.apache.isis.core.metamodel.facets.object.value.annotcfg.ValueFacetAnn
import org.apache.isis.core.metamodel.facets.object.value.annotcfg.ValueFacetAnnotationOrConfigurationFactory;
import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueSemanticsProviderUtil;
import org.apache.isis.core.metamodel.facets.objectvalue.typicallen.TypicalLengthFacet;
-import org.apache.isis.core.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config._Config;
public class ValueFacetAnnotationOrConfigurationFactoryTest extends AbstractFacetFactoryTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
index f4821dc..cdfe4af 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
@@ -76,7 +76,7 @@ import org.apache.isis.core.metamodel.facets.properties.update.modify.PropertySe
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.core.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config._Config;
import lombok.val;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigDecimalValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigDecimalValueSemanticsProviderTest.java
index 9f6d7fa..20dc05e 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigDecimalValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigDecimalValueSemanticsProviderTest.java
@@ -32,7 +32,7 @@ import org.apache.isis.core.metamodel.context.MetaModelContextAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
-import org.apache.isis.core.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config._Config;
public class BigDecimalValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigIntValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigIntValueSemanticsProviderTest.java
index ab68e5e..75eaf05 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigIntValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigIntValueSemanticsProviderTest.java
@@ -32,7 +32,7 @@ import org.apache.isis.core.metamodel.context.MetaModelContextAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
-import org.apache.isis.core.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config._Config;
public class BigIntValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ByteValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ByteValueSemanticsProviderTest.java
index 046dd4c..41ab4b0 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ByteValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ByteValueSemanticsProviderTest.java
@@ -31,7 +31,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.core.metamodel.facets.value.bytes.ByteValueSemanticsProviderAbstract;
import org.apache.isis.core.metamodel.facets.value.bytes.ByteWrapperValueSemanticsProvider;
-import org.apache.isis.core.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config._Config;
public class ByteValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/DoubleValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/DoubleValueSemanticsProviderTest.java
index aeefa19..2faebe9 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/DoubleValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/DoubleValueSemanticsProviderTest.java
@@ -30,7 +30,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.core.metamodel.facets.value.doubles.DoubleWrapperValueSemanticsProvider;
-import org.apache.isis.core.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config._Config;
public class DoubleValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/FloatValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/FloatValueSemanticsProviderTest.java
index d6f669c..728c347 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/FloatValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/FloatValueSemanticsProviderTest.java
@@ -31,7 +31,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.core.metamodel.facets.value.floats.FloatValueSemanticsProviderAbstract;
import org.apache.isis.core.metamodel.facets.value.floats.FloatWrapperValueSemanticsProvider;
-import org.apache.isis.core.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config._Config;
public class FloatValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/IntValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/IntValueSemanticsProviderTest.java
index 552f950..76ff5b4 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/IntValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/IntValueSemanticsProviderTest.java
@@ -31,7 +31,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.core.metamodel.facets.value.integer.IntValueSemanticsProviderAbstract;
import org.apache.isis.core.metamodel.facets.value.integer.IntWrapperValueSemanticsProvider;
-import org.apache.isis.core.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config._Config;
public class IntValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlDateValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlDateValueSemanticsProviderTest.java
index c2c1fa9..c667fbf 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlDateValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlDateValueSemanticsProviderTest.java
@@ -36,7 +36,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.core.metamodel.facets.value.datesql.JavaSqlDateValueSemanticsProvider;
-import org.apache.isis.core.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config._Config;
public class JavaSqlDateValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlTimeValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlTimeValueSemanticsProviderTest.java
index e55359b..b079f17 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlTimeValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlTimeValueSemanticsProviderTest.java
@@ -33,7 +33,7 @@ import org.apache.isis.core.metamodel.context.MetaModelContextAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.value.timesql.JavaSqlTimeValueSemanticsProvider;
-import org.apache.isis.core.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config._Config;
public class JavaSqlTimeValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaUtilDateValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaUtilDateValueSemanticsProviderTest.java
index 1b71aaf..79dc56b 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaUtilDateValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaUtilDateValueSemanticsProviderTest.java
@@ -35,7 +35,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.core.metamodel.facets.value.dateutil.JavaUtilDateValueSemanticsProvider;
-import org.apache.isis.core.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config._Config;
public class JavaUtilDateValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/LongValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/LongValueSemanticsProviderTest.java
index e248f7d..26332d0 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/LongValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/LongValueSemanticsProviderTest.java
@@ -31,7 +31,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.core.metamodel.facets.value.longs.LongValueSemanticsProviderAbstract;
import org.apache.isis.core.metamodel.facets.value.longs.LongWrapperValueSemanticsProvider;
-import org.apache.isis.core.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config._Config;
public class LongValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ShortValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ShortValueSemanticsProviderTest.java
index 7962e7d..2a1cc5d 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ShortValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ShortValueSemanticsProviderTest.java
@@ -31,7 +31,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.core.metamodel.facets.value.shortint.ShortValueSemanticsProviderAbstract;
import org.apache.isis.core.metamodel.facets.value.shortint.ShortWrapperValueSemanticsProvider;
-import org.apache.isis.core.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config._Config;
public class ShortValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
index 069873f..fb5d10a 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
@@ -46,7 +46,7 @@ import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet;
import org.apache.isis.core.metamodel.facets.object.parseable.parser.ParseableFacetUsingParser;
import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueSemanticsProviderAndFacetAbstract;
import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
-import org.apache.isis.core.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config._Config;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProviderTest.java
index e2a4186..f88b233 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProviderTest.java
@@ -32,7 +32,7 @@ import static org.junit.Assert.assertThat;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.core.metamodel.MetaModelContext_forTesting;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config._Config;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
public class JodaLocalDateTimeValueSemanticsProviderTest {
diff --git a/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
index 3ddcfae..df7def1 100644
--- a/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
+++ b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
@@ -72,7 +72,7 @@ import org.apache.isis.core.runtimeservices.wrapper.dom.employees.EmployeeReposi
import org.apache.isis.core.runtimeservices.wrapper.dom.employees.EmployeeRepositoryImpl;
import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.security.authentication.standard.SimpleSession;
-import org.apache.isis.core.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config._Config;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.schema.cmd.v2.CommandDto;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/AbstractApplyToAllContractTest.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/AbstractApplyToAllContractTest.java
index bfbe7cd..40edf72 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/AbstractApplyToAllContractTest.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/AbstractApplyToAllContractTest.java
@@ -34,6 +34,10 @@ import org.apache.isis.core.unittestsupport.utils.IndentPrinter;
/**
* Provides some basic infrastructure to iterate over all entity types and
* apply some contract test.
+ *
+ * <p>
+ * Used by domain apps only.
+ * </p>
*/
public abstract class AbstractApplyToAllContractTest {
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/bidir/BidirectionalRelationshipContractTestAbstract.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/bidir/BidirectionalRelationshipContractTestAbstract.java
index 31123c8..7f9e556 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/bidir/BidirectionalRelationshipContractTestAbstract.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/bidir/BidirectionalRelationshipContractTestAbstract.java
@@ -47,6 +47,11 @@ import static org.apache.isis.core.commons.internal.reflection._Reflect.withMeth
import static org.apache.isis.core.commons.internal.reflection._Reflect.withName;
import static org.apache.isis.core.unittestsupport.utils.ReflectUtils.withParametersAssignableFrom;
+/**
+ * <p>
+ * Used by domain apps only.
+ * </p>
+ */
public abstract class BidirectionalRelationshipContractTestAbstract extends AbstractApplyToAllContractTest implements Instantiators {
private final InstantiatorMap instantiatorMap;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/comparable/ComparableContractTest_compareTo.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/comparable/ComparableContractTest_compareTo.java
index f948a39..d415281 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/comparable/ComparableContractTest_compareTo.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/comparable/ComparableContractTest_compareTo.java
@@ -23,6 +23,13 @@ import java.util.List;
import org.junit.Test;
+/**
+ * <p>
+ * Used by core and domain apps.
+ * </p>
+ *
+ * @param <T>
+ */
public abstract class ComparableContractTest_compareTo<T extends Comparable<T>> {
/**
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/files/Files.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/files/Files.java
index a71376a..b04cf82 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/files/Files.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/files/Files.java
@@ -22,6 +22,11 @@ import java.io.File;
import java.io.FileFilter;
import java.io.FilenameFilter;
+/**
+ * <p>
+ * Used by domain apps only.
+ * </p>
+ */
public final class Files {
Files() {
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jaxb/JaxbMatchers.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jaxb/JaxbMatchers.java
index e711fc0..d566261 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jaxb/JaxbMatchers.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jaxb/JaxbMatchers.java
@@ -40,7 +40,9 @@ import org.apache.isis.core.commons.internal.base._Casts;
import org.apache.isis.core.commons.internal.resources._Resources;
/**
- * For example usage, see <a href="https://github.com/isisaddons/isis-module-publishmq">Isis addons' publishmq module</a> (non-ASF)
+ * <p>
+ * Used by domain apps only.
+ * </p>
*/
public class JaxbMatchers {
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2.java
index 38f3fb8..010bb6c 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2.java
@@ -64,6 +64,10 @@ import junit.framework.AssertionFailedError;
* The class also adds some convenience methods, and uses a factory method to
* make it explicit whether the context can mock only interfaces or interfaces
* and classes.
+ *
+ * <p>
+ * Used by domain apps only.
+ * </p>
*/
public class JUnitRuleMockery2 extends JUnit4Mockery implements MethodRule {
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/soap/SoapEndpointPublishingRule.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/soap/SoapEndpointPublishingRule.java
index f9bedd2..c99305c 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/soap/SoapEndpointPublishingRule.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/soap/SoapEndpointPublishingRule.java
@@ -30,7 +30,9 @@ import static org.apache.isis.core.commons.internal.base._NullSafe.stream;
/**
- * For example usage, see <a href="https://github.com/isisaddons/isis-module-publishmq">Isis addons' publishmq module</a> (non-ASF)
+ * <p>
+ * Used by domain apps only.
+ * </p>
*/
public class SoapEndpointPublishingRule implements TestRule {
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/sortedsets/SortedSetsContractTestAbstract.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/sortedsets/SortedSetsContractTestAbstract.java
index f1b8545..5ad38f4 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/sortedsets/SortedSetsContractTestAbstract.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/sortedsets/SortedSetsContractTestAbstract.java
@@ -32,6 +32,11 @@ import org.apache.isis.core.unittestsupport.AbstractApplyToAllContractTest;
import static org.apache.isis.core.commons.internal.collections._Collections.toHashSet;
import static org.apache.isis.core.commons.internal.reflection._Reflect.withTypeAssignableTo;
+/**
+ * <p>
+ * Used by domain apps only.
+ * </p>
+ */
public abstract class SortedSetsContractTestAbstract extends AbstractApplyToAllContractTest {
protected SortedSetsContractTestAbstract(
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/streams/NullPrintStream.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/streams/NullPrintStream.java
index 41be8c2..c72beb7 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/streams/NullPrintStream.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/streams/NullPrintStream.java
@@ -24,6 +24,11 @@ import java.io.OutputStream;
import java.io.PrintStream;
import java.util.concurrent.Callable;
+/**
+ * <p>
+ * Used by domain apps only.
+ * </p>
+ */
public class NullPrintStream extends PrintStream {
public NullPrintStream() {
super(new NullByteArrayOutputStream());
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/utils/CollectUtils.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/utils/CollectUtils.java
index 5b84644..5e4fe00 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/utils/CollectUtils.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/utils/CollectUtils.java
@@ -20,6 +20,11 @@ package org.apache.isis.core.unittestsupport.utils;
import java.util.Set;
+/**
+ * <p>
+ * Used by domain apps only.
+ * </p>
+ */
public class CollectUtils {
public static <T> T firstIn(final Set<T> set) {
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/utils/IndentPrinter.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/utils/IndentPrinter.java
index 24b0aff..f82eedb 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/utils/IndentPrinter.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/utils/IndentPrinter.java
@@ -24,6 +24,10 @@ import java.io.Writer;
/**
* Adapted from <tt>groovy.util.IndentPrinter</tt> (published under ASL 2.0).
+ *
+ * <p>
+ * Used by domain apps only.
+ * </p>
*/
public class IndentPrinter {
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/utils/ReflectUtils.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/utils/ReflectUtils.java
index b4cc3ab..5ddc9d1 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/utils/ReflectUtils.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/utils/ReflectUtils.java
@@ -27,6 +27,11 @@ import javax.jdo.annotations.Persistent;
import org.apache.isis.core.commons.internal.base._Strings;
+/**
+ * <p>
+ * Used by domain apps only.
+ * </p>
+ */
public class ReflectUtils {
public static <T> Predicate<Field> withTypeAssignableFrom(final Class<T> type) {
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/utils/StringUtils.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/utils/StringUtils.java
index 97f7b1d..3d5ef74 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/utils/StringUtils.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/utils/StringUtils.java
@@ -20,6 +20,11 @@ package org.apache.isis.core.unittestsupport.utils;
import java.lang.reflect.Field;
+/**
+ * <p>
+ * Used by domain apps only.
+ * </p>
+ */
public class StringUtils {
public static String capitalize(final String str) {
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/value/ValueTypeContractTestAbstract.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/value/ValueTypeContractTestAbstract.java
index 4734fcc..7871005 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/value/ValueTypeContractTestAbstract.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/value/ValueTypeContractTestAbstract.java
@@ -35,6 +35,10 @@ import static org.junit.Assume.assumeThat;
* Contract test for value types ({@link #equals(Object) equals} and
* {@link #hashCode() hashCode}), and also {@link Comparable#compareTo(Object) compareTo} for
* any value types that also are {@link Comparable}
+ *
+ * <p>
+ * Used by core and domain apps only.
+ * </p>
*/
public abstract class ValueTypeContractTestAbstract<T> {
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/BidirectionalRelationshipContractTestAll.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/bidir/BidirectionalRelationshipContractTestAll.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/BidirectionalRelationshipContractTestAll.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/bidir/BidirectionalRelationshipContractTestAll.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/ChildDomainObject.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/bidir/ChildDomainObject.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/ChildDomainObject.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/bidir/ChildDomainObject.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/InstantiatorForChildDomainObject.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/bidir/InstantiatorForChildDomainObject.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/InstantiatorForChildDomainObject.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/bidir/InstantiatorForChildDomainObject.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/ParentDomainObject.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/bidir/ParentDomainObject.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/ParentDomainObject.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/bidir/ParentDomainObject.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/PeerDomainObject.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/bidir/PeerDomainObject.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/PeerDomainObject.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/bidir/PeerDomainObject.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/PeerDomainObjectForTesting.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/bidir/PeerDomainObjectForTesting.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/PeerDomainObjectForTesting.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/bidir/PeerDomainObjectForTesting.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/comparable/CategorizedDomainObject.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/comparable/CategorizedDomainObject.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/comparable/CategorizedDomainObject.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/comparable/CategorizedDomainObject.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/comparable/CategorizedDomainObjectComparableContractTest_compareTo.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/comparable/CategorizedDomainObjectComparableContractTest_compareTo.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/comparable/CategorizedDomainObjectComparableContractTest_compareTo.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/comparable/CategorizedDomainObjectComparableContractTest_compareTo.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/files/FilesTest_deleteFiles.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/files/FilesTest_deleteFiles.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/files/FilesTest_deleteFiles.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/files/FilesTest_deleteFiles.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/CollaboratingUsingConstructorInjection.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/CollaboratingUsingConstructorInjection.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/CollaboratingUsingConstructorInjection.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/CollaboratingUsingConstructorInjection.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/CollaboratingUsingSetterInjection.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/CollaboratingUsingSetterInjection.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/CollaboratingUsingSetterInjection.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/CollaboratingUsingSetterInjection.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/Collaborator.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/Collaborator.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/Collaborator.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/Collaborator.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/ImposteriserTestUsingCodegenPlugin.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/ImposteriserTestUsingCodegenPlugin.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/ImposteriserTestUsingCodegenPlugin.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/ImposteriserTestUsingCodegenPlugin.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/IsisActionsTest_returnNewTransientInstance.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/IsisActionsTest_returnNewTransientInstance.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/IsisActionsTest_returnNewTransientInstance.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/IsisActionsTest_returnNewTransientInstance.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JMockActionsTest_returnArgument.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JMockActionsTest_returnArgument.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JMockActionsTest_returnArgument.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JMockActionsTest_returnArgument.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JMockActionsTest_returnEach.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JMockActionsTest_returnEach.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JMockActionsTest_returnEach.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JMockActionsTest_returnEach.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_constructorInjection_happyCase.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_constructorInjection_happyCase.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_constructorInjection_happyCase.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_constructorInjection_happyCase.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_noClassUnderTest.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_noClassUnderTest.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_noClassUnderTest.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_noClassUnderTest.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_twoClassesUnderTest.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_twoClassesUnderTest.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_twoClassesUnderTest.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_twoClassesUnderTest.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_setterInjection_happyCase.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_setterInjection_happyCase.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_setterInjection_happyCase.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_setterInjection_happyCase.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithAllowing.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithAllowing.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithAllowing.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithAllowing.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithChecking.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithChecking.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithChecking.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithChecking.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithIgnoring.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithIgnoring.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithIgnoring.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithIgnoring.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_happyCase.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_happyCase.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_happyCase.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_happyCase.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_sadCase.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_sadCase.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_sadCase.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_sadCase.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_happyCase.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_happyCase.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_happyCase.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_happyCase.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_sadCase.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_sadCase.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_sadCase.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_sadCase.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/sortedsets/SomeDomainObject.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/sortedsets/SomeDomainObject.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/sortedsets/SomeDomainObject.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/sortedsets/SomeDomainObject.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/sortedsets/SortedSetsContractTestAll.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/sortedsets/SortedSetsContractTestAll.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/sortedsets/SortedSetsContractTestAll.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/sortedsets/SortedSetsContractTestAll.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/value/ValueTypeContractTestAbstract_BigIntegerTest.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/value/ValueTypeContractTestAbstract_BigIntegerTest.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/value/ValueTypeContractTestAbstract_BigIntegerTest.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/value/ValueTypeContractTestAbstract_BigIntegerTest.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/value/ValueTypeContractTestAbstract_ColorTest.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/value/ValueTypeContractTestAbstract_ColorTest.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/value/ValueTypeContractTestAbstract_ColorTest.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/value/ValueTypeContractTestAbstract_ColorTest.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/value/ValueTypeContractTestAbstract_StringTest.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/value/ValueTypeContractTestAbstract_StringTest.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/value/ValueTypeContractTestAbstract_StringTest.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/value/ValueTypeContractTestAbstract_StringTest.java
diff --git a/legacy/extensions/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/PercentageValueSemanticsProviderTest.java b/legacy/extensions/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/PercentageValueSemanticsProviderTest.java
index e3b93f3..714f83a 100644
--- a/legacy/extensions/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/PercentageValueSemanticsProviderTest.java
+++ b/legacy/extensions/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/PercentageValueSemanticsProviderTest.java
@@ -30,7 +30,7 @@ import org.apache.isis.core.metamodel.context.MetaModelContextAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.value.ValueSemanticsProviderAbstractTestCase;
-import org.apache.isis.core.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config._Config;
public class PercentageValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
private PercentageValueSemanticsProvider adapter;
[isis] 14/25: ISIS-2273: fixing classpath for shiro and RO viewer
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2062
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 94c5347a5f13738bc1afe20c787b0e3afcbccee2
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jan 29 17:59:38 2020 +0000
ISIS-2273: fixing classpath for shiro and RO viewer
---
security/shiro/pom.xml | 7 -------
...ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java | 4 ----
.../todomodule/fixturescripts/ExcelDemoToDoItem_tearDown.java | 1 -
...urceContext_ensureCompatibleAcceptHeader_ContractTest.java | 3 ---
.../viewer/context/ResourceContext_getArg_Test.java | 4 ----
.../scalars/datepicker/TextFieldWithDateTimePicker.java | 11 -----------
6 files changed, 30 deletions(-)
diff --git a/security/shiro/pom.xml b/security/shiro/pom.xml
index e17ed06..6ef0ca5 100644
--- a/security/shiro/pom.xml
+++ b/security/shiro/pom.xml
@@ -73,13 +73,6 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-config</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
<scope>test</scope>
</dependency>
diff --git a/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java b/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
index e065079..e4665fb 100644
--- a/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
+++ b/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
@@ -35,7 +35,6 @@ import static org.junit.Assert.assertThat;
import org.apache.isis.applib.Identifier;
import org.apache.isis.core.config.IsisConfiguration;
-import org.apache.isis.core.config.unittestsupport.IsisConfigurationLegacy;
import org.apache.isis.core.security.authentication.AuthenticationRequest;
import org.apache.isis.core.security.authentication.AuthenticationRequestPassword;
import org.apache.isis.security.shiro.authentication.AuthenticatorShiro;
@@ -50,9 +49,6 @@ public class ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole {
@Rule
public JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(Mode.INTERFACES_AND_CLASSES);
- @Mock
- private IsisConfigurationLegacy mockConfiguration;
-
private AuthenticatorShiro authenticator;
private AuthorizorShiro authorizor;
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown.java
index 670a856..02d9fcf 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown.java
@@ -2,7 +2,6 @@ package org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.fixturescri
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
import org.apache.isis.testing.fixtures.applib.teardown.TeardownFixtureAbstract;
-import org.apache.isis.testing.fixtures.applib.legacy.teardown.TeardownFixtureAbstract2;
public class ExcelDemoToDoItem_tearDown extends TeardownFixtureAbstract {
diff --git a/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
index 3520507..bdccbb0 100644
--- a/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
+++ b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
@@ -61,11 +61,8 @@ public abstract class ResourceContext_ensureCompatibleAcceptHeader_ContractTest
@Mock HttpServletRequest mockHttpServletRequest;
@Mock ServletContext mockServletContext;
@Mock IsisSessionFactory mockIsisSessionFactory;
- @Mock ServiceInjector mockServicesInjector;
- @Mock IsisConfigurationLegacy mockConfiguration;
@Mock IsisSession mockIsisSession;
@Mock AuthenticationSession mockAuthenticationSession;
- @Mock PersistenceSession mockPersistenceSession;
@Mock SpecificationLoader mockSpecificationLoader;
@Mock WebApplicationContext webApplicationContext;
diff --git a/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java
index 90e05ef..2b213b4 100644
--- a/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java
+++ b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java
@@ -56,12 +56,8 @@ public class ResourceContext_getArg_Test {
@Rule public JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(Mode.INTERFACES_AND_CLASSES);
- @Mock HttpHeaders mockHttpHeaders;
@Mock HttpServletRequest mockHttpServletRequest;
@Mock ServletContext mockServletContext;
- @Mock IsisSessionFactory mockIsisSessionFactory;
- @Mock ServiceInjector mockServicesInjector;
- @Mock IsisConfigurationLegacy mockConfiguration;
@Mock IsisSession mockIsisSession;
@Mock AuthenticationSession mockAuthenticationSession;
@Mock PersistenceSession mockPersistenceSession;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java
index e0cd072..0582c09 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java
@@ -154,16 +154,5 @@ public class TextFieldWithDateTimePicker<T> extends TextField<T> implements ICon
return $(this).chain("datetimepicker", config).get();
}
-// IsisConfigurationLegacy getConfigurationLegacy() {
-// return IsisContext.getConfigurationLegacy();
-// }
-//
-// IsisConfiguration getConfiguration() {
-// return IsisContext.getConfiguration();
-// }
-//
-// IsisSessionFactory getIsisSessionFactory() {
-// return IsisContext.getSessionFactory();
-// }
}
[isis] 06/25: ISIS-2273: fixes failing test
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2062
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 1373b64d14a1e0742f3752d29d86870b5d65a94e
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jan 29 17:05:57 2020 +0000
ISIS-2273: fixes failing test
---
...odegenPlugin.java => ImposteriserTestUsingCodegenPlugin_Test.java} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/ImposteriserTestUsingCodegenPlugin.java b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/ImposteriserTestUsingCodegenPlugin_Test.java
similarity index 98%
rename from core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/ImposteriserTestUsingCodegenPlugin.java
rename to core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/ImposteriserTestUsingCodegenPlugin_Test.java
index c249165..a8a0940 100644
--- a/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/ImposteriserTestUsingCodegenPlugin.java
+++ b/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking/ImposteriserTestUsingCodegenPlugin_Test.java
@@ -44,7 +44,7 @@ import static org.junit.jupiter.api.Assertions.fail;
import org.apache.isis.core.commons.internal.context._Context;
-class ImposteriserTestUsingCodegenPlugin {
+class ImposteriserTestUsingCodegenPlugin_Test {
private Imposteriser imposteriser = Imposterisers.getDefault();
@@ -58,7 +58,7 @@ class ImposteriserTestUsingCodegenPlugin {
invokable = new Invokable() {
@Override
public Object invoke(Invocation invocation) throws Throwable {
- ImposteriserTestUsingCodegenPlugin.this.invocation = invocation;
+ ImposteriserTestUsingCodegenPlugin_Test.this.invocation = invocation;
return "result";
}
};
[isis] 18/25: ISIS-2273: removing core references to
isis-core-unittestsupport
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2062
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 7fd51ff24ecc10d0a173a2d7dd8f6c95803ac547
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jan 29 18:33:51 2020 +0000
ISIS-2273: removing core references to isis-core-unittestsupport
---
core/config/pom.xml | 27 +++++++++---
core/detached-tests/pom.xml | 7 ---
core/runtime/pom.xml | 6 ---
core/runtimeservices/pom.xml | 6 ---
core/webapp/pom.xml | 12 ------
extensions/security/shiro-realm-ldap/impl/pom.xml | 6 ---
legacy/extensions/core/applib/pom.xml | 13 ------
legacy/extensions/core/commons/pom.xml | 13 ------
legacy/extensions/core/metamodel/pom.xml | 13 ------
legacy/extensions/core/runtime/pom.xml | 13 ------
legacy/mappings/restclient/pom.xml | 4 +-
legacy/testing/mavenplugin/pom.xml | 5 ---
persistence/jdo/datanucleus-5/pom.xml | 6 ---
security/keycloak/pom.xml | 6 ---
security/shiro/pom.xml | 6 ---
subdomains/excel/applib/pom.xml | 5 ---
subdomains/excel/integtests/pom.xml | 4 --
subdomains/xdocreport/applib/pom.xml | 7 ---
testing/fakedata/integtests/pom.xml | 4 --
testing/unittestsupport/applib/pom.xml | 52 ++++++++++++++++++++++-
viewers/restfulobjects/jaxrs-resteasy-4/pom.xml | 5 ---
viewers/restfulobjects/rendering/pom.xml | 5 ---
viewers/restfulobjects/viewer/pom.xml | 5 ---
viewers/wicket/model/pom.xml | 5 ---
viewers/wicket/ui/pom.xml | 13 ------
viewers/wicket/viewer/pom.xml | 6 ---
26 files changed, 75 insertions(+), 179 deletions(-)
diff --git a/core/config/pom.xml b/core/config/pom.xml
index 9f7318e..5794fcb 100644
--- a/core/config/pom.xml
+++ b/core/config/pom.xml
@@ -81,18 +81,35 @@
</dependency>
<!-- TESTS -->
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-applib</artifactId>
<type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
diff --git a/core/detached-tests/pom.xml b/core/detached-tests/pom.xml
index 49b4405..43a20e4 100644
--- a/core/detached-tests/pom.xml
+++ b/core/detached-tests/pom.xml
@@ -88,13 +88,6 @@
</dependency>
<dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <scope>test</scope>
- </dependency>
-
-
- <dependency>
<groupId>org.picocontainer</groupId>
<artifactId>picocontainer</artifactId>
<scope>test</scope>
diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
index 2b72eac..542c6f0 100644
--- a/core/runtime/pom.xml
+++ b/core/runtime/pom.xml
@@ -69,12 +69,6 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
<artifactId>isis-applib</artifactId>
<type>test-jar</type>
<scope>test</scope>
diff --git a/core/runtimeservices/pom.xml b/core/runtimeservices/pom.xml
index 0ed1f2e..b44927c 100644
--- a/core/runtimeservices/pom.xml
+++ b/core/runtimeservices/pom.xml
@@ -78,12 +78,6 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-config</artifactId>
<type>test-jar</type>
<scope>test</scope>
diff --git a/core/webapp/pom.xml b/core/webapp/pom.xml
index c56024e..cb648a3 100644
--- a/core/webapp/pom.xml
+++ b/core/webapp/pom.xml
@@ -88,18 +88,6 @@
<!-- TESTING -->
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-runtime</artifactId>
diff --git a/extensions/security/shiro-realm-ldap/impl/pom.xml b/extensions/security/shiro-realm-ldap/impl/pom.xml
index ec3c302..9000af5 100644
--- a/extensions/security/shiro-realm-ldap/impl/pom.xml
+++ b/extensions/security/shiro-realm-ldap/impl/pom.xml
@@ -42,12 +42,6 @@
<artifactId>isis-security-shiro</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <scope>test</scope>
- </dependency>
-
</dependencies>
</project>
diff --git a/legacy/extensions/core/applib/pom.xml b/legacy/extensions/core/applib/pom.xml
index e56a40a..c2b4d17 100644
--- a/legacy/extensions/core/applib/pom.xml
+++ b/legacy/extensions/core/applib/pom.xml
@@ -73,19 +73,6 @@
<!-- TEST DEPENDENCY -->
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <scope>test</scope>
- <exclusions>
- <!-- whatever unittestsupport is dependent on, it should not be transitive -->
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
</dependencies>
</project>
\ No newline at end of file
diff --git a/legacy/extensions/core/commons/pom.xml b/legacy/extensions/core/commons/pom.xml
index 911a3bd..5f82d24 100644
--- a/legacy/extensions/core/commons/pom.xml
+++ b/legacy/extensions/core/commons/pom.xml
@@ -73,19 +73,6 @@
<!-- TEST DEPENDENCY -->
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <scope>test</scope>
- <exclusions>
- <!-- whatever unittestsupport is dependent on, it should not be transitive -->
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
</dependencies>
</project>
\ No newline at end of file
diff --git a/legacy/extensions/core/metamodel/pom.xml b/legacy/extensions/core/metamodel/pom.xml
index 9432d1a..ad1853d 100644
--- a/legacy/extensions/core/metamodel/pom.xml
+++ b/legacy/extensions/core/metamodel/pom.xml
@@ -93,19 +93,6 @@
<type>test-jar</type>
</dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <scope>test</scope>
- <exclusions>
- <!-- whatever unittestsupport is dependent on, it should not be transitive -->
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
</dependencies>
</project>
\ No newline at end of file
diff --git a/legacy/extensions/core/runtime/pom.xml b/legacy/extensions/core/runtime/pom.xml
index f50fea6..3688064 100644
--- a/legacy/extensions/core/runtime/pom.xml
+++ b/legacy/extensions/core/runtime/pom.xml
@@ -90,19 +90,6 @@
<!-- TEST DEPENDENCY -->
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <scope>test</scope>
- <exclusions>
- <!-- whatever unittestsupport is dependent on, it should not be transitive -->
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
</dependencies>
</project>
\ No newline at end of file
diff --git a/legacy/mappings/restclient/pom.xml b/legacy/mappings/restclient/pom.xml
index be8a788..65940b6 100644
--- a/legacy/mappings/restclient/pom.xml
+++ b/legacy/mappings/restclient/pom.xml
@@ -52,12 +52,12 @@
</dependency>
<!-- TESTING -->
- <dependency>
+ <dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
<scope>test</scope>
</dependency>
-
+
</dependencies>
</project>
\ No newline at end of file
diff --git a/legacy/testing/mavenplugin/pom.xml b/legacy/testing/mavenplugin/pom.xml
index 6b104bc..5774e21 100644
--- a/legacy/testing/mavenplugin/pom.xml
+++ b/legacy/testing/mavenplugin/pom.xml
@@ -40,11 +40,6 @@
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- </dependency>
-
<!-- JUPITER -->
<dependency>
<!-- JUnit API for writing tests and extensions -->
diff --git a/persistence/jdo/datanucleus-5/pom.xml b/persistence/jdo/datanucleus-5/pom.xml
index f1a7062..f95817b 100644
--- a/persistence/jdo/datanucleus-5/pom.xml
+++ b/persistence/jdo/datanucleus-5/pom.xml
@@ -131,12 +131,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <scope>test</scope>
- </dependency>
-
</dependencies>
diff --git a/security/keycloak/pom.xml b/security/keycloak/pom.xml
index 8df1a9e..0297a4f 100644
--- a/security/keycloak/pom.xml
+++ b/security/keycloak/pom.xml
@@ -71,12 +71,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <scope>test</scope>
- </dependency>
-
</dependencies>
</project>
diff --git a/security/shiro/pom.xml b/security/shiro/pom.xml
index 6ef0ca5..2d77506 100644
--- a/security/shiro/pom.xml
+++ b/security/shiro/pom.xml
@@ -72,12 +72,6 @@
</dependency>
<dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-core</artifactId>
<exclusions>
diff --git a/subdomains/excel/applib/pom.xml b/subdomains/excel/applib/pom.xml
index fcfa015..c9baf99 100644
--- a/subdomains/excel/applib/pom.xml
+++ b/subdomains/excel/applib/pom.xml
@@ -71,11 +71,6 @@
</dependency>
<!-- test -->
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
diff --git a/subdomains/excel/integtests/pom.xml b/subdomains/excel/integtests/pom.xml
index 40791da..1336f89 100644
--- a/subdomains/excel/integtests/pom.xml
+++ b/subdomains/excel/integtests/pom.xml
@@ -78,10 +78,6 @@
<scope>test</scope>
<exclusions>
<exclusion>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- </exclusion>
- <exclusion>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
</exclusion>
diff --git a/subdomains/xdocreport/applib/pom.xml b/subdomains/xdocreport/applib/pom.xml
index e98a695..8420e66 100644
--- a/subdomains/xdocreport/applib/pom.xml
+++ b/subdomains/xdocreport/applib/pom.xml
@@ -69,13 +69,6 @@
<scope>test</scope>
</dependency>
- <!-- provided -->
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <scope>provided</scope>
- </dependency>
-
</dependencies>
diff --git a/testing/fakedata/integtests/pom.xml b/testing/fakedata/integtests/pom.xml
index 3d64a2d..eaa5735 100644
--- a/testing/fakedata/integtests/pom.xml
+++ b/testing/fakedata/integtests/pom.xml
@@ -74,10 +74,6 @@
<scope>test</scope>
<exclusions>
<exclusion>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- </exclusion>
- <exclusion>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
</exclusion>
diff --git a/testing/unittestsupport/applib/pom.xml b/testing/unittestsupport/applib/pom.xml
index 53df518..1b1def5 100644
--- a/testing/unittestsupport/applib/pom.xml
+++ b/testing/unittestsupport/applib/pom.xml
@@ -28,11 +28,61 @@
<artifactId>guava</artifactId>
</dependency>
- <!-- note that this is *not* a test dependency -->
+ <!-- note that these are *not* a test dependency -->
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>net.bytebuddy</groupId>
+ <artifactId>byte-buddy</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>net.bytebuddy</groupId>
+ <artifactId>byte-buddy</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.bytebuddy</groupId>
+ <artifactId>byte-buddy-agent</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!-- framework default codegen for tests -->
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-codegen-bytebuddy</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-library</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
</dependency>
+
</dependencies>
</project>
diff --git a/viewers/restfulobjects/jaxrs-resteasy-4/pom.xml b/viewers/restfulobjects/jaxrs-resteasy-4/pom.xml
index 6694c39..3724daf 100644
--- a/viewers/restfulobjects/jaxrs-resteasy-4/pom.xml
+++ b/viewers/restfulobjects/jaxrs-resteasy-4/pom.xml
@@ -93,11 +93,6 @@
<!-- TEST DEPENDENCIES -->
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
diff --git a/viewers/restfulobjects/rendering/pom.xml b/viewers/restfulobjects/rendering/pom.xml
index c6b0889..c2ea906 100644
--- a/viewers/restfulobjects/rendering/pom.xml
+++ b/viewers/restfulobjects/rendering/pom.xml
@@ -47,11 +47,6 @@
</dependency>
<!-- TEST DEPENDENCIES -->
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
diff --git a/viewers/restfulobjects/viewer/pom.xml b/viewers/restfulobjects/viewer/pom.xml
index 15fc084..ce9f713 100644
--- a/viewers/restfulobjects/viewer/pom.xml
+++ b/viewers/restfulobjects/viewer/pom.xml
@@ -70,11 +70,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
diff --git a/viewers/wicket/model/pom.xml b/viewers/wicket/model/pom.xml
index 0df92e7..75a2873 100644
--- a/viewers/wicket/model/pom.xml
+++ b/viewers/wicket/model/pom.xml
@@ -68,11 +68,6 @@
</dependency>
<!-- TEST DEPENDENCIES -->
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
diff --git a/viewers/wicket/ui/pom.xml b/viewers/wicket/ui/pom.xml
index 333c607..6c9299f 100644
--- a/viewers/wicket/ui/pom.xml
+++ b/viewers/wicket/ui/pom.xml
@@ -318,19 +318,6 @@
</dependency>
<!-- TEST DEPENDENCIES -->
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <scope>test</scope>
-<!--
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- </exclusions>
--->
- </dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
diff --git a/viewers/wicket/viewer/pom.xml b/viewers/wicket/viewer/pom.xml
index 7a39974..3c6a348 100644
--- a/viewers/wicket/viewer/pom.xml
+++ b/viewers/wicket/viewer/pom.xml
@@ -157,12 +157,6 @@
<dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>org.jmock</groupId>
<artifactId>jmock-junit4</artifactId>
<scope>test</scope>
[isis] 11/25: ISIS-2273: fixing classpath for runtimeservices
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2062
in repository https://gitbox.apache.org/repos/asf/isis.git
commit f24e9cb7079de713dc5f122c4c1e4c4d13e54865
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jan 29 17:53:26 2020 +0000
ISIS-2273: fixing classpath for runtimeservices
---
core/runtimeservices/pom.xml | 7 +++++++
.../wrapper/WrapperFactoryDefault_wrappedObject_Test.java | 4 +---
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/core/runtimeservices/pom.xml b/core/runtimeservices/pom.xml
index d555a04..0ed1f2e 100644
--- a/core/runtimeservices/pom.xml
+++ b/core/runtimeservices/pom.xml
@@ -82,6 +82,13 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-config</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-metamodel</artifactId>
diff --git a/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
index df7def1..722bc0c 100644
--- a/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
+++ b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
@@ -44,6 +44,7 @@ import org.apache.isis.applib.services.wrapper.InvalidException;
import org.apache.isis.applib.services.xactn.TransactionService;
import org.apache.isis.core.codegen.bytebuddy.services.ProxyFactoryServiceByteBuddy;
import org.apache.isis.core.commons.internal.plugins.codegen.ProxyFactoryService;
+import org.apache.isis.core.config.unittestsupport.internal._Config;
import org.apache.isis.core.metamodel.MetaModelContext_forTesting;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
@@ -72,7 +73,6 @@ import org.apache.isis.core.runtimeservices.wrapper.dom.employees.EmployeeReposi
import org.apache.isis.core.runtimeservices.wrapper.dom.employees.EmployeeRepositoryImpl;
import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.security.authentication.standard.SimpleSession;
-import org.apache.isis.core.unittestsupport.config._Config;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.schema.cmd.v2.CommandDto;
@@ -87,9 +87,7 @@ public class WrapperFactoryDefault_wrappedObject_Test {
@Rule
public ExpectedException expectedException = ExpectedException.none();
- //@Mock private ObjectAdapterProvider mockAdapterManager;
@Mock private AuthenticationSessionProvider mockAuthenticationSessionProvider;
-// @Mock private PersistenceSessionServiceInternal mockPersistenceSessionServiceInternal;
@Mock private MessageService mockMessageService;
@Mock private CommandContext mockCommandContext;
@Mock private Command mockCommand;
[isis] 24/25: ISIS-2273: removing core references to
isis-core-unittestsupport, ctd
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2062
in repository https://gitbox.apache.org/repos/asf/isis.git
commit ff27d74dea770dd2a950b492e1207f804ab01ae4
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jan 29 19:23:08 2020 +0000
ISIS-2273: removing core references to isis-core-unittestsupport, ctd
---
core/runtime/pom.xml | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
index 5a5ce630..c7f3d65 100644
--- a/core/runtime/pom.xml
+++ b/core/runtime/pom.xml
@@ -110,6 +110,12 @@
</dependency>
<dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-codegen-bytebuddy</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<scope>test</scope>
[isis] 17/25: ISIS-2273: more fixing of classpath
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2062
in repository https://gitbox.apache.org/repos/asf/isis.git
commit f9b4578a4188b1d919d7ef209cd574eb3085e894
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jan 29 18:17:28 2020 +0000
ISIS-2273: more fixing of classpath
---
core/detached-tests/pom.xml | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/core/detached-tests/pom.xml b/core/detached-tests/pom.xml
index 25ecf46..49b4405 100644
--- a/core/detached-tests/pom.xml
+++ b/core/detached-tests/pom.xml
@@ -47,10 +47,17 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-config</artifactId>
+ <scope>test</scope>
</dependency>
-
- <dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-config</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-metamodel</artifactId>
<type>test-jar</type>
@@ -90,16 +97,19 @@
<dependency>
<groupId>org.picocontainer</groupId>
<artifactId>picocontainer</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.jmock</groupId>
<artifactId>jmock</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.jmock</groupId>
<artifactId>jmock-junit4</artifactId>
+ <scope>test</scope>
<exclusions>
<exclusion>
<groupId>junit</groupId>
[isis] 20/25: ISIS-2273: fixes classpath on runtime
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2062
in repository https://gitbox.apache.org/repos/asf/isis.git
commit a18905cbb1ae04755572d537c6f73bbbacc4eed0
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jan 29 18:37:20 2020 +0000
ISIS-2273: fixes classpath on runtime
---
core/runtime/pom.xml | 22 ++++++++++++++++++++++
.../system/ObjectActionLayoutXmlDefaultTest.java | 5 ++---
2 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
index 80f9c47..f34a415 100644
--- a/core/runtime/pom.xml
+++ b/core/runtime/pom.xml
@@ -82,6 +82,28 @@
</dependency>
<dependency>
+ <groupId>org.jmock</groupId>
+ <artifactId>jmock</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jmock</groupId>
+ <artifactId>jmock-junit4</artifactId>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit-dep</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.bytebuddy</groupId>
+ <artifactId>byte-buddy</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<scope>test</scope>
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionLayoutXmlDefaultTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionLayoutXmlDefaultTest.java
index b432880..3484dfe 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionLayoutXmlDefaultTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionLayoutXmlDefaultTest.java
@@ -38,13 +38,12 @@ import org.apache.isis.core.metamodel.facets.all.named.NamedFacet;
import org.apache.isis.core.metamodel.facets.all.named.NamedFacetAbstract;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.specloader.specimpl.ObjectActionDefault;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class ObjectActionLayoutXmlDefaultTest {
- @Rule public JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(Mode.INTERFACES_AND_CLASSES);
+ @Rule public JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(JUnitRuleMockery2.Mode.INTERFACES_AND_CLASSES);
private ObjectActionDefault action;
[isis] 02/25: ISIS-2273: adds junit deps for applib
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2062
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 87e2f4fd2cde242250597612825caaa7871dc6f8
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jan 29 16:48:41 2020 +0000
ISIS-2273: adds junit deps for applib
---
api/applib/pom.xml | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/api/applib/pom.xml b/api/applib/pom.xml
index 0f00fa0..79d46a7 100644
--- a/api/applib/pom.xml
+++ b/api/applib/pom.xml
@@ -91,6 +91,29 @@
<artifactId>annotations</artifactId>
</dependency>
+ <!-- TEST -->
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
</project>
[isis] 10/25: ISIS-2273: copies jmock2 into metamodel's own test
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2062
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 93bcf46a7a4ae8d0f3fb4186ac5873375e26efa4
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jan 29 17:46:33 2020 +0000
ISIS-2273: copies jmock2 into metamodel's own test
since used in many of its unit tests
---
core/metamodel/pom.xml | 58 ++++
.../metamodel/MetaModelContext_configTest.java | 4 +-
.../facets/AbstractFacetFactoryJUnit4TestCase.java | 4 +-
.../metamodel/facets/AbstractFacetFactoryTest.java | 2 +-
.../metamodel/facets/ObjectAdapterUtilsTest.java | 4 +-
.../actions/ActionMethodsFacetFactoryTest.java | 2 +-
.../prototype/PrototypeFacetAbstractTest.java | 2 +-
.../CollectionFieldMethodsFacetFactoryTest.java | 4 +-
.../collections/JavaCollectionFacetTest.java | 4 +-
.../ViewModelSemanticCheckingFacetFactoryTest.java | 4 +-
.../object/defaults/DefaultedFacetFactoryTest.java | 2 +-
.../DomainObjectAnnotationFacetFactoryTest.java | 2 +-
.../DomainObjectLayoutFactoryTest.java | 2 +-
.../TitleFacetViaTitleAnnotationTest.java | 4 +-
.../parseable/ParseableFacetUsingParserTest.java | 4 +-
...eFacetAnnotationOrConfigurationFactoryTest.java | 2 +-
.../ordering/memberorder/DeweyOrderSetTest.java | 2 +-
.../MemberOrderAnnotationFacetFactoryTest.java | 2 +-
.../memberorder/MemberOrderComparatorTest.java | 2 +-
...romptStyleFacetFromPropertyAnnotation_Test.java | 2 +-
.../PropertyAnnotationFacetFactoryTest.java | 2 +-
.../BigDecimalValueSemanticsProviderTest.java | 2 +-
.../value/BigIntValueSemanticsProviderTest.java | 2 +-
.../value/ByteValueSemanticsProviderTest.java | 2 +-
.../value/DoubleValueSemanticsProviderTest.java | 2 +-
.../value/FloatValueSemanticsProviderTest.java | 2 +-
.../ImageValueSemanticsProviderAbstractTest.java | 6 +-
.../value/IntValueSemanticsProviderTest.java | 2 +-
.../JavaSqlDateValueSemanticsProviderTest.java | 2 +-
.../JavaSqlTimeValueSemanticsProviderTest.java | 2 +-
.../JavaUtilDateValueSemanticsProviderTest.java | 2 +-
.../value/LongValueSemanticsProviderTest.java | 2 +-
.../value/ShortValueSemanticsProviderTest.java | 2 +-
.../ValueSemanticsProviderAbstractTestCase.java | 6 +-
...odaLocalDateTimeValueSemanticsProviderTest.java | 4 +-
...jectAssociationPredicatesTest_visibleWhere.java | 4 +-
.../services/appfeat/ApplicationFeatureIdTest.java | 4 +-
.../ApplicationFeatureRepositoryDefaultTest.java | 2 +-
...zerForRecoverableException_recognizes_Test.java | 4 +-
.../metamodel/MetaModelServiceDefaultTest.java | 4 +-
.../spec/ObjectSpecIdTest_valueSemantics.java | 2 +-
.../specloader/SpecificationCacheDefaultTest.java | 4 +-
...ionParameterAbstractTest_getId_and_getName.java | 5 +-
.../specimpl/ObjectAssociationAbstractTest.java | 4 +-
...ObjectAssociationAbstractTest_alwaysHidden.java | 4 +-
.../jmocking/ImposteriserUsingCodegenPlugin.java | 92 ++++++
.../jmocking/Imposterisers.java} | 22 +-
.../jmocking/InjectIntoJMockAction.java | 63 ++++
.../unittestsupport/jmocking/IsisActions.java | 60 ++++
.../unittestsupport/jmocking/JMockActions.java | 86 ++++++
.../jmocking/JUnitRuleMockery2.java | 321 +++++++++++++++++++++
.../unittestsupport/jmocking/MyMockomatic.java | 110 +++++++
.../jmocking/PostponedAction.java} | 30 +-
53 files changed, 884 insertions(+), 89 deletions(-)
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index ba7c946..b821a8d 100644
--- a/core/metamodel/pom.xml
+++ b/core/metamodel/pom.xml
@@ -168,12 +168,70 @@
</dependency>
<dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-codegen-bytebuddy</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- SPRING -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-test</artifactId>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
+ <exclusion>
+ <!-- when spring-boot release lags behind spring-core release explicitly
+ spring-test added below -->
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ </exclusion>
+ <exclusion>
+ <!-- when spring-boot release lags behind spring-core release explicitly
+ spring-test added below -->
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <!-- we use log4j-2 instead -->
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.picocontainer</groupId>
+ <artifactId>picocontainer</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
<version>${hibernate-validator.version}</version>
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_configTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_configTest.java
index 73c6ee8..604ed48 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_configTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_configTest.java
@@ -25,8 +25,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import org.apache.isis.core.metamodel.context.MetaModelContext;
-import org.apache.isis.core.unittestsupport.config.IsisConfigurationLegacy;
-import org.apache.isis.core.unittestsupport.config._Config;
+import org.apache.isis.core.config.unittestsupport.IsisConfigurationLegacy;
+import org.apache.isis.core.config.unittestsupport.internal._Config;
import lombok.val;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryJUnit4TestCase.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryJUnit4TestCase.java
index c0d04f8..ac090f2 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryJUnit4TestCase.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryJUnit4TestCase.java
@@ -49,8 +49,8 @@ import org.apache.isis.core.metamodel.spec.feature.OneToOneActionParameter;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public abstract class AbstractFacetFactoryJUnit4TestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryTest.java
index b2d37d5..ef74776 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryTest.java
@@ -38,7 +38,7 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.security.authentication.AuthenticationSession;
import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2;
import junit.framework.TestCase;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ObjectAdapterUtilsTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ObjectAdapterUtilsTest.java
index 74398d1..6556569 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ObjectAdapterUtilsTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ObjectAdapterUtilsTest.java
@@ -28,8 +28,8 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class ObjectAdapterUtilsTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/ActionMethodsFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/ActionMethodsFacetFactoryTest.java
index a51119f..ddec82e 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/ActionMethodsFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/ActionMethodsFacetFactoryTest.java
@@ -53,7 +53,7 @@ import org.apache.isis.core.metamodel.facets.param.defaults.methodnum.ActionPara
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.testspec.ObjectSpecificationStub;
import org.apache.isis.core.security.authentication.AuthenticationSession;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2;
import lombok.val;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/prototype/PrototypeFacetAbstractTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/prototype/PrototypeFacetAbstractTest.java
index d2d3755..940454a 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/prototype/PrototypeFacetAbstractTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/prototype/PrototypeFacetAbstractTest.java
@@ -27,7 +27,7 @@ import static org.junit.Assert.assertEquals;
import org.apache.isis.core.commons.internal.environment.DeploymentType;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.interactions.VisibilityContext;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2;
public class PrototypeFacetAbstractTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/CollectionFieldMethodsFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/CollectionFieldMethodsFacetFactoryTest.java
index f0d1b15..dba439d 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/CollectionFieldMethodsFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/CollectionFieldMethodsFacetFactoryTest.java
@@ -50,8 +50,8 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.facets.collections.clear.CollectionClearFacetFactory;
import org.apache.isis.core.metamodel.facets.collections.clear.CollectionClearFacetViaAccessor;
import org.apache.isis.core.metamodel.facets.collections.clear.CollectionClearFacetViaClearMethod;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import lombok.val;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/JavaCollectionFacetTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/JavaCollectionFacetTest.java
index 71d6fd0..75d84ab 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/JavaCollectionFacetTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/JavaCollectionFacetTest.java
@@ -39,8 +39,8 @@ import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.ObjectAdapterProvider;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.collections.javautilcollection.JavaCollectionFacet;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class JavaCollectionFacetTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java
index d96a1ee..cfd8221 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java
@@ -41,8 +41,8 @@ import org.apache.isis.core.metamodel.progmodel.ProgrammingModelAbstract;
import org.apache.isis.core.metamodel.progmodel.ProgrammingModelInitFilterDefault;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorAbstract;
import org.apache.isis.core.metamodel.specloader.validator.ValidationFailures;
-import org.apache.isis.core.unittestsupport.config._Config;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.config.unittestsupport.internal._Config;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2;
import lombok.val;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/defaults/DefaultedFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/defaults/DefaultedFacetFactoryTest.java
index 0359702..01bae00 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/defaults/DefaultedFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/defaults/DefaultedFacetFactoryTest.java
@@ -24,7 +24,7 @@ import org.apache.isis.applib.annotation.Defaulted;
import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessClassContext;
import org.apache.isis.core.metamodel.facets.object.defaults.annotcfg.DefaultedFacetAnnotationElseConfigurationFactory;
-import org.apache.isis.core.unittestsupport.config._Config;
+import org.apache.isis.core.config.unittestsupport.internal._Config;
public class DefaultedFacetFactoryTest extends AbstractFacetFactoryTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
index b7b63bd..319b294 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
@@ -61,7 +61,7 @@ import org.apache.isis.core.metamodel.facets.object.publishedobject.PublishedObj
import org.apache.isis.core.metamodel.facets.object.viewmodel.ViewModelFacet;
import org.apache.isis.core.metamodel.facets.objectvalue.choices.ChoicesFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
-import org.apache.isis.core.unittestsupport.config._Config;
+import org.apache.isis.core.config.unittestsupport.internal._Config;
import lombok.val;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFactoryTest.java
index ff7aa04..177b31a 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFactoryTest.java
@@ -47,7 +47,7 @@ import org.apache.isis.core.metamodel.facets.members.cssclassfa.CssClassFaFacet;
import org.apache.isis.core.metamodel.facets.members.cssclassfa.CssClassFaPosition;
import org.apache.isis.core.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacet;
import org.apache.isis.core.metamodel.facets.object.plural.PluralFacet;
-import org.apache.isis.core.unittestsupport.config._Config;
+import org.apache.isis.core.config.unittestsupport.internal._Config;
public class DomainObjectLayoutFactoryTest extends AbstractFacetFactoryJUnit4TestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleFacetViaTitleAnnotationTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleFacetViaTitleAnnotationTest.java
index 722563d..b4c933e 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleFacetViaTitleAnnotationTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleFacetViaTitleAnnotationTest.java
@@ -41,8 +41,8 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.Annotations;
import org.apache.isis.core.metamodel.objectmanager.ObjectManager;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class TitleFacetViaTitleAnnotationTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacetUsingParserTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacetUsingParserTest.java
index 71be3d6..5e28408 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacetUsingParserTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacetUsingParserTest.java
@@ -37,8 +37,8 @@ import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.parseable.parser.ParseableFacetUsingParser;
import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class ParseableFacetUsingParserTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacetAnnotationOrConfigurationFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacetAnnotationOrConfigurationFactoryTest.java
index 776f10d..98066e3 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacetAnnotationOrConfigurationFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacetAnnotationOrConfigurationFactoryTest.java
@@ -35,7 +35,7 @@ import org.apache.isis.core.metamodel.facets.object.value.annotcfg.ValueFacetAnn
import org.apache.isis.core.metamodel.facets.object.value.annotcfg.ValueFacetAnnotationOrConfigurationFactory;
import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueSemanticsProviderUtil;
import org.apache.isis.core.metamodel.facets.objectvalue.typicallen.TypicalLengthFacet;
-import org.apache.isis.core.unittestsupport.config._Config;
+import org.apache.isis.core.config.unittestsupport.internal._Config;
public class ValueFacetAnnotationOrConfigurationFactoryTest extends AbstractFacetFactoryTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ordering/memberorder/DeweyOrderSetTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ordering/memberorder/DeweyOrderSetTest.java
index 3ba024d..0105ad0 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ordering/memberorder/DeweyOrderSetTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ordering/memberorder/DeweyOrderSetTest.java
@@ -34,7 +34,7 @@ import org.apache.isis.core.metamodel.facetapi.IdentifiedHolder;
import org.apache.isis.core.metamodel.facets.FacetedMethod;
import org.apache.isis.core.metamodel.facets.members.order.annotprop.MemberOrderFacetAnnotation;
import org.apache.isis.core.metamodel.layout.DeweyOrderSet;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2;
import junit.framework.TestCase;
import junit.framework.TestSuite;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ordering/memberorder/MemberOrderAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ordering/memberorder/MemberOrderAnnotationFacetFactoryTest.java
index 9eb2c9b..b4f6318 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ordering/memberorder/MemberOrderAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ordering/memberorder/MemberOrderAnnotationFacetFactoryTest.java
@@ -35,7 +35,7 @@ import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
import org.apache.isis.core.metamodel.facets.members.order.MemberOrderFacet;
import org.apache.isis.core.metamodel.facets.members.order.annotprop.MemberOrderFacetAnnotation;
import org.apache.isis.core.metamodel.facets.members.order.annotprop.MemberOrderFacetFactory;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2;
public class MemberOrderAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ordering/memberorder/MemberOrderComparatorTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ordering/memberorder/MemberOrderComparatorTest.java
index 621bcd5..5766504 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ordering/memberorder/MemberOrderComparatorTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ordering/memberorder/MemberOrderComparatorTest.java
@@ -30,7 +30,7 @@ import org.apache.isis.core.commons.internal.context._Context;
import org.apache.isis.core.metamodel.facets.FacetedMethod;
import org.apache.isis.core.metamodel.facets.members.order.annotprop.MemberOrderFacetAnnotation;
import org.apache.isis.core.metamodel.layout.memberorderfacet.MemberOrderComparator;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2;
import junit.framework.TestCase;
import junit.framework.TestSuite;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/promptstyle/PromptStyleFacetFromPropertyAnnotation_Test.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/promptstyle/PromptStyleFacetFromPropertyAnnotation_Test.java
index a819306..bac9634 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/promptstyle/PromptStyleFacetFromPropertyAnnotation_Test.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/promptstyle/PromptStyleFacetFromPropertyAnnotation_Test.java
@@ -39,7 +39,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.promptStyle.PromptStyleFacet;
import org.apache.isis.core.metamodel.facets.object.promptStyle.PromptStyleFacetAsConfigured;
import org.apache.isis.core.metamodel.facets.properties.propertylayout.PromptStyleFacetForPropertyLayoutAnnotation;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2;
public class PromptStyleFacetFromPropertyAnnotation_Test {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
index cdfe4af..453bc77 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
@@ -39,6 +39,7 @@ import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.events.domain.PropertyDomainEvent;
import org.apache.isis.applib.spec.Specification;
+import org.apache.isis.core.config.unittestsupport.internal._Config;
import org.apache.isis.core.metamodel.commons.matchers.IsisMatchers;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.facetapi.Facet;
@@ -76,7 +77,6 @@ import org.apache.isis.core.metamodel.facets.properties.update.modify.PropertySe
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.core.unittestsupport.config._Config;
import lombok.val;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigDecimalValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigDecimalValueSemanticsProviderTest.java
index 20dc05e..7918946 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigDecimalValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigDecimalValueSemanticsProviderTest.java
@@ -32,7 +32,7 @@ import org.apache.isis.core.metamodel.context.MetaModelContextAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
-import org.apache.isis.core.unittestsupport.config._Config;
+import org.apache.isis.core.config.unittestsupport.internal._Config;
public class BigDecimalValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigIntValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigIntValueSemanticsProviderTest.java
index 75eaf05..3d5d5b4 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigIntValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigIntValueSemanticsProviderTest.java
@@ -32,7 +32,7 @@ import org.apache.isis.core.metamodel.context.MetaModelContextAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
-import org.apache.isis.core.unittestsupport.config._Config;
+import org.apache.isis.core.config.unittestsupport.internal._Config;
public class BigIntValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ByteValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ByteValueSemanticsProviderTest.java
index 41ab4b0..7ac38b2 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ByteValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ByteValueSemanticsProviderTest.java
@@ -31,7 +31,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.core.metamodel.facets.value.bytes.ByteValueSemanticsProviderAbstract;
import org.apache.isis.core.metamodel.facets.value.bytes.ByteWrapperValueSemanticsProvider;
-import org.apache.isis.core.unittestsupport.config._Config;
+import org.apache.isis.core.config.unittestsupport.internal._Config;
public class ByteValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/DoubleValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/DoubleValueSemanticsProviderTest.java
index 2faebe9..36b1f37 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/DoubleValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/DoubleValueSemanticsProviderTest.java
@@ -30,7 +30,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.core.metamodel.facets.value.doubles.DoubleWrapperValueSemanticsProvider;
-import org.apache.isis.core.unittestsupport.config._Config;
+import org.apache.isis.core.config.unittestsupport.internal._Config;
public class DoubleValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/FloatValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/FloatValueSemanticsProviderTest.java
index 728c347..db9fa86 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/FloatValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/FloatValueSemanticsProviderTest.java
@@ -31,7 +31,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.core.metamodel.facets.value.floats.FloatValueSemanticsProviderAbstract;
import org.apache.isis.core.metamodel.facets.value.floats.FloatWrapperValueSemanticsProvider;
-import org.apache.isis.core.unittestsupport.config._Config;
+import org.apache.isis.core.config.unittestsupport.internal._Config;
public class FloatValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ImageValueSemanticsProviderAbstractTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ImageValueSemanticsProviderAbstractTest.java
index 104f00d..e05d5db 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ImageValueSemanticsProviderAbstractTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ImageValueSemanticsProviderAbstractTest.java
@@ -32,9 +32,9 @@ import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.value.image.ImageValueSemanticsProviderAbstract;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.core.unittestsupport.config.IsisConfigurationLegacy;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.config.unittestsupport.IsisConfigurationLegacy;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class ImageValueSemanticsProviderAbstractTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/IntValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/IntValueSemanticsProviderTest.java
index 76ff5b4..d3924bd 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/IntValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/IntValueSemanticsProviderTest.java
@@ -31,7 +31,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.core.metamodel.facets.value.integer.IntValueSemanticsProviderAbstract;
import org.apache.isis.core.metamodel.facets.value.integer.IntWrapperValueSemanticsProvider;
-import org.apache.isis.core.unittestsupport.config._Config;
+import org.apache.isis.core.config.unittestsupport.internal._Config;
public class IntValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlDateValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlDateValueSemanticsProviderTest.java
index c667fbf..cfe16c5 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlDateValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlDateValueSemanticsProviderTest.java
@@ -36,7 +36,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.core.metamodel.facets.value.datesql.JavaSqlDateValueSemanticsProvider;
-import org.apache.isis.core.unittestsupport.config._Config;
+import org.apache.isis.core.config.unittestsupport.internal._Config;
public class JavaSqlDateValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlTimeValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlTimeValueSemanticsProviderTest.java
index b079f17..b1a87ac 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlTimeValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlTimeValueSemanticsProviderTest.java
@@ -33,7 +33,7 @@ import org.apache.isis.core.metamodel.context.MetaModelContextAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.value.timesql.JavaSqlTimeValueSemanticsProvider;
-import org.apache.isis.core.unittestsupport.config._Config;
+import org.apache.isis.core.config.unittestsupport.internal._Config;
public class JavaSqlTimeValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaUtilDateValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaUtilDateValueSemanticsProviderTest.java
index 79dc56b..1a4954d 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaUtilDateValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaUtilDateValueSemanticsProviderTest.java
@@ -35,7 +35,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.core.metamodel.facets.value.dateutil.JavaUtilDateValueSemanticsProvider;
-import org.apache.isis.core.unittestsupport.config._Config;
+import org.apache.isis.core.config.unittestsupport.internal._Config;
public class JavaUtilDateValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/LongValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/LongValueSemanticsProviderTest.java
index 26332d0..3a72734 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/LongValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/LongValueSemanticsProviderTest.java
@@ -31,7 +31,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.core.metamodel.facets.value.longs.LongValueSemanticsProviderAbstract;
import org.apache.isis.core.metamodel.facets.value.longs.LongWrapperValueSemanticsProvider;
-import org.apache.isis.core.unittestsupport.config._Config;
+import org.apache.isis.core.config.unittestsupport.internal._Config;
public class LongValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ShortValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ShortValueSemanticsProviderTest.java
index 2a1cc5d..0d20cca 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ShortValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ShortValueSemanticsProviderTest.java
@@ -31,7 +31,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.core.metamodel.facets.value.shortint.ShortValueSemanticsProviderAbstract;
import org.apache.isis.core.metamodel.facets.value.shortint.ShortWrapperValueSemanticsProvider;
-import org.apache.isis.core.unittestsupport.config._Config;
+import org.apache.isis.core.config.unittestsupport.internal._Config;
public class ShortValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
index fb5d10a..23b83f5 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
@@ -46,9 +46,9 @@ import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet;
import org.apache.isis.core.metamodel.facets.object.parseable.parser.ParseableFacetUsingParser;
import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueSemanticsProviderAndFacetAbstract;
import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
-import org.apache.isis.core.unittestsupport.config._Config;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.config.unittestsupport.internal._Config;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public abstract class ValueSemanticsProviderAbstractTestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProviderTest.java
index f88b233..56a1ec0 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProviderTest.java
@@ -32,8 +32,8 @@ import static org.junit.Assert.assertThat;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.core.metamodel.MetaModelContext_forTesting;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.unittestsupport.config._Config;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.config.unittestsupport.internal._Config;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2;
public class JodaLocalDateTimeValueSemanticsProviderTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/feature/ObjectAssociationPredicatesTest_visibleWhere.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/feature/ObjectAssociationPredicatesTest_visibleWhere.java
index 87b4806..73e6ce6 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/feature/ObjectAssociationPredicatesTest_visibleWhere.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/feature/ObjectAssociationPredicatesTest_visibleWhere.java
@@ -42,8 +42,8 @@ import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facets.WhereValueFacet;
import org.apache.isis.core.metamodel.facets.all.hide.HiddenFacet;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
@RunWith(Parameterized.class)
public class ObjectAssociationPredicatesTest_visibleWhere {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureIdTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureIdTest.java
index 0cf2058..e027b0d 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureIdTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureIdTest.java
@@ -39,8 +39,8 @@ import static org.hamcrest.Matchers.lessThan;
import static org.junit.Assert.assertThat;
import org.apache.isis.applib.services.appfeat.ApplicationMemberType;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.core.unittestsupport.value.ValueTypeContractTestAbstract;
+import org.apache.isis.applib.unittestsupport.ValueTypeContractTestAbstract;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2;
public class ApplicationFeatureIdTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefaultTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefaultTest.java
index 9f93871..1b9aa0d 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefaultTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefaultTest.java
@@ -56,7 +56,7 @@ import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2;
public class ApplicationFeatureRepositoryDefaultTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/exceprecog/ExceptionRecognizerForRecoverableException_recognizes_Test.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/exceprecog/ExceptionRecognizerForRecoverableException_recognizes_Test.java
index 373a01e..737a0e1 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/exceprecog/ExceptionRecognizerForRecoverableException_recognizes_Test.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/exceprecog/ExceptionRecognizerForRecoverableException_recognizes_Test.java
@@ -28,8 +28,8 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class ExceptionRecognizerForRecoverableException_recognizes_Test {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefaultTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefaultTest.java
index 071c385..b397b11 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefaultTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefaultTest.java
@@ -53,8 +53,8 @@ import org.apache.isis.core.metamodel.spec.Hierarchical;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.specloader.specimpl.ObjectActionDefault;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
class MetaModelServiceDefaultTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/ObjectSpecIdTest_valueSemantics.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/ObjectSpecIdTest_valueSemantics.java
index e324b16..da3e0d1 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/ObjectSpecIdTest_valueSemantics.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/ObjectSpecIdTest_valueSemantics.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.spec;
import java.util.Arrays;
import java.util.List;
-import org.apache.isis.core.unittestsupport.value.ValueTypeContractTestAbstract;
+import org.apache.isis.applib.unittestsupport.ValueTypeContractTestAbstract;
public class ObjectSpecIdTest_valueSemantics extends ValueTypeContractTestAbstract<ObjectSpecId> {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationCacheDefaultTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationCacheDefaultTest.java
index f99aa12..4bd94f5 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationCacheDefaultTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationCacheDefaultTest.java
@@ -32,8 +32,8 @@ import static org.junit.Assert.assertThat;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import lombok.val;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java
index a72c159..6a56f12 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java
@@ -40,8 +40,9 @@ import org.apache.isis.core.metamodel.facets.all.named.NamedFacet;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+
public class ObjectActionParameterAbstractTest_getId_and_getName {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest.java
index a2ec67c..2e14e13 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest.java
@@ -43,8 +43,8 @@ import org.apache.isis.core.metamodel.interactions.VisibilityContext;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class ObjectAssociationAbstractTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest_alwaysHidden.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest_alwaysHidden.java
index 243c600..bae2e75 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest_alwaysHidden.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest_alwaysHidden.java
@@ -46,8 +46,8 @@ import org.apache.isis.core.metamodel.interactions.VisibilityContext;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.metamodel.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class ObjectAssociationAbstractTest_alwaysHidden {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/unittestsupport/jmocking/ImposteriserUsingCodegenPlugin.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/unittestsupport/jmocking/ImposteriserUsingCodegenPlugin.java
new file mode 100644
index 0000000..e24e966
--- /dev/null
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/unittestsupport/jmocking/ImposteriserUsingCodegenPlugin.java
@@ -0,0 +1,92 @@
+/*
+ * 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.core.metamodel.unittestsupport.jmocking;
+
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+
+import org.jmock.api.Imposteriser;
+import org.jmock.api.Invocation;
+import org.jmock.api.Invokable;
+import org.jmock.lib.JavaReflectionImposteriser;
+
+import org.apache.isis.core.codegen.bytebuddy.services.ProxyFactoryServiceByteBuddy;
+import org.apache.isis.core.commons.internal.plugins.codegen.ProxyFactory;
+
+class ImposteriserUsingCodegenPlugin implements Imposteriser {
+
+ public static final Imposteriser INSTANCE = new ImposteriserUsingCodegenPlugin();
+
+ private final Imposteriser reflectionImposteriser = new JavaReflectionImposteriser();
+
+ private ImposteriserUsingCodegenPlugin() {
+ }
+
+
+ @Override
+ public boolean canImposterise(Class<?> mockedType) {
+
+ if(mockedType.isInterface()) {
+ return reflectionImposteriser.canImposterise(mockedType);
+ }
+
+ return !mockedType.isPrimitive() &&
+ !Modifier.isFinal(mockedType.getModifiers()) &&
+ !toStringMethodIsFinal(mockedType);
+ }
+
+ @Override
+ public <T> T imposterise(final Invokable mockObject, final Class<T> mockedType, Class<?>... ancilliaryTypes) {
+ if (!canImposterise(mockedType)) {
+ throw new IllegalArgumentException(mockedType.getName() + " cannot be imposterized (either a primitive, or a final type or has final toString method)");
+ }
+
+ if(mockedType.isInterface()) {
+ return reflectionImposteriser.imposterise(mockObject, mockedType, ancilliaryTypes);
+ }
+
+
+ final ProxyFactory<T> factory = ProxyFactory.builder(mockedType)
+ .interfaces(ancilliaryTypes)
+ .build(new ProxyFactoryServiceByteBuddy());
+
+ final boolean initialize = false;
+
+ return factory.createInstance(
+ (obj, method, args)->mockObject.invoke(new Invocation(obj, method, args)),
+ initialize);
+ }
+
+ // //////////////////////////////////////
+
+ private static boolean toStringMethodIsFinal(Class<?> type) {
+ try {
+ Method toString = type.getMethod("toString");
+ return Modifier.isFinal(toString.getModifiers());
+
+ }
+ catch (SecurityException e) {
+ throw new IllegalStateException("not allowed to reflect on toString method", e);
+ }
+ catch (NoSuchMethodException e) {
+ throw new Error("no public toString method found", e);
+ }
+ }
+
+}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/ObjectSpecIdTest_valueSemantics.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/unittestsupport/jmocking/Imposterisers.java
similarity index 57%
copy from core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/ObjectSpecIdTest_valueSemantics.java
copy to core/metamodel/src/test/java/org/apache/isis/core/metamodel/unittestsupport/jmocking/Imposterisers.java
index e324b16..6a82dd3 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/ObjectSpecIdTest_valueSemantics.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/unittestsupport/jmocking/Imposterisers.java
@@ -16,23 +16,19 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.metamodel.spec;
+package org.apache.isis.core.metamodel.unittestsupport.jmocking;
-import java.util.Arrays;
-import java.util.List;
+import org.jmock.api.Imposteriser;
-import org.apache.isis.core.unittestsupport.value.ValueTypeContractTestAbstract;
+public final class Imposterisers {
-public class ObjectSpecIdTest_valueSemantics extends ValueTypeContractTestAbstract<ObjectSpecId> {
+ private Imposterisers() {}
- @Override
- protected List<ObjectSpecId> getObjectsWithSameValue() {
- return Arrays.asList(ObjectSpecId.of("CUS"), ObjectSpecId.of("CUS"), ObjectSpecId.of("CUS"));
- }
-
- @Override
- protected List<ObjectSpecId> getObjectsWithDifferentValue() {
- return Arrays.asList(ObjectSpecId.of("bUS"), ObjectSpecId.of("CUt"));
+ /**
+ * @return framework's default Imposteriser instance
+ */
+ public static Imposteriser getDefault() {
+ return ImposteriserUsingCodegenPlugin.INSTANCE;
}
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/unittestsupport/jmocking/InjectIntoJMockAction.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/unittestsupport/jmocking/InjectIntoJMockAction.java
new file mode 100644
index 0000000..dbe36de
--- /dev/null
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/unittestsupport/jmocking/InjectIntoJMockAction.java
@@ -0,0 +1,63 @@
+/*
+ * 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.core.metamodel.unittestsupport.jmocking;
+
+import java.lang.reflect.Method;
+
+import org.hamcrest.Description;
+import org.jmock.api.Action;
+import org.jmock.api.Invocation;
+
+public final class InjectIntoJMockAction implements Action {
+ @Override
+ public void describeTo(final Description description) {
+ description.appendText("inject self");
+ }
+
+ // x.injectInto(y) ---> y.setXxx(x)
+ @Override
+ public Object invoke(final Invocation invocation) throws Throwable {
+ final Object injectable = invocation.getInvokedObject();
+ final Object toInjectInto = invocation.getParameter(0);
+ final Method[] methods = toInjectInto.getClass().getMethods();
+ for (final Method method : methods) {
+ if (!method.getName().startsWith("set")) {
+ continue;
+ }
+ if (method.getParameterTypes().length != 1) {
+ continue;
+ }
+ final Class<?> methodParameterType = method.getParameterTypes()[0];
+ if (methodParameterType.isAssignableFrom(injectable.getClass())) {
+ method.invoke(toInjectInto, injectable);
+ break;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Factory
+ */
+ public static Action injectInto() {
+ return new InjectIntoJMockAction();
+ }
+
+}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/unittestsupport/jmocking/IsisActions.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/unittestsupport/jmocking/IsisActions.java
new file mode 100644
index 0000000..4e47164
--- /dev/null
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/unittestsupport/jmocking/IsisActions.java
@@ -0,0 +1,60 @@
+/*
+ * 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.core.metamodel.unittestsupport.jmocking;
+
+import org.hamcrest.Description;
+import org.jmock.api.Action;
+import org.jmock.api.Invocation;
+
+public final class IsisActions {
+
+ private IsisActions() {
+ }
+
+ public static Action injectInto() {
+ return InjectIntoJMockAction.injectInto();
+ }
+
+ @SafeVarargs
+ public static <T> Action returnEach(final T... values) {
+ return JMockActions.returnEach(values);
+ }
+
+ public static Action returnArgument(final int i) {
+ return JMockActions.returnArgument(i);
+ }
+
+ public static Action returnNewTransientInstance() {
+ return new Action(){
+
+ @Override
+ public void describeTo(Description description) {
+ description.appendText("new transient instance");
+ }
+
+ @Override
+ public Object invoke(Invocation invocation) throws Throwable {
+ Class<?> cls = (Class<?>) invocation.getParameter(0);
+ return cls.newInstance();
+ }
+ };
+ }
+
+
+}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/unittestsupport/jmocking/JMockActions.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/unittestsupport/jmocking/JMockActions.java
new file mode 100644
index 0000000..1247486
--- /dev/null
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/unittestsupport/jmocking/JMockActions.java
@@ -0,0 +1,86 @@
+/*
+ * 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.core.metamodel.unittestsupport.jmocking;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Iterator;
+
+import org.hamcrest.Description;
+import org.jmock.api.Action;
+import org.jmock.api.Invocation;
+
+public final class JMockActions {
+
+ private JMockActions() {
+ }
+
+ @SafeVarargs
+ public static <T> Action returnEach(final T... values) {
+ return new ReturnEachAction<T>(values);
+ }
+
+ public static Action returnArgument(final int i) {
+ return new ReturnArgumentJMockAction(i);
+ }
+
+ private static class ReturnEachAction<T> implements Action {
+
+ private final Collection<T> collection;
+ private final Iterator<T> iterator;
+
+ ReturnEachAction(Collection<T> collection) {
+ this.collection = collection;
+ this.iterator = collection.iterator();
+ }
+
+ @SafeVarargs
+ private ReturnEachAction(T... array) {
+ this(Arrays.asList(array));
+ }
+
+ @Override
+ public T invoke(Invocation invocation) throws Throwable {
+ return iterator.next();
+ }
+
+ @Override
+ public void describeTo(Description description) {
+ description.appendValueList("return iterator.next() over ", ", ", "", collection);
+ }
+ }
+
+ private static final class ReturnArgumentJMockAction implements Action {
+ private final int i;
+
+ private ReturnArgumentJMockAction(final int i) {
+ this.i = i;
+ }
+
+ @Override
+ public void describeTo(final Description description) {
+ description.appendText("parameter #" + i + " ");
+ }
+
+ @Override
+ public Object invoke(final Invocation invocation) throws Throwable {
+ return invocation.getParameter(i);
+ }
+ }
+}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/unittestsupport/jmocking/JUnitRuleMockery2.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/unittestsupport/jmocking/JUnitRuleMockery2.java
new file mode 100644
index 0000000..9f903e0
--- /dev/null
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/unittestsupport/jmocking/JUnitRuleMockery2.java
@@ -0,0 +1,321 @@
+/*
+ * 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.core.metamodel.unittestsupport.jmocking;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.util.List;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import org.jmock.Expectations;
+import org.jmock.auto.Mock;
+import org.jmock.integration.junit4.JUnit4Mockery;
+import org.jmock.internal.AllDeclaredFields;
+import org.jmock.lib.concurrent.Synchroniser;
+import org.junit.rules.MethodRule;
+import org.junit.runners.model.FrameworkMethod;
+import org.junit.runners.model.Statement;
+import org.picocontainer.MutablePicoContainer;
+import org.picocontainer.PicoBuilder;
+
+import static org.junit.Assert.fail;
+
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.context._Context;
+import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
+
+import junit.framework.AssertionFailedError;
+
+
+/**
+ * Use as a <tt>@Rule</tt>, meaning that the <tt>@RunWith(JMock.class)</tt> can
+ * be ignored.
+ *
+ * <pre>
+ * public class MyTest {
+ *
+ * @Rule
+ * public final Junit4Mockery2 context = Junit4Mockery2.createFor(Mode.INTERFACES);
+ *
+ * }
+ * </pre>
+ *
+ * <p>
+ * The class also adds some convenience methods, and uses a factory method to
+ * make it explicit whether the context can mock only interfaces or interfaces
+ * and classes.
+ *
+ * <p>
+ * Used by domain apps only.
+ * </p>
+ */
+public class JUnitRuleMockery2 extends JUnit4Mockery implements MethodRule {
+
+ /**
+ * Factory method.
+ */
+ public static JUnitRuleMockery2 createFor(final Mode mode) {
+
+ _Context.computeIfAbsent(IsisSystemEnvironment.class, IsisSystemEnvironment::new)
+ .setUnitTesting(true);
+
+ final JUnitRuleMockery2 jUnitRuleMockery2 = new JUnitRuleMockery2();
+ if (mode == Mode.INTERFACES_AND_CLASSES) {
+ jUnitRuleMockery2.setImposteriser(Imposterisers.getDefault());
+ }
+ jUnitRuleMockery2.setThreadingPolicy(new Synchroniser());
+ return jUnitRuleMockery2;
+ }
+
+
+ /**
+ * Annotate the field that references the class under test;
+ * is automatically instantiated and autowired by this class,
+ * accessible to the test using {@link JUnitRuleMockery2#getClassUnderTest()}.
+ */
+ @Retention(RUNTIME)
+ @Target(FIELD)
+ public static @interface ClassUnderTest {}
+
+ /**
+ * Annotate fields annotated with {@link Mock}, to indicate that they should be set up
+ * with an {@link Expectations#ignoring(Object)} expectation.
+ */
+ @Retention(RUNTIME)
+ @Target(FIELD)
+ public static @interface Ignoring {}
+
+ /**
+ * Annotate fields annotated with {@link Mock}, to indicate that they should be set up
+ * with an {@link Expectations#allowing(Object)} expectation.
+ */
+ @Retention(RUNTIME)
+ @Target(FIELD)
+ public static @interface Allowing {}
+
+ /**
+ * Annotate fields annotated with {@link Mock}, to indicate that they should be set up
+ * with an {@link Expectations#never(Object)} expectation.
+ */
+ @Retention(RUNTIME)
+ @Target(FIELD)
+ public static @interface Never {}
+
+ /**
+ * Annotate fields annotated with {@link Mock}, to indicate that they should be set up
+ * with an {@link Expectations#one(Object)} expectation.
+ */
+ @Retention(RUNTIME)
+ @Target(FIELD)
+ public static @interface One {}
+
+
+ /**
+ * Annotate fields annotated with {@link Mock}, to indicate that they should be set up
+ * to check the specified {@link ExpectationsOn expectation}.
+ */
+ @Retention(RUNTIME)
+ @Target(FIELD)
+ public static @interface Checking {
+ Class<? extends ExpectationsOn> value() default ExpectationsOn.class;
+ }
+
+ public static enum Mode {
+ INTERFACES_ONLY, INTERFACES_AND_CLASSES;
+ }
+
+ private final MyMockomatic mockomatic = new MyMockomatic(this);
+ private final MutablePicoContainer container = new PicoBuilder().withConstructorInjection().withSetterInjection().build();
+ private Class<?> cutType;
+
+ private JUnitRuleMockery2() {
+ }
+
+ @Override
+ public Statement apply(final Statement base, final FrameworkMethod method, final Object target) {
+ return new Statement() {
+
+ @Override
+ public void evaluate() throws Throwable {
+ prepare(target);
+ base.evaluate();
+ assertIsSatisfied();
+ }
+
+ private void prepare(final Object target) throws IllegalAccessException {
+ final List<Field> allFields = AllDeclaredFields.in(target.getClass());
+ assertOnlyOneJMockContextIn(allFields);
+ List<Object> mocks = fillInAutoMocks(target, allFields);
+ Field cutField = locateClassUnderTestFieldIfAny(allFields);
+ if (cutField != null) {
+ cutType = cutField.getType();
+ for (Object mock : mocks) {
+ container.addComponent(mock);
+ }
+ container.addComponent(cutType);
+
+ final Object cut = container.getComponent(cutType);
+ cutField.setAccessible(true);
+ cutField.set(target, cut);
+
+ } else {
+ cutType = null;
+ }
+
+ }
+
+ private void assertOnlyOneJMockContextIn(final List<Field> allFields) {
+ Field contextField = null;
+ for (final Field field : allFields) {
+ if (JUnitRuleMockery2.class.isAssignableFrom(field.getType())) {
+ if (null != contextField) {
+ fail("Test class should only have one JUnitRuleMockery2 field, found " + contextField.getName() + " and " + field.getName());
+ }
+ contextField = field;
+ }
+ }
+ }
+
+
+ protected Field locateClassUnderTestFieldIfAny(final List<Field> allFields) {
+ Field cutField = null;
+ for (final Field field : allFields) {
+ if(field.getAnnotation(ClassUnderTest.class) != null) {
+ if (null != cutField) {
+ fail("Test class should only have one field annotated with @ClassUnderTest, found " + cutField.getName() + " and " + field.getName());
+ }
+ cutField = field;
+ }
+ }
+ return cutField;
+ }
+
+ private List<Object> fillInAutoMocks(final Object target, final List<Field> allFields) {
+ return mockomatic.fillIn(target, allFields);
+ }
+ };
+ }
+
+
+ public <T> T getClassUnderTest() {
+ if(cutType == null) {
+ throw new IllegalStateException("No field annotated @ClassUnderTest was found");
+ }
+ return _Casts.uncheckedCast( container.getComponent(cutType) );
+ }
+
+
+ /**
+ * Ignoring any interaction with the mock; an allowing/ignoring mock will be
+ * returned in turn.
+ */
+ public <T> T ignoring(final T mock) {
+ checking(new Expectations() {
+ {
+ ignoring(mock);
+ }
+ });
+ return mock;
+ }
+
+ /**
+ * Allow any interaction with the mock; an allowing mock will be returned in
+ * turn.
+ */
+ public <T> T allowing(final T mock) {
+ checking(new Expectations() {
+ {
+ allowing(mock);
+ }
+ });
+ return mock;
+ }
+
+ /**
+ * Prohibit any interaction with the mock.
+ */
+ public <T> T never(final T mock) {
+ checking(new Expectations() {
+ {
+ never(mock);
+ }
+ });
+ return mock;
+ }
+
+ /**
+ * Ignore a set of mocks.
+ */
+ public void ignoring(Object... mocks) {
+ for (Object mock : mocks) {
+ ignoring(mock);
+ }
+ }
+
+
+ /**
+ * Require one interaction
+ * @return
+ */
+ public Object oneOf(final Object mock) {
+ checking(new Expectations() {
+ {
+ oneOf(mock);
+ }
+ });
+ return mock;
+ }
+
+ /**
+ * Require one interaction
+ * @return
+ * @deprecated use {@link #oneOf(Object)} instead
+ */
+ @Deprecated
+ public Object one(final Object mock) {
+ return oneOf(mock);
+ }
+
+ public static class ExpectationsOn<T> extends Expectations {
+ public ExpectationsOn(Object mock) {
+ this.mockObj = _Casts.uncheckedCast( mock );
+ }
+ private T mockObj;
+ public T mock() {
+ return mockObj;
+ }
+ }
+
+ public <T> T checking(T mock, Class<? extends ExpectationsOn<T>> expectationsClass) {
+ try {
+ Constructor<? extends ExpectationsOn<T>> constructor = expectationsClass.getConstructor(Object.class);
+ ExpectationsOn<T> expectations = constructor.newInstance(mock);
+ checking(expectations);
+ return mock;
+ } catch (Exception e) {
+ throw new AssertionFailedError("Unable to instantiate expectations class '" + expectationsClass.getName() + "'");
+ }
+ }
+
+
+}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/unittestsupport/jmocking/MyMockomatic.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/unittestsupport/jmocking/MyMockomatic.java
new file mode 100644
index 0000000..4422574
--- /dev/null
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/unittestsupport/jmocking/MyMockomatic.java
@@ -0,0 +1,110 @@
+/*
+ * 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.core.metamodel.unittestsupport.jmocking;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jmock.Sequence;
+import org.jmock.States;
+import org.jmock.auto.Auto;
+import org.jmock.auto.Mock;
+
+class MyMockomatic {
+ private final JUnitRuleMockery2 context;
+
+ public MyMockomatic(final JUnitRuleMockery2 context) {
+ this.context = context;
+ }
+
+ public List<Object> fillIn(final Object object, final List<Field> knownFields) {
+ List<Object> mocks = new ArrayList<Object>();
+ for (final Field field : knownFields) {
+ autoMockIfAnnotated(object, field, mocks);
+ autoInstantiateIfAnnotated(object, field);
+ }
+ return mocks;
+ }
+
+ private void autoMockIfAnnotated(final Object object,
+ final Field field, List<Object> mocks) {
+ if (!field.isAnnotationPresent(Mock.class)) {
+ return;
+ }
+ final Object mock = context.mock(field.getType(), field.getName());
+ setAutoField(field, object, mock, "auto-mock field " + field.getName());
+ if(field.isAnnotationPresent(JUnitRuleMockery2.Ignoring.class)) {
+ context.ignoring(mock);
+ }
+ if(field.isAnnotationPresent(JUnitRuleMockery2.Allowing.class)) {
+ context.allowing(mock);
+ }
+ if(field.isAnnotationPresent(JUnitRuleMockery2.Never.class)) {
+ context.never(mock);
+ }
+ if(field.isAnnotationPresent(JUnitRuleMockery2.One.class)) {
+ context.oneOf(mock);
+ }
+ if(field.isAnnotationPresent(JUnitRuleMockery2.Checking.class)) {
+ checking(field, mock);
+ }
+ mocks.add(mock);
+ }
+
+ private <T> void checking(final Field field, final T mock) {
+ JUnitRuleMockery2.Checking checking = field.getAnnotation(JUnitRuleMockery2.Checking.class);
+ @SuppressWarnings("unchecked")
+ Class<? extends JUnitRuleMockery2.ExpectationsOn<T>> expectationsOnClass = (Class<? extends JUnitRuleMockery2.ExpectationsOn<T>>) checking.value();
+ context.checking(mock, expectationsOnClass);
+ }
+
+ private void autoInstantiateIfAnnotated(final Object object,
+ final Field field) {
+ if (!field.isAnnotationPresent(Auto.class)) {
+ return;
+ }
+ final Class<?> type = field.getType();
+ if (type == States.class) {
+ autoInstantiateStates(field, object);
+ } else if (type == Sequence.class) {
+ autoInstantiateSequence(field, object);
+ } else {
+ throw new IllegalStateException("cannot auto-instantiate field of type " + type.getName());
+ }
+ }
+
+ private void autoInstantiateStates(final Field field, final Object object) {
+ setAutoField(field, object, context.states(field.getName()), "auto-instantiate States field " + field.getName());
+ }
+
+ private void autoInstantiateSequence(final Field field, final Object object) {
+ setAutoField(field, object, context.sequence(field.getName()), "auto-instantiate Sequence field " + field.getName());
+ }
+
+ private void setAutoField(final Field field, final Object object, final Object value, final String description) {
+ try {
+ field.setAccessible(true);
+ field.set(object, value);
+ } catch (final IllegalAccessException e) {
+ throw new IllegalStateException("cannot " + description, e);
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/ObjectSpecIdTest_valueSemantics.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/unittestsupport/jmocking/PostponedAction.java
similarity index 54%
copy from core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/ObjectSpecIdTest_valueSemantics.java
copy to core/metamodel/src/test/java/org/apache/isis/core/metamodel/unittestsupport/jmocking/PostponedAction.java
index e324b16..cb43b6a 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/ObjectSpecIdTest_valueSemantics.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/unittestsupport/jmocking/PostponedAction.java
@@ -16,23 +16,31 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.metamodel.spec;
+package org.apache.isis.core.metamodel.unittestsupport.jmocking;
-import java.util.Arrays;
-import java.util.List;
+import java.util.function.Supplier;
-import org.apache.isis.core.unittestsupport.value.ValueTypeContractTestAbstract;
+import org.hamcrest.Description;
+import org.jmock.api.Action;
+import org.jmock.api.Invocation;
-public class ObjectSpecIdTest_valueSemantics extends ValueTypeContractTestAbstract<ObjectSpecId> {
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
- @Override
- protected List<ObjectSpecId> getObjectsWithSameValue() {
- return Arrays.asList(ObjectSpecId.of("CUS"), ObjectSpecId.of("CUS"), ObjectSpecId.of("CUS"));
+@RequiredArgsConstructor(staticName = "returnValuePostponed")
+public class PostponedAction implements Action {
+
+ @NonNull private Supplier<Object> resultSupplier;
+
+ public Object invoke(Invocation invocation) throws Throwable {
+ return resultSupplier.get();
}
- @Override
- protected List<ObjectSpecId> getObjectsWithDifferentValue() {
- return Arrays.asList(ObjectSpecId.of("bUS"), ObjectSpecId.of("CUt"));
+ public void describeTo(Description description) {
+ description.appendText("returns ");
+ description.appendValue(resultSupplier.get());
}
+
+
}
[isis] 15/25: ISIS-2273: more fixing of classpath
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2062
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 83216d213951f37be48a245a55e73982544e2dfe
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jan 29 18:02:14 2020 +0000
ISIS-2273: more fixing of classpath
---
legacy/extensions/core/metamodel/pom.xml | 8 ++++++++
.../facets/value/PercentageValueSemanticsProviderTest.java | 2 +-
...ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java | 1 -
.../viewer/context/ResourceContext_getArg_Test.java | 4 ----
4 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/legacy/extensions/core/metamodel/pom.xml b/legacy/extensions/core/metamodel/pom.xml
index b2db11a..9432d1a 100644
--- a/legacy/extensions/core/metamodel/pom.xml
+++ b/legacy/extensions/core/metamodel/pom.xml
@@ -80,6 +80,14 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-config</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-metamodel</artifactId>
<scope>test</scope>
<type>test-jar</type>
diff --git a/legacy/extensions/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/PercentageValueSemanticsProviderTest.java b/legacy/extensions/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/PercentageValueSemanticsProviderTest.java
index 714f83a..b46f63f 100644
--- a/legacy/extensions/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/PercentageValueSemanticsProviderTest.java
+++ b/legacy/extensions/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/PercentageValueSemanticsProviderTest.java
@@ -24,13 +24,13 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
+import org.apache.isis.core.config.unittestsupport.internal._Config;
import org.apache.isis.legacy.applib.value.Percentage;
import org.apache.isis.legacy.metamodel.facets.value.percentage.PercentageValueSemanticsProvider;
import org.apache.isis.core.metamodel.context.MetaModelContextAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.value.ValueSemanticsProviderAbstractTestCase;
-import org.apache.isis.core.unittestsupport.config._Config;
public class PercentageValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
private PercentageValueSemanticsProvider adapter;
diff --git a/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
index bdccbb0..6afde19 100644
--- a/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
+++ b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
@@ -46,7 +46,6 @@ import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
import org.apache.isis.core.runtime.session.IsisSession;
import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.core.security.authentication.AuthenticationSession;
-import org.apache.isis.core.unittestsupport.config.IsisConfigurationLegacy;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
import org.apache.isis.viewer.restfulobjects.applib.RestfulResponse.HttpStatusCode;
diff --git a/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java
index 2b213b4..9a488ce 100644
--- a/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java
+++ b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java
@@ -22,7 +22,6 @@ import java.util.HashMap;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.HttpHeaders;
import org.jmock.Expectations;
import org.jmock.auto.Mock;
@@ -34,7 +33,6 @@ import org.springframework.web.context.WebApplicationContext;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.junit.Assert.assertThat;
-import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.core.commons.internal.collections._Maps;
import org.apache.isis.core.commons.internal.url.UrlDecoderUtil;
import org.apache.isis.core.metamodel.MetaModelContext_forTesting;
@@ -42,9 +40,7 @@ import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
import org.apache.isis.core.runtime.session.IsisSession;
-import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.core.security.authentication.AuthenticationSession;
-import org.apache.isis.core.unittestsupport.config.IsisConfigurationLegacy;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
[isis] 23/25: ISIS-2273: removing core references to
isis-core-unittestsupport, ctd
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2062
in repository https://gitbox.apache.org/repos/asf/isis.git
commit a47b83355fc439c93e30fd0b4b658a164ec7d3a2
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jan 29 19:16:35 2020 +0000
ISIS-2273: removing core references to isis-core-unittestsupport, ctd
---
core/codegen-bytebuddy/pom.xml | 16 ----------------
.../commons/internal/reflection/ReflectTest.java | 2 +-
.../metamodel/facets/object/mixin/MixinIntendedAs.java | 0
.../facets/object/mixin/MixinIntendedAsActionTest.java | 0
.../facets/param/name/ParameterNameFacetTest.java | 0
core/runtime/pom.xml | 6 ++++++
core/runtimeservices/pom.xml | 6 ++++++
.../proxy/ProxyCreatorTestUsingCodegenPlugin.java | 0
core/security/pom.xml | 12 ++++++++++--
incubator/core/jsr303/pom.xml | 12 ------------
security/shiro/pom.xml | 6 ++++++
viewers/restfulobjects/rendering/pom.xml | 6 ++++++
viewers/restfulobjects/viewer/pom.xml | 5 +++++
viewers/wicket/model/pom.xml | 6 ++++++
viewers/wicket/ui/pom.xml | 7 +++++++
viewers/wicket/viewer/pom.xml | 6 ++++++
16 files changed, 59 insertions(+), 31 deletions(-)
diff --git a/core/codegen-bytebuddy/pom.xml b/core/codegen-bytebuddy/pom.xml
index 0ad22a8..3ed05e4 100644
--- a/core/codegen-bytebuddy/pom.xml
+++ b/core/codegen-bytebuddy/pom.xml
@@ -73,22 +73,6 @@
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>org.jmock</groupId>
- <artifactId>jmock-junit4</artifactId>
- <exclusions>
- <exclusion>
- <!-- for dependency convergence -->
- <groupId>junit</groupId>
- <artifactId>junit-dep</artifactId>
- </exclusion>
- <exclusion>
- <groupId>net.bytebuddy</groupId>
- <artifactId>byte-buddy</artifactId>
- </exclusion>
- </exclusions>
- <scope>test</scope>
- </dependency>
</dependencies>
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/commons/internal/reflection/ReflectTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/internal/reflection/ReflectTest.java
similarity index 98%
rename from core/detached-tests/src/test/java/org/apache/isis/core/commons/internal/reflection/ReflectTest.java
rename to core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/internal/reflection/ReflectTest.java
index fb4d6b8..cfadb66 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/core/commons/internal/reflection/ReflectTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/internal/reflection/ReflectTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.commons.internal.reflection;
+package org.apache.isis.core.metamodel.commons.internal.reflection;
import java.lang.reflect.Method;
import java.util.List;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinIntendedAs.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinIntendedAs.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinIntendedAs.java
rename to core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinIntendedAs.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinIntendedAsActionTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinIntendedAsActionTest.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinIntendedAsActionTest.java
rename to core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinIntendedAsActionTest.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/metamodel/facets/param/name/ParameterNameFacetTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/param/name/ParameterNameFacetTest.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/metamodel/facets/param/name/ParameterNameFacetTest.java
rename to core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/param/name/ParameterNameFacetTest.java
diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
index f34a415..5a5ce630 100644
--- a/core/runtime/pom.xml
+++ b/core/runtime/pom.xml
@@ -104,6 +104,12 @@
</dependency>
<dependency>
+ <groupId>org.picocontainer</groupId>
+ <artifactId>picocontainer</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<scope>test</scope>
diff --git a/core/runtimeservices/pom.xml b/core/runtimeservices/pom.xml
index 3909c2f..acc34b4 100644
--- a/core/runtimeservices/pom.xml
+++ b/core/runtimeservices/pom.xml
@@ -120,6 +120,12 @@
</dependency>
<dependency>
+ <groupId>org.picocontainer</groupId>
+ <artifactId>picocontainer</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<scope>test</scope>
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/runtimeservices/wrapper/proxy/ProxyCreatorTestUsingCodegenPlugin.java b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/proxy/ProxyCreatorTestUsingCodegenPlugin.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/runtimeservices/wrapper/proxy/ProxyCreatorTestUsingCodegenPlugin.java
rename to core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/proxy/ProxyCreatorTestUsingCodegenPlugin.java
diff --git a/core/security/pom.xml b/core/security/pom.xml
index 0072bdb..712615c 100644
--- a/core/security/pom.xml
+++ b/core/security/pom.xml
@@ -56,11 +56,13 @@
</exclusion>
</exclusions>
</dependency>
+
<dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-library</artifactId>
+ <groupId>org.picocontainer</groupId>
+ <artifactId>picocontainer</artifactId>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
@@ -77,6 +79,12 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-library</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
</project>
diff --git a/incubator/core/jsr303/pom.xml b/incubator/core/jsr303/pom.xml
index 642ace8..3c798a3 100644
--- a/incubator/core/jsr303/pom.xml
+++ b/incubator/core/jsr303/pom.xml
@@ -51,18 +51,6 @@
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
- </dependency>
-
- <dependency>
- <groupId>org.jmock</groupId>
- <artifactId>jmock</artifactId>
- <version>2.5.1</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
diff --git a/security/shiro/pom.xml b/security/shiro/pom.xml
index cc6c50a..12ccbea 100644
--- a/security/shiro/pom.xml
+++ b/security/shiro/pom.xml
@@ -137,6 +137,12 @@
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.picocontainer</groupId>
+ <artifactId>picocontainer</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
</project>
diff --git a/viewers/restfulobjects/rendering/pom.xml b/viewers/restfulobjects/rendering/pom.xml
index 98822a7..a68c01a 100644
--- a/viewers/restfulobjects/rendering/pom.xml
+++ b/viewers/restfulobjects/rendering/pom.xml
@@ -98,6 +98,12 @@
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.picocontainer</groupId>
+ <artifactId>picocontainer</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
diff --git a/viewers/restfulobjects/viewer/pom.xml b/viewers/restfulobjects/viewer/pom.xml
index 7ce0a51..43c3b34 100644
--- a/viewers/restfulobjects/viewer/pom.xml
+++ b/viewers/restfulobjects/viewer/pom.xml
@@ -114,6 +114,11 @@
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.picocontainer</groupId>
+ <artifactId>picocontainer</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
diff --git a/viewers/wicket/model/pom.xml b/viewers/wicket/model/pom.xml
index 1590141..0dbe721 100644
--- a/viewers/wicket/model/pom.xml
+++ b/viewers/wicket/model/pom.xml
@@ -121,6 +121,12 @@
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.picocontainer</groupId>
+ <artifactId>picocontainer</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
diff --git a/viewers/wicket/ui/pom.xml b/viewers/wicket/ui/pom.xml
index 6c9299f..2c99060 100644
--- a/viewers/wicket/ui/pom.xml
+++ b/viewers/wicket/ui/pom.xml
@@ -342,6 +342,13 @@
</exclusions>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.picocontainer</groupId>
+ <artifactId>picocontainer</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
diff --git a/viewers/wicket/viewer/pom.xml b/viewers/wicket/viewer/pom.xml
index 435dcc2..366b29b 100644
--- a/viewers/wicket/viewer/pom.xml
+++ b/viewers/wicket/viewer/pom.xml
@@ -213,6 +213,12 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.picocontainer</groupId>
+ <artifactId>picocontainer</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>