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-jackrabbit-1.0.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
commit 7cafb109c455c84983eec5ee3fed5690d193467b Author: Stefan Seifert <[email protected]> AuthorDate: Mon Sep 28 22:16:38 2015 +0000 SLING-5064 manual registration of node types no longer required; register namespaces and node types centrally depending on NodeTypeMode git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock-jackrabbit@1705787 13f79535-47bb-0310-9956-ffa450edef68 --- .../JackrabbitMockResourceResolverAdapter.java | 30 ++------------------ .../contentimport/ContentLoaderBinaryTest.java | 24 ---------------- .../contentimport/ContentLoaderJsonDamTest.java | 27 ------------------ .../contentimport/ContentLoaderJsonTest.java | 27 ------------------ .../jackrabbit/resource/JcrNamespaceTest.java | 3 -- .../resource/MultipleResourceResolverTest.java | 32 ---------------------- src/test/resources/SLING-INF/nodetypes/app.cnd | 26 ------------------ 7 files changed, 3 insertions(+), 166 deletions(-) diff --git a/src/main/java/org/apache/sling/testing/mock/sling/jackrabbit/JackrabbitMockResourceResolverAdapter.java b/src/main/java/org/apache/sling/testing/mock/sling/jackrabbit/JackrabbitMockResourceResolverAdapter.java index 90fa6ef..a484774 100644 --- a/src/main/java/org/apache/sling/testing/mock/sling/jackrabbit/JackrabbitMockResourceResolverAdapter.java +++ b/src/main/java/org/apache/sling/testing/mock/sling/jackrabbit/JackrabbitMockResourceResolverAdapter.java @@ -19,12 +19,10 @@ package org.apache.sling.testing.mock.sling.jackrabbit; import javax.jcr.RepositoryException; -import javax.jcr.Session; import org.apache.sling.api.resource.ResourceResolverFactory; import org.apache.sling.commons.testing.jcr.RepositoryProvider; import org.apache.sling.jcr.api.SlingRepository; -import org.apache.sling.testing.mock.sling.context.NodeTypeDefinitionScanner; import org.apache.sling.testing.mock.sling.spi.ResourceResolverTypeAdapter; /** @@ -40,33 +38,11 @@ public class JackrabbitMockResourceResolverAdapter implements ResourceResolverTy @Override public SlingRepository newSlingRepository() { try { - SlingRepository slingRepository = RepositoryProvider.instance().getRepository(); - registerJcrNodeTypes(slingRepository); - return slingRepository; - } catch (RepositoryException ex) { + return RepositoryProvider.instance().getRepository(); + } + catch (RepositoryException ex) { throw new RuntimeException("Unable to get jackrabbit SlingRepository instance.", ex); } } - /** - * Registers all JCR node types found in classpath. - * @param slingRepository Sling repository - */ - @SuppressWarnings("deprecation") - private static void registerJcrNodeTypes(SlingRepository slingRepository) { - Session session = null; - try { - session = slingRepository.loginAdministrative(null); - NodeTypeDefinitionScanner.get().register(session); - } - catch (RepositoryException ex) { - throw new RuntimeException("Error registering JCR nodetypes: " + ex.getMessage(), ex); - } - finally { - if (session != null) { - session.logout(); - } - } - } - } diff --git a/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/contentimport/ContentLoaderBinaryTest.java b/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/contentimport/ContentLoaderBinaryTest.java index 854209d..8ab9cfc 100644 --- a/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/contentimport/ContentLoaderBinaryTest.java +++ b/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/contentimport/ContentLoaderBinaryTest.java @@ -18,14 +18,6 @@ */ package org.apache.sling.testing.mock.sling.jackrabbit.contentimport; -import java.io.IOException; - -import javax.jcr.RepositoryException; -import javax.jcr.Session; - -import org.apache.sling.api.resource.ResourceResolver; -import org.apache.sling.commons.testing.jcr.RepositoryUtil; -import org.apache.sling.testing.mock.sling.MockSling; import org.apache.sling.testing.mock.sling.ResourceResolverType; import org.apache.sling.testing.mock.sling.loader.AbstractContentLoaderBinaryTest; @@ -36,20 +28,4 @@ public class ContentLoaderBinaryTest extends AbstractContentLoaderBinaryTest { return ResourceResolverType.JCR_JACKRABBIT; } - @Override - protected ResourceResolver newResourceResolver() { - ResourceResolver resolver = MockSling.newResourceResolver(getResourceResolverType()); - - // register sling node types - try { - RepositoryUtil.registerSlingNodeTypes(resolver.adaptTo(Session.class)); - } catch (IOException ex) { - throw new RuntimeException("Unable to register sling node types.", ex); - } catch (RepositoryException ex) { - throw new RuntimeException("Unable to register sling node types.", ex); - } - - return resolver; - } - } diff --git a/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/contentimport/ContentLoaderJsonDamTest.java b/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/contentimport/ContentLoaderJsonDamTest.java index 25053c6..41fb418 100644 --- a/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/contentimport/ContentLoaderJsonDamTest.java +++ b/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/contentimport/ContentLoaderJsonDamTest.java @@ -18,14 +18,6 @@ */ package org.apache.sling.testing.mock.sling.jackrabbit.contentimport; -import java.io.IOException; - -import javax.jcr.RepositoryException; -import javax.jcr.Session; - -import org.apache.sling.api.resource.ResourceResolver; -import org.apache.sling.commons.testing.jcr.RepositoryUtil; -import org.apache.sling.testing.mock.sling.MockSling; import org.apache.sling.testing.mock.sling.ResourceResolverType; import org.apache.sling.testing.mock.sling.loader.AbstractContentLoaderJsonDamTest; @@ -36,23 +28,4 @@ public class ContentLoaderJsonDamTest extends AbstractContentLoaderJsonDamTest { return ResourceResolverType.JCR_JACKRABBIT; } - @Override - protected ResourceResolver newResourceResolver() { - ResourceResolver resolver = MockSling.newResourceResolver(getResourceResolverType()); - - // register sling and app node types - try { - Session session = resolver.adaptTo(Session.class); - RepositoryUtil.registerSlingNodeTypes(session); - RepositoryUtil.registerNodeType(session, - ContentLoaderJsonTest.class.getResourceAsStream("/SLING-INF/nodetypes/app.cnd")); - } catch (IOException ex) { - throw new RuntimeException("Unable to register sling node types.", ex); - } catch (RepositoryException ex) { - throw new RuntimeException("Unable to register sling node types.", ex); - } - - return resolver; - } - } diff --git a/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/contentimport/ContentLoaderJsonTest.java b/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/contentimport/ContentLoaderJsonTest.java index cb89afb..5a19702 100644 --- a/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/contentimport/ContentLoaderJsonTest.java +++ b/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/contentimport/ContentLoaderJsonTest.java @@ -18,14 +18,6 @@ */ package org.apache.sling.testing.mock.sling.jackrabbit.contentimport; -import java.io.IOException; - -import javax.jcr.RepositoryException; -import javax.jcr.Session; - -import org.apache.sling.api.resource.ResourceResolver; -import org.apache.sling.commons.testing.jcr.RepositoryUtil; -import org.apache.sling.testing.mock.sling.MockSling; import org.apache.sling.testing.mock.sling.ResourceResolverType; import org.apache.sling.testing.mock.sling.loader.AbstractContentLoaderJsonTest; @@ -36,23 +28,4 @@ public class ContentLoaderJsonTest extends AbstractContentLoaderJsonTest { return ResourceResolverType.JCR_JACKRABBIT; } - @Override - protected ResourceResolver newResourceResolver() { - ResourceResolver resolver = MockSling.newResourceResolver(getResourceResolverType()); - - // register sling and app node types - try { - Session session = resolver.adaptTo(Session.class); - RepositoryUtil.registerSlingNodeTypes(session); - RepositoryUtil.registerNodeType(session, - ContentLoaderJsonTest.class.getResourceAsStream("/SLING-INF/nodetypes/app.cnd")); - } catch (IOException ex) { - throw new RuntimeException("Unable to register sling node types.", ex); - } catch (RepositoryException ex) { - throw new RuntimeException("Unable to register sling node types.", ex); - } - - return resolver; - } - } diff --git a/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/resource/JcrNamespaceTest.java b/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/resource/JcrNamespaceTest.java index 6cb8d22..84922ae 100644 --- a/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/resource/JcrNamespaceTest.java +++ b/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/resource/JcrNamespaceTest.java @@ -20,10 +20,7 @@ package org.apache.sling.testing.mock.sling.jackrabbit.resource; import org.apache.sling.testing.mock.sling.ResourceResolverType; import org.apache.sling.testing.mock.sling.resource.AbstractJcrNamespaceTest; -import org.junit.Ignore; -//TEST IS DISABLED currently, it does not work with jackrabbit repository yet -@Ignore public class JcrNamespaceTest extends AbstractJcrNamespaceTest { @Override diff --git a/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/resource/MultipleResourceResolverTest.java b/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/resource/MultipleResourceResolverTest.java index 82eeaae..3709039 100644 --- a/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/resource/MultipleResourceResolverTest.java +++ b/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/resource/MultipleResourceResolverTest.java @@ -18,22 +18,9 @@ */ package org.apache.sling.testing.mock.sling.jackrabbit.resource; -import java.io.IOException; - -import javax.jcr.RepositoryException; -import javax.jcr.Session; - -import org.apache.sling.api.resource.LoginException; -import org.apache.sling.api.resource.ResourceResolver; -import org.apache.sling.api.resource.ResourceResolverFactory; -import org.apache.sling.commons.testing.jcr.RepositoryUtil; -import org.apache.sling.testing.mock.sling.MockSling; import org.apache.sling.testing.mock.sling.ResourceResolverType; import org.apache.sling.testing.mock.sling.resource.AbstractMultipleResourceResolverTest; -import org.junit.Ignore; -//TEST IS DISABLED currently, it does not work with jackrabbit repository yet -@Ignore public class MultipleResourceResolverTest extends AbstractMultipleResourceResolverTest { @Override @@ -41,23 +28,4 @@ public class MultipleResourceResolverTest extends AbstractMultipleResourceResolv return ResourceResolverType.JCR_JACKRABBIT; } - @Override - protected ResourceResolverFactory newResourceResolerFactory() { - ResourceResolverFactory factory = MockSling.newResourceResolverFactory(getResourceResolverType()); - - // register sling node types - try { - ResourceResolver resolver = factory.getResourceResolver(null); - RepositoryUtil.registerSlingNodeTypes(resolver.adaptTo(Session.class)); - } catch (LoginException ex) { - throw new RuntimeException("Unable to register sling node types.", ex); - } catch (IOException ex) { - throw new RuntimeException("Unable to register sling node types.", ex); - } catch (RepositoryException ex) { - throw new RuntimeException("Unable to register sling node types.", ex); - } - - return factory; - } - } diff --git a/src/test/resources/SLING-INF/nodetypes/app.cnd b/src/test/resources/SLING-INF/nodetypes/app.cnd deleted file mode 100644 index 105d39f..0000000 --- a/src/test/resources/SLING-INF/nodetypes/app.cnd +++ /dev/null @@ -1,26 +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. -// -<app='http://example.com/jcr/app/1.0'> -<dam='http://example.com/jcr/dam/1.0'> - -[app:Page] > nt:unstructured -[app:PageContent] > nt:unstructured - -[dam:Asset] > nt:unstructured -[dam:AssetContent] > nt:unstructured -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
