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-0.1.2 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
commit c6c5f9e7ac2a51763be0611a0cc5fdb23a2b3af1 Author: Stefan Seifert <[email protected]> AuthorDate: Wed Jan 14 12:06:25 2015 +0000 SLING-4267 support importing nt:resource noded in jackrabbit with empty binary data enable content loader unit tests in sling-mock-jackrabbit git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock-jackrabbit@1651632 13f79535-47bb-0310-9956-ffa450edef68 --- .../jackrabbit/contentimport/ContentLoaderJsonDamTest.java | 10 +++++----- .../sling/jackrabbit/contentimport/ContentLoaderJsonTest.java | 10 +++++----- src/test/resources/SLING-INF/nodetypes/app.cnd | 8 ++++++++ 3 files changed, 18 insertions(+), 10 deletions(-) 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 b3ee20a..25053c6 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 @@ -28,10 +28,7 @@ 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; -import org.junit.Ignore; -//TEST IS DISABLED currently, it does not work with jackrabbit repository yet -@Ignore public class ContentLoaderJsonDamTest extends AbstractContentLoaderJsonDamTest { @Override @@ -43,9 +40,12 @@ public class ContentLoaderJsonDamTest extends AbstractContentLoaderJsonDamTest { protected ResourceResolver newResourceResolver() { ResourceResolver resolver = MockSling.newResourceResolver(getResourceResolverType()); - // register sling node types + // register sling and app node types try { - RepositoryUtil.registerSlingNodeTypes(resolver.adaptTo(Session.class)); + 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) { 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 9d65816..cb89afb 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 @@ -28,10 +28,7 @@ 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; -import org.junit.Ignore; -// TEST IS DISABLED currently, it does not work with jackrabbit repository yet -@Ignore public class ContentLoaderJsonTest extends AbstractContentLoaderJsonTest { @Override @@ -43,9 +40,12 @@ public class ContentLoaderJsonTest extends AbstractContentLoaderJsonTest { protected ResourceResolver newResourceResolver() { ResourceResolver resolver = MockSling.newResourceResolver(getResourceResolverType()); - // register sling node types + // register sling and app node types try { - RepositoryUtil.registerSlingNodeTypes(resolver.adaptTo(Session.class)); + 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) { diff --git a/src/test/resources/SLING-INF/nodetypes/app.cnd b/src/test/resources/SLING-INF/nodetypes/app.cnd new file mode 100644 index 0000000..e09d831 --- /dev/null +++ b/src/test/resources/SLING-INF/nodetypes/app.cnd @@ -0,0 +1,8 @@ +<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]>.
