This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.testing.sling-mock-2.0.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
commit 05a8c47c7e00e04fb39ee6d0a0f94a91496e7ae9 Author: Stefan Seifert <[email protected]> AuthorDate: Tue Feb 23 01:05:32 2016 +0000 SLING-5548 Remove JCR_JACKRABBIT resource resolver type git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock@1731774 13f79535-47bb-0310-9956-ffa450edef68 --- .../sling/testing/mock/sling/ResourceResolverType.java | 14 -------------- .../mock/sling/context/ContextResourceResolverFactory.java | 7 ------- .../resource/AbstractSlingCrudResourceResolverTest.java | 2 -- 3 files changed, 23 deletions(-) diff --git a/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverType.java b/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverType.java index bf77a6f..4390f74 100644 --- a/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverType.java +++ b/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverType.java @@ -54,20 +54,6 @@ public enum ResourceResolverType { JCR_MOCK(MockJcrResourceResolverAdapter.class.getName(), null, NodeTypeMode.NAMESPACES_ONLY), /** - * Uses a real JCR Jackrabbit repository. - * <ul> - * <li>Uses the real Sling Resource Resolver and JCR Resource mapping - * implementation.</li> - * <li>The JCR repository is started on first access, this may take some - * seconds.</li> - * <li>Beware: The repository is not cleared for each unit test, so make - * sure us use a unique node path for each unit test.</li> - * </ul> - */ - JCR_JACKRABBIT("org.apache.sling.testing.mock.sling.jackrabbit.JackrabbitMockResourceResolverAdapter", - "org.apache.sling:org.apache.sling.testing.sling-mock-jackrabbit", NodeTypeMode.NODETYPES_REQUIRED), - - /** * Uses a real JCR Jackrabbit Oak repository. * <ul> * <li>Uses the real Sling Resource Resolver and JCR Resource mapping diff --git a/src/main/java/org/apache/sling/testing/mock/sling/context/ContextResourceResolverFactory.java b/src/main/java/org/apache/sling/testing/mock/sling/context/ContextResourceResolverFactory.java index 2448e07..65cf6d2 100644 --- a/src/main/java/org/apache/sling/testing/mock/sling/context/ContextResourceResolverFactory.java +++ b/src/main/java/org/apache/sling/testing/mock/sling/context/ContextResourceResolverFactory.java @@ -48,9 +48,6 @@ final class ContextResourceResolverFactory { case JCR_MOCK: initializeJcrMock(factory); break; - case JCR_JACKRABBIT: - initializeJcrJackrabbit(factory); - break; case JCR_OAK: initializeJcrOak(factory); break; @@ -74,10 +71,6 @@ final class ContextResourceResolverFactory { // nothing to do } - private static void initializeJcrJackrabbit(ResourceResolverFactory factory) { - // register sling node types? - } - private static void initializeJcrOak(ResourceResolverFactory factory) { // register sling node types? } diff --git a/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractSlingCrudResourceResolverTest.java b/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractSlingCrudResourceResolverTest.java index e9f4dbd..12d54b2 100644 --- a/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractSlingCrudResourceResolverTest.java +++ b/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractSlingCrudResourceResolverTest.java @@ -145,7 +145,6 @@ public abstract class AbstractSlingCrudResourceResolverTest { // TODO: enable this test when JCR resource implementation supports // writing Date objects (SLING-3846) if (getResourceResolverType() != ResourceResolverType.JCR_MOCK - && getResourceResolverType() != ResourceResolverType.JCR_JACKRABBIT && getResourceResolverType() != ResourceResolverType.JCR_OAK ) { assertEquals(DATE_VALUE, props.get("dateProp", Date.class)); } @@ -158,7 +157,6 @@ public abstract class AbstractSlingCrudResourceResolverTest { // TODO: enable this test when JCR resource implementation supports // writing Date objects (SLING-3846) if (getResourceResolverType() != ResourceResolverType.JCR_MOCK - && getResourceResolverType() != ResourceResolverType.JCR_JACKRABBIT && getResourceResolverType() != ResourceResolverType.JCR_OAK ) { Calendar calendarValue = props.get("dateProp", Calendar.class); assertNotNull(calendarValue); -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
