This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a change to branch feature/SLING-13001-adapter-manager-impl
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
from 1370139 disable deactivate method completely
add 935dbee SLING-12866 - Restrict force pushes, auto-delete branches on
merge
add d7d9b8b SLING-12880 Update Sling Mocks to Sling API 3 (#50)
add 1bd5eb8 [maven-release-plugin] prepare release
org.apache.sling.testing.sling-mock.reactor-4.0.0
add 192fee4 [maven-release-plugin] prepare for next development iteration
add a094597 Merge branch 'master' into
feature/SLING-13001-adapter-manager-impl
No new revisions were added by this update.
Summary of changes:
.asf.yaml | 4 +
core/pom.xml | 12 +-
.../testing/mock/sling/MockResourceBundle.java | 5 +
.../mock/sling/MockResourceBundleProvider.java | 3 +-
.../apache/sling/testing/mock/sling/MockSling.java | 60 +++++-
.../testing/mock/sling/MockSlingScriptHelper.java | 123 ++++++++++---
.../mock/sling/NodeTypeDefinitionScanner.java | 6 +-
.../sling/ResourceResolverFactoryInitializer.java | 31 +++-
.../sling/ThreadsafeMockAdapterManagerWrapper.java | 2 +-
.../testing/mock/sling/builder/ContentBuilder.java | 7 +-
.../mock/sling/builder/ImmutableValueMap.java | 4 +-
.../mock/sling/context/MockSlingBindings.java | 35 ++--
.../sling/context/ModelAdapterFactoryUtil.java | 18 +-
.../mock/sling/context/SlingContextImpl.java | 135 +++++++++++---
.../testing/mock/sling/context/package-info.java | 2 +-
.../testing/mock/sling/loader/ContentLoader.java | 2 +-
.../mock/sling/loader/LoaderContentHandler.java | 9 +-
.../mock/sling/servlet/MockHttpSession.java | 12 +-
...ttpSession.java => MockJakartaHttpSession.java} | 9 +-
...va => MockJakartaRequestDispatcherFactory.java} | 6 +-
...Context.java => MockJakartaServletContext.java} | 4 +-
.../servlet/MockRequestDispatcherFactory.java | 3 +
.../mock/sling/servlet/MockServletContext.java | 7 +
.../sling/servlet/MockSlingHttpServletRequest.java | 44 ++---
.../servlet/MockSlingHttpServletResponse.java | 7 +
...ava => MockSlingJakartaHttpServletRequest.java} | 17 +-
...va => MockSlingJakartaHttpServletResponse.java} | 5 +-
.../testing/mock/sling/servlet/package-info.java | 2 +-
.../mock/sling/MockResourceBundleProviderTest.java | 14 +-
.../mock/sling/MockSlingScriptHelperTest.java | 205 ++++++++++++++++++++-
.../sling/testing/mock/sling/MockSlingTest.java | 61 ++++++
.../mock/sling/builder/ContentBuilderTest.java | 41 +++++
.../mock/sling/builder/ImmutableValueMapTest.java | 20 ++
.../AbstractModelAdapterFactoryUtilTest.java | 10 +-
.../context/AbstractSlingContextImplTest.java | 30 +--
.../context/NoSlingModelsRegistrationTest.java | 6 +-
.../mock/sling/context/SlingBindingsTest.java | 7 +-
.../context/models/RequestAttributeModel.java | 4 +-
.../sling/context/models/ServiceInterfaceImpl.java | 4 +-
.../sling/context/models/SlingBindingsModel.java | 24 ++-
.../modelsautoreg/ClasspathRegisteredModel.java | 4 +-
.../AbstractSlingCrudResourceResolverTest.java | 4 +-
.../resource/SlingCrudResourceResolverTest.java | 3 +-
.../resource/SlingCrudResourceResolverTest.java | 3 +-
.../services/MockSlingSettingServiceTest.java | 55 ++++++
.../mock/sling/servlet/MockHttpSessionTest.java | 9 +-
...onTest.java => MockJakartaHttpSessionTest.java} | 10 +-
.../sling/servlet/MockRequestPathInfoTest.java} | 23 ++-
.../servlet/MockSlingHttpServletRequestTest.java | 20 +-
.../servlet/MockSlingHttpServletResponseTest.java | 8 +-
...=> MockSlingJakartaHttpServletRequestTest.java} | 32 ++--
...> MockSlingJakartaHttpServletResponseTest.java} | 10 +-
.../sling/spi/ResourceResolverTypeAdapterTest.java | 63 +++++++
junit4/pom.xml | 6 +-
.../testing/mock/sling/junit/SlingContextTest.java | 9 +
junit5/pom.xml | 6 +-
.../junit5/NoSlingModelsRegistrationTest.java | 7 +-
.../mock/sling/junit5/SlingContextPluginTest.java | 21 ++-
.../mock/sling/junit5/SlingContextTest.java | 19 +-
parent/pom.xml | 54 ++++--
pom.xml | 2 +-
relocate/pom.xml | 2 +-
62 files changed, 1086 insertions(+), 284 deletions(-)
copy
core/src/main/java/org/apache/sling/testing/mock/sling/servlet/{MockHttpSession.java
=> MockJakartaHttpSession.java} (74%)
copy
core/src/main/java/org/apache/sling/testing/mock/sling/servlet/{MockSlingHttpServletResponse.java
=> MockJakartaRequestDispatcherFactory.java} (74%)
copy
core/src/main/java/org/apache/sling/testing/mock/sling/servlet/{MockServletContext.java
=> MockJakartaServletContext.java} (83%)
copy
core/src/main/java/org/apache/sling/testing/mock/sling/servlet/{MockSlingHttpServletRequest.java
=> MockSlingJakartaHttpServletRequest.java} (81%)
copy
core/src/main/java/org/apache/sling/testing/mock/sling/servlet/{MockServletContext.java
=> MockSlingJakartaHttpServletResponse.java} (80%)
copy
core/src/test/java/org/apache/sling/testing/mock/sling/servlet/{MockHttpSessionTest.java
=> MockJakartaHttpSessionTest.java} (86%)
copy
core/src/{main/java/org/apache/sling/testing/mock/sling/servlet/MockRequestPathInfo.java
=>
test/java/org/apache/sling/testing/mock/sling/servlet/MockRequestPathInfoTest.java}
(54%)
copy
core/src/test/java/org/apache/sling/testing/mock/sling/servlet/{MockSlingHttpServletRequestTest.java
=> MockSlingJakartaHttpServletRequestTest.java} (82%)
copy
core/src/test/java/org/apache/sling/testing/mock/sling/servlet/{MockSlingHttpServletResponseTest.java
=> MockSlingJakartaHttpServletResponseTest.java} (80%)
create mode 100644
core/src/test/java/org/apache/sling/testing/mock/sling/spi/ResourceResolverTypeAdapterTest.java
