This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a change to branch feature/SLING-7803-junit5
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git.
from 868a514 set version to 2.3.0-SNAPSHOT
new 72976bc SLING-7803 prepare module splitup
new a8082f9 SLING-7803 update to latest mockito version
new 91a571a SLING-7803 move junit4-specific files to junit4 module
new 8e71b9c SLING-7803 introduce parent pom
new 466b3ae SLING-7803 add junit5 extension
The 5 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:
.gitignore | 2 +-
pom.xml => core/pom.xml | 60 ++--
.../testing/mock/sling/MockAdapterManagerImpl.java | 0
.../mock/sling/MockDynamicClassLoaderManager.java | 0
.../mock/sling/MockJcrResourceResolverAdapter.java | 0
.../testing/mock/sling/MockJcrSlingRepository.java | 0
.../sling/MockNoneResourceResolverAdapter.java | 0
.../apache/sling/testing/mock/sling/MockSling.java | 0
.../testing/mock/sling/MockSlingScriptHelper.java | 0
.../mock/sling/NodeTypeDefinitionScanner.java | 0
.../sling/testing/mock/sling/NodeTypeMode.java | 0
.../sling/RRMockMockResourceResolverAdapter.java | 0
.../sling/ResourceResolverFactoryInitializer.java | 0
.../testing/mock/sling/ResourceResolverType.java | 0
.../sling/ThreadsafeMockAdapterManagerWrapper.java | 0
.../testing/mock/sling/builder/ContentBuilder.java | 0
.../testing/mock/sling/builder/package-info.java | 0
.../context/ContextResourceResolverFactory.java | 0
.../sling/context/ModelAdapterFactoryUtil.java | 0
.../mock/sling/context/SlingContextImpl.java | 0
.../testing/mock/sling/context/UniqueRoot.java | 0
.../testing/mock/sling/context/package-info.java | 0
.../testing/mock/sling/loader/ContentLoader.java | 0
.../mock/sling/loader/LoaderContentHandler.java | 0
.../testing/mock/sling/loader/package-info.java | 0
.../sling/testing/mock/sling/package-info.java | 0
.../mock/sling/services/MockMimeTypeService.java | 0
.../sling/services/MockSlingSettingService.java | 0
.../testing/mock/sling/services/package-info.java | 0
.../mock/sling/servlet/MockHttpSession.java | 0
.../servlet/MockRequestDispatcherFactory.java | 0
.../mock/sling/servlet/MockRequestPathInfo.java | 0
.../mock/sling/servlet/MockServletContext.java | 0
.../sling/servlet/MockSlingHttpServletRequest.java | 0
.../servlet/MockSlingHttpServletResponse.java | 0
.../testing/mock/sling/servlet/package-info.java | 0
.../sling/spi/ResourceResolverTypeAdapter.java | 0
.../sling/testing/mock/sling/spi/package-info.java | 0
.../mock/sling/MockJcrSlingRepositoryTest.java | 4 +-
.../mock/sling/MockSlingScriptHelperTest.java | 0
.../mock/sling/NodeTypeDefinitionScannerTest.java | 0
.../mock/sling/builder/ContentBuilderTest.java | 0
.../AbstractModelAdapterFactoryUtilTest.java | 0
.../context/AbstractSlingContextImplTest.java | 0
.../ModelAdapterFactoryUtilClassesTest.java | 0
.../ModelAdapterFactoryUtilPackagesTest.java | 0
.../sling/context/NoResourceResolverTypeTest.java | 2 +-
.../context/NoSlingModelsRegistrationTest.java | 0
.../sling/context/models/OsgiServiceModel.java | 0
.../context/models/RequestAttributeModel.java | 0
.../sling/context/models/ServiceInterface.java | 0
.../sling/context/models/ServiceInterfaceImpl.java | 0
.../modelsautoreg/ClasspathRegisteredModel.java | 0
.../jcrmock/context/SlingContextImplTest.java | 0
.../loader/ContentLoaderAutoCommitTest.java | 0
.../jcrmock/loader/ContentLoaderBinaryTest.java | 2 +-
.../jcrmock/loader/ContentLoaderJsonDamTest.java | 0
.../jcrmock/loader/ContentLoaderJsonTest.java | 0
.../sling/jcrmock/resource/FindResourcesTest.java | 0
.../sling/jcrmock/resource/JcrNamespaceTest.java | 0
.../jcrmock/resource/JcrResourceResolverTest.java | 0
.../resource/MultipleResourceResolverTest.java | 0
.../resource/SlingCrudResourceResolverTest.java | 0
.../sling/jcrmock/resource/UniqueRootTest.java | 0
.../testing/mock/sling/junit/SlingContext.java | 7 +
.../mock/sling/junit/SlingContextBuilder.java | 7 +
.../mock/sling/junit/SlingContextCallback.java | 7 +
.../AbstractContentLoaderAutoCommitTest.java | 0
.../loader/AbstractContentLoaderBinaryTest.java | 2 +-
.../loader/AbstractContentLoaderJsonDamTest.java | 0
.../loader/AbstractContentLoaderJsonTest.java | 0
.../sling/resource/AbstractJcrNamespaceTest.java | 0
.../resource/AbstractJcrResourceResolverTest.java | 0
.../AbstractMultipleResourceResolverTest.java | 0
.../AbstractSlingCrudResourceResolverTest.java | 0
.../sling/resource/AbstractUniqueRootTest.java | 0
.../sling/rrmock/context/SlingContextImplTest.java | 0
.../rrmock/loader/ContentLoaderAutoCommitTest.java | 0
.../rrmock/loader/ContentLoaderBinaryTest.java | 0
.../rrmock/loader/ContentLoaderJsonDamTest.java | 0
.../sling/rrmock/loader/ContentLoaderJsonTest.java | 0
.../resource/MultipleResourceResolverTest.java | 0
.../resource/SlingCrudResourceResolverTest.java | 0
.../mock/sling/rrmock/resource/UniqueRootTest.java | 0
.../sling/services/MockMimeTypeServiceTest.java | 0
.../services/MockSlingSettingServiceTest.java | 0
.../mock/sling/servlet/MockHttpSessionTest.java | 0
.../servlet/MockSlingHttpServletRequestTest.java | 2 +-
.../servlet/MockSlingHttpServletResponseTest.java | 0
.../src}/test/resources/META-INF/MANIFEST.MF | 0
.../test/resources/SLING-INF/nodetypes/app.cnd | 0
.../resources/json-import-samples/SLING-4362.json | 0
.../resources/json-import-samples/content.json | 0
.../test/resources/json-import-samples/dam.json | 0
{src => core/src}/test/resources/sample-image.gif | Bin
junit4/pom.xml | 88 ++++++
.../testing/mock/sling/junit/SlingContext.java | 0
.../mock/sling/junit/SlingContextBuilder.java | 0
.../mock/sling/junit/SlingContextCallback.java | 0
.../testing/mock/sling/junit/package-info.java | 0
.../sling/junit/SlingContextDefaultRRTypeTest.java | 0
.../testing/mock/sling/junit/SlingContextTest.java | 2 +-
junit5/pom.xml | 112 ++++++++
.../testing/mock/sling/junit5/SlingContext.java | 104 +++++++
.../mock/sling/junit5}/SlingContextBuilder.java | 80 +++---
.../mock/sling/junit5}/SlingContextCallback.java | 4 +-
.../mock/sling/junit5/SlingContextExtension.java | 129 +++++++++
.../mock/sling/junit5/SlingContextStore.java | 91 ++++++
.../testing/mock/sling/junit5}/package-info.java | 6 +-
.../junit5}/NoSlingModelsRegistrationTest.java | 23 +-
.../junit5/SlingContextMemberInstantiatedTest.java | 53 ++++
.../mock/sling/junit5/SlingContextMemberTest.java | 52 ++++
.../mock/sling/junit5/SlingContextPluginTest.java | 105 +++++++
.../mock/sling/junit5/SlingContextTest.java | 67 +++++
parent/pom.xml | 91 ++++++
pom.xml | 310 +--------------------
relocate/pom.xml | 42 +++
117 files changed, 1059 insertions(+), 395 deletions(-)
copy pom.xml => core/pom.xml (87%)
rename {src =>
core/src}/main/java/org/apache/sling/testing/mock/sling/MockAdapterManagerImpl.java
(100%)
rename {src =>
core/src}/main/java/org/apache/sling/testing/mock/sling/MockDynamicClassLoaderManager.java
(100%)
rename {src =>
core/src}/main/java/org/apache/sling/testing/mock/sling/MockJcrResourceResolverAdapter.java
(100%)
rename {src =>
core/src}/main/java/org/apache/sling/testing/mock/sling/MockJcrSlingRepository.java
(100%)
rename {src =>
core/src}/main/java/org/apache/sling/testing/mock/sling/MockNoneResourceResolverAdapter.java
(100%)
rename {src =>
core/src}/main/java/org/apache/sling/testing/mock/sling/MockSling.java (100%)
rename {src =>
core/src}/main/java/org/apache/sling/testing/mock/sling/MockSlingScriptHelper.java
(100%)
rename {src =>
core/src}/main/java/org/apache/sling/testing/mock/sling/NodeTypeDefinitionScanner.java
(100%)
rename {src =>
core/src}/main/java/org/apache/sling/testing/mock/sling/NodeTypeMode.java (100%)
rename {src =>
core/src}/main/java/org/apache/sling/testing/mock/sling/RRMockMockResourceResolverAdapter.java
(100%)
rename {src =>
core/src}/main/java/org/apache/sling/testing/mock/sling/ResourceResolverFactoryInitializer.java
(100%)
rename {src =>
core/src}/main/java/org/apache/sling/testing/mock/sling/ResourceResolverType.java
(100%)
rename {src =>
core/src}/main/java/org/apache/sling/testing/mock/sling/ThreadsafeMockAdapterManagerWrapper.java
(100%)
rename {src =>
core/src}/main/java/org/apache/sling/testing/mock/sling/builder/ContentBuilder.java
(100%)
rename {src =>
core/src}/main/java/org/apache/sling/testing/mock/sling/builder/package-info.java
(100%)
rename {src =>
core/src}/main/java/org/apache/sling/testing/mock/sling/context/ContextResourceResolverFactory.java
(100%)
rename {src =>
core/src}/main/java/org/apache/sling/testing/mock/sling/context/ModelAdapterFactoryUtil.java
(100%)
rename {src =>
core/src}/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java
(100%)
rename {src =>
core/src}/main/java/org/apache/sling/testing/mock/sling/context/UniqueRoot.java
(100%)
rename {src =>
core/src}/main/java/org/apache/sling/testing/mock/sling/context/package-info.java
(100%)
rename {src =>
core/src}/main/java/org/apache/sling/testing/mock/sling/loader/ContentLoader.java
(100%)
rename {src =>
core/src}/main/java/org/apache/sling/testing/mock/sling/loader/LoaderContentHandler.java
(100%)
rename {src =>
core/src}/main/java/org/apache/sling/testing/mock/sling/loader/package-info.java
(100%)
copy {src =>
core/src}/main/java/org/apache/sling/testing/mock/sling/package-info.java (100%)
rename {src =>
core/src}/main/java/org/apache/sling/testing/mock/sling/services/MockMimeTypeService.java
(100%)
rename {src =>
core/src}/main/java/org/apache/sling/testing/mock/sling/services/MockSlingSettingService.java
(100%)
rename {src =>
core/src}/main/java/org/apache/sling/testing/mock/sling/services/package-info.java
(100%)
rename {src =>
core/src}/main/java/org/apache/sling/testing/mock/sling/servlet/MockHttpSession.java
(100%)
rename {src =>
core/src}/main/java/org/apache/sling/testing/mock/sling/servlet/MockRequestDispatcherFactory.java
(100%)
rename {src =>
core/src}/main/java/org/apache/sling/testing/mock/sling/servlet/MockRequestPathInfo.java
(100%)
rename {src =>
core/src}/main/java/org/apache/sling/testing/mock/sling/servlet/MockServletContext.java
(100%)
rename {src =>
core/src}/main/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequest.java
(100%)
rename {src =>
core/src}/main/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletResponse.java
(100%)
rename {src =>
core/src}/main/java/org/apache/sling/testing/mock/sling/servlet/package-info.java
(100%)
rename {src =>
core/src}/main/java/org/apache/sling/testing/mock/sling/spi/ResourceResolverTypeAdapter.java
(100%)
rename {src =>
core/src}/main/java/org/apache/sling/testing/mock/sling/spi/package-info.java
(100%)
rename {src =>
core/src}/test/java/org/apache/sling/testing/mock/sling/MockJcrSlingRepositoryTest.java
(94%)
rename {src =>
core/src}/test/java/org/apache/sling/testing/mock/sling/MockSlingScriptHelperTest.java
(100%)
rename {src =>
core/src}/test/java/org/apache/sling/testing/mock/sling/NodeTypeDefinitionScannerTest.java
(100%)
rename {src =>
core/src}/test/java/org/apache/sling/testing/mock/sling/builder/ContentBuilderTest.java
(100%)
rename {src =>
core/src}/test/java/org/apache/sling/testing/mock/sling/context/AbstractModelAdapterFactoryUtilTest.java
(100%)
rename {src =>
core/src}/test/java/org/apache/sling/testing/mock/sling/context/AbstractSlingContextImplTest.java
(100%)
rename {src =>
core/src}/test/java/org/apache/sling/testing/mock/sling/context/ModelAdapterFactoryUtilClassesTest.java
(100%)
rename {src =>
core/src}/test/java/org/apache/sling/testing/mock/sling/context/ModelAdapterFactoryUtilPackagesTest.java
(100%)
rename {src =>
core/src}/test/java/org/apache/sling/testing/mock/sling/context/NoResourceResolverTypeTest.java
(97%)
copy {src =>
core/src}/test/java/org/apache/sling/testing/mock/sling/context/NoSlingModelsRegistrationTest.java
(100%)
rename {src =>
core/src}/test/java/org/apache/sling/testing/mock/sling/context/models/OsgiServiceModel.java
(100%)
rename {src =>
core/src}/test/java/org/apache/sling/testing/mock/sling/context/models/RequestAttributeModel.java
(100%)
rename {src =>
core/src}/test/java/org/apache/sling/testing/mock/sling/context/models/ServiceInterface.java
(100%)
rename {src =>
core/src}/test/java/org/apache/sling/testing/mock/sling/context/models/ServiceInterfaceImpl.java
(100%)
rename {src =>
core/src}/test/java/org/apache/sling/testing/mock/sling/context/modelsautoreg/ClasspathRegisteredModel.java
(100%)
rename {src =>
core/src}/test/java/org/apache/sling/testing/mock/sling/jcrmock/context/SlingContextImplTest.java
(100%)
rename {src =>
core/src}/test/java/org/apache/sling/testing/mock/sling/jcrmock/loader/ContentLoaderAutoCommitTest.java
(100%)
rename {src =>
core/src}/test/java/org/apache/sling/testing/mock/sling/jcrmock/loader/ContentLoaderBinaryTest.java
(96%)
rename {src =>
core/src}/test/java/org/apache/sling/testing/mock/sling/jcrmock/loader/ContentLoaderJsonDamTest.java
(100%)
rename {src =>
core/src}/test/java/org/apache/sling/testing/mock/sling/jcrmock/loader/ContentLoaderJsonTest.java
(100%)
rename {src =>
core/src}/test/java/org/apache/sling/testing/mock/sling/jcrmock/resource/FindResourcesTest.java
(100%)
rename {src =>
core/src}/test/java/org/apache/sling/testing/mock/sling/jcrmock/resource/JcrNamespaceTest.java
(100%)
rename {src =>
core/src}/test/java/org/apache/sling/testing/mock/sling/jcrmock/resource/JcrResourceResolverTest.java
(100%)
rename {src =>
core/src}/test/java/org/apache/sling/testing/mock/sling/jcrmock/resource/MultipleResourceResolverTest.java
(100%)
rename {src =>
core/src}/test/java/org/apache/sling/testing/mock/sling/jcrmock/resource/SlingCrudResourceResolverTest.java
(100%)
rename {src =>
core/src}/test/java/org/apache/sling/testing/mock/sling/jcrmock/resource/UniqueRootTest.java
(100%)
copy {src/main =>
core/src/test}/java/org/apache/sling/testing/mock/sling/junit/SlingContext.java
(94%)
copy {src/main =>
core/src/test}/java/org/apache/sling/testing/mock/sling/junit/SlingContextBuilder.java
(93%)
copy {src/main =>
core/src/test}/java/org/apache/sling/testing/mock/sling/junit/SlingContextCallback.java
(74%)
rename {src =>
core/src}/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderAutoCommitTest.java
(100%)
rename {src =>
core/src}/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderBinaryTest.java
(98%)
rename {src =>
core/src}/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderJsonDamTest.java
(100%)
rename {src =>
core/src}/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderJsonTest.java
(100%)
rename {src =>
core/src}/test/java/org/apache/sling/testing/mock/sling/resource/AbstractJcrNamespaceTest.java
(100%)
rename {src =>
core/src}/test/java/org/apache/sling/testing/mock/sling/resource/AbstractJcrResourceResolverTest.java
(100%)
rename {src =>
core/src}/test/java/org/apache/sling/testing/mock/sling/resource/AbstractMultipleResourceResolverTest.java
(100%)
rename {src =>
core/src}/test/java/org/apache/sling/testing/mock/sling/resource/AbstractSlingCrudResourceResolverTest.java
(100%)
rename {src =>
core/src}/test/java/org/apache/sling/testing/mock/sling/resource/AbstractUniqueRootTest.java
(100%)
rename {src =>
core/src}/test/java/org/apache/sling/testing/mock/sling/rrmock/context/SlingContextImplTest.java
(100%)
rename {src =>
core/src}/test/java/org/apache/sling/testing/mock/sling/rrmock/loader/ContentLoaderAutoCommitTest.java
(100%)
rename {src =>
core/src}/test/java/org/apache/sling/testing/mock/sling/rrmock/loader/ContentLoaderBinaryTest.java
(100%)
rename {src =>
core/src}/test/java/org/apache/sling/testing/mock/sling/rrmock/loader/ContentLoaderJsonDamTest.java
(100%)
rename {src =>
core/src}/test/java/org/apache/sling/testing/mock/sling/rrmock/loader/ContentLoaderJsonTest.java
(100%)
rename {src =>
core/src}/test/java/org/apache/sling/testing/mock/sling/rrmock/resource/MultipleResourceResolverTest.java
(100%)
rename {src =>
core/src}/test/java/org/apache/sling/testing/mock/sling/rrmock/resource/SlingCrudResourceResolverTest.java
(100%)
rename {src =>
core/src}/test/java/org/apache/sling/testing/mock/sling/rrmock/resource/UniqueRootTest.java
(100%)
rename {src =>
core/src}/test/java/org/apache/sling/testing/mock/sling/services/MockMimeTypeServiceTest.java
(100%)
rename {src =>
core/src}/test/java/org/apache/sling/testing/mock/sling/services/MockSlingSettingServiceTest.java
(100%)
rename {src =>
core/src}/test/java/org/apache/sling/testing/mock/sling/servlet/MockHttpSessionTest.java
(100%)
rename {src =>
core/src}/test/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequestTest.java
(98%)
rename {src =>
core/src}/test/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletResponseTest.java
(100%)
rename {src => core/src}/test/resources/META-INF/MANIFEST.MF (100%)
rename {src => core/src}/test/resources/SLING-INF/nodetypes/app.cnd (100%)
rename {src => core/src}/test/resources/json-import-samples/SLING-4362.json
(100%)
rename {src => core/src}/test/resources/json-import-samples/content.json (100%)
rename {src => core/src}/test/resources/json-import-samples/dam.json (100%)
rename {src => core/src}/test/resources/sample-image.gif (100%)
create mode 100644 junit4/pom.xml
rename {src =>
junit4/src}/main/java/org/apache/sling/testing/mock/sling/junit/SlingContext.java
(100%)
copy {src =>
junit4/src}/main/java/org/apache/sling/testing/mock/sling/junit/SlingContextBuilder.java
(100%)
copy {src =>
junit4/src}/main/java/org/apache/sling/testing/mock/sling/junit/SlingContextCallback.java
(100%)
rename {src =>
junit4/src}/main/java/org/apache/sling/testing/mock/sling/junit/package-info.java
(100%)
rename {src =>
junit4/src}/test/java/org/apache/sling/testing/mock/sling/junit/SlingContextDefaultRRTypeTest.java
(100%)
rename {src =>
junit4/src}/test/java/org/apache/sling/testing/mock/sling/junit/SlingContextTest.java
(99%)
create mode 100644 junit5/pom.xml
create mode 100644
junit5/src/main/java/org/apache/sling/testing/mock/sling/junit5/SlingContext.java
rename {src/main/java/org/apache/sling/testing/mock/sling/junit =>
junit5/src/main/java/org/apache/sling/testing/mock/sling/junit5}/SlingContextBuilder.java
(60%)
rename {src/main/java/org/apache/sling/testing/mock/sling/junit =>
junit5/src/main/java/org/apache/sling/testing/mock/sling/junit5}/SlingContextCallback.java
(90%)
create mode 100644
junit5/src/main/java/org/apache/sling/testing/mock/sling/junit5/SlingContextExtension.java
create mode 100644
junit5/src/main/java/org/apache/sling/testing/mock/sling/junit5/SlingContextStore.java
rename {src/main/java/org/apache/sling/testing/mock/sling =>
junit5/src/main/java/org/apache/sling/testing/mock/sling/junit5}/package-info.java
(85%)
rename {src/test/java/org/apache/sling/testing/mock/sling/context =>
junit5/src/test/java/org/apache/sling/testing/mock/sling/junit5}/NoSlingModelsRegistrationTest.java
(71%)
create mode 100644
junit5/src/test/java/org/apache/sling/testing/mock/sling/junit5/SlingContextMemberInstantiatedTest.java
create mode 100644
junit5/src/test/java/org/apache/sling/testing/mock/sling/junit5/SlingContextMemberTest.java
create mode 100644
junit5/src/test/java/org/apache/sling/testing/mock/sling/junit5/SlingContextPluginTest.java
create mode 100644
junit5/src/test/java/org/apache/sling/testing/mock/sling/junit5/SlingContextTest.java
create mode 100644 parent/pom.xml
create mode 100644 relocate/pom.xml
