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-oak-1.0.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock-oak.git
commit 657461c00847da826f66d805f04c848a89527100 Author: Stefan Seifert <[email protected]> AuthorDate: Mon Sep 28 20:37:05 2015 +0000 SLING-5064 manual registration of node types no longer required git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock-oak@1705764 13f79535-47bb-0310-9956-ffa450edef68 --- .../oak/resource/JcrResourceResolverTest.java | 24 ---------------------- .../resource/SlingCrudResourceResolverTest.java | 24 ---------------------- 2 files changed, 48 deletions(-) diff --git a/src/test/java/org/apache/sling/testing/mock/sling/oak/resource/JcrResourceResolverTest.java b/src/test/java/org/apache/sling/testing/mock/sling/oak/resource/JcrResourceResolverTest.java index 894ef08..7d055d6 100644 --- a/src/test/java/org/apache/sling/testing/mock/sling/oak/resource/JcrResourceResolverTest.java +++ b/src/test/java/org/apache/sling/testing/mock/sling/oak/resource/JcrResourceResolverTest.java @@ -18,14 +18,6 @@ */ package org.apache.sling.testing.mock.sling.oak.resource; -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.resource.AbstractJcrResourceResolverTest; @@ -36,20 +28,4 @@ public class JcrResourceResolverTest extends AbstractJcrResourceResolverTest { return ResourceResolverType.JCR_OAK; } - @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/oak/resource/SlingCrudResourceResolverTest.java b/src/test/java/org/apache/sling/testing/mock/sling/oak/resource/SlingCrudResourceResolverTest.java index ec7755c..10a01dc 100644 --- a/src/test/java/org/apache/sling/testing/mock/sling/oak/resource/SlingCrudResourceResolverTest.java +++ b/src/test/java/org/apache/sling/testing/mock/sling/oak/resource/SlingCrudResourceResolverTest.java @@ -18,14 +18,6 @@ */ package org.apache.sling.testing.mock.sling.oak.resource; -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.resource.AbstractSlingCrudResourceResolverTest; @@ -36,20 +28,4 @@ public class SlingCrudResourceResolverTest extends AbstractSlingCrudResourceReso return ResourceResolverType.JCR_OAK; } - @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; - } - } -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
