[sling-org-apache-sling-testing-sling-mock] branch feature/SLING-11455-resource-provider updated (f24d2dc -> 352afc0)

[ss...@apache.org]

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

sseifert pushed a change to branch feature/SLING-11455-resource-provider
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git


    from f24d2dc  RRMockResourceResolverWrapper and RRMockResourceResolverFactoryWrapper are no longer used
     add 9284bd4  introduce new resource resolver type RESOURCEPROVIDER_MOCK in parallel to RESOURCEPROVIDER_MOCK. the latter uses the initial implementation with using ResourceResolverMock directly with the sling resource resolver implementation, and without the wrapper which was introduced with SLING-10753
     add 352afc0  move test case to AbstractContentLoaderFolderJsonTest

No new revisions were added by this update.

Summary of changes:
 ...java => RPMockMockResourceResolverAdapter.java} |  6 +--
 .../sling/RRMockMockResourceResolverAdapter.java   | 14 +++---
 .../testing/mock/sling/ResourceResolverType.java   | 40 ++++++++-------
 .../context/ContextResourceResolverFactory.java    | 38 ---------------
 .../testing/mock/sling/loader/ContentLoader.java   | 46 +++++++++++------
 .../sling/testing/mock/sling/package-info.java     |  2 +-
 .../AbstractContentLoaderFolderJsonTest.java       | 18 +++++++
 .../context/SlingContextImplTest.java              |  4 +-
 .../loader/ContentLoaderAutoCommitTest.java        |  4 +-
 .../loader/ContentLoaderBinaryTest.java            |  4 +-
 .../loader/ContentLoaderFileVaultXmlTest.java      |  4 +-
 .../ContentLoaderFolderFileVaultXmlTest.java       |  4 +-
 .../loader/ContentLoaderFolderJsonTest.java        |  4 +-
 .../loader/ContentLoaderJsonDamTest.java           |  4 +-
 .../loader/ContentLoaderJsonTest.java              |  4 +-
 .../resource/MultipleResourceResolverTest.java     |  4 +-
 .../resource/SlingCrudResourceResolverTest.java    |  4 +-
 .../resource/UniqueRootTest.java                   |  4 +-
 .../src/test/resources/test-content/parent.json    |  0
 .../sling/junit/SlingContextDefaultRRTypeTest.java | 57 ----------------------
 .../mock/sling/junit5/SlingContextTest.java        | 22 +--------
 21 files changed, 108 insertions(+), 179 deletions(-)
 copy core/src/main/java/org/apache/sling/testing/mock/sling/{RRMockMockResourceResolverAdapter.java => RPMockMockResourceResolverAdapter.java} (90%)
 copy core/src/test/java/org/apache/sling/testing/mock/sling/{rrmock => rpmock}/context/SlingContextImplTest.java (90%)
 copy core/src/test/java/org/apache/sling/testing/mock/sling/{rrmock => rpmock}/loader/ContentLoaderAutoCommitTest.java (90%)
 copy core/src/test/java/org/apache/sling/testing/mock/sling/{rrmock => rpmock}/loader/ContentLoaderBinaryTest.java (90%)
 copy core/src/test/java/org/apache/sling/testing/mock/sling/{rrmock => rpmock}/loader/ContentLoaderFileVaultXmlTest.java (90%)
 rename core/src/test/java/org/apache/sling/testing/mock/sling/{rrmock => rpmock}/loader/ContentLoaderFolderFileVaultXmlTest.java (90%)
 rename core/src/test/java/org/apache/sling/testing/mock/sling/{rrmock => rpmock}/loader/ContentLoaderFolderJsonTest.java (90%)
 copy core/src/test/java/org/apache/sling/testing/mock/sling/{rrmock => rpmock}/loader/ContentLoaderJsonDamTest.java (90%)
 copy core/src/test/java/org/apache/sling/testing/mock/sling/{rrmock => rpmock}/loader/ContentLoaderJsonTest.java (90%)
 copy core/src/test/java/org/apache/sling/testing/mock/sling/{jcrmock => rpmock}/resource/MultipleResourceResolverTest.java (90%)
 copy core/src/test/java/org/apache/sling/testing/mock/sling/{rrmock => rpmock}/resource/SlingCrudResourceResolverTest.java (94%)
 copy core/src/test/java/org/apache/sling/testing/mock/sling/{jcrmock => rpmock}/resource/UniqueRootTest.java (90%)
 rename {junit5 => core}/src/test/resources/test-content/parent.json (100%)
 delete mode 100644 junit4/src/test/java/org/apache/sling/testing/mock/sling/junit/SlingContextDefaultRRTypeTest.java