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-1.8.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
commit 10aa538e1a4cc426cb53e42277781d2b38839f72 Author: Stefan Seifert <[email protected]> AuthorDate: Tue Sep 6 21:03:07 2016 +0000 SLING-6040 add ResourceBuilder support to SlingContext This closes #167 git-svn-id: https://svn.apache.org/repos/asf/sling/branches/testing/mocks/sling-mock-1.x@1759511 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 6 ++++++ .../testing/mock/sling/context/SlingContextImpl.java | 19 +++++++++++++++++++ .../testing/mock/sling/context/package-info.java | 2 +- .../sling/testing/mock/sling/junit/package-info.java | 2 +- .../testing/mock/sling/junit/SlingContextTest.java | 17 +++++++++++++++++ 5 files changed, 44 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index fc898f2..e2d1235 100644 --- a/pom.xml +++ b/pom.xml @@ -140,6 +140,12 @@ <version>2.2.4</version> <scope>compile</scope> </dependency> + <dependency> + <groupId>org.apache.sling</groupId> + <artifactId>org.apache.sling.resourcebuilder</artifactId> + <version>0.0.1-SNAPSHOT</version> + <scope>compile</scope> + </dependency> <dependency> <groupId>commons-collections</groupId> diff --git a/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java b/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java index d29f2f7..72a0ba2 100644 --- a/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java +++ b/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java @@ -46,6 +46,9 @@ import org.apache.sling.models.impl.injectors.SelfInjector; import org.apache.sling.models.impl.injectors.SlingObjectInjector; import org.apache.sling.models.impl.injectors.ValueMapInjector; import org.apache.sling.models.spi.ImplementationPicker; +import org.apache.sling.resourcebuilder.api.ResourceBuilder; +import org.apache.sling.resourcebuilder.api.ResourceBuilderFactory; +import org.apache.sling.resourcebuilder.impl.ResourceBuilderFactoryService; import org.apache.sling.settings.SlingSettingsService; import org.apache.sling.testing.mock.osgi.context.OsgiContextImpl; import org.apache.sling.testing.mock.sling.MockSling; @@ -92,6 +95,7 @@ public class SlingContextImpl extends OsgiContextImpl { protected SlingScriptHelper slingScriptHelper; protected ContentLoader contentLoader; protected ContentBuilder contentBuilder; + protected ResourceBuilder resourceBuilder; protected UniqueRoot uniqueRoot; private Map<String, Object> resourceResolverFactoryActivatorProps; @@ -171,6 +175,7 @@ public class SlingContextImpl extends OsgiContextImpl { // other services registerService(SlingSettingsService.class, new MockSlingSettingService(DEFAULT_RUN_MODES)); registerService(MimeTypeService.class, new MockMimeTypeService()); + registerInjectActivateService(new ResourceBuilderFactoryService()); } /** @@ -208,6 +213,7 @@ public class SlingContextImpl extends OsgiContextImpl { this.slingScriptHelper = null; this.contentLoader = null; this.contentBuilder = null; + this.resourceBuilder = null; this.uniqueRoot = null; super.tearDown(); @@ -298,6 +304,19 @@ public class SlingContextImpl extends OsgiContextImpl { } return this.contentBuilder; } + + /** + * Creates a {@link ResourceBuilder} object for easily creating test content. + * This is a separate API which can be used inside sling mocks or in a running instance. + * You can use alternatively the {@link #create()} method to use the {@link ContentBuilder} API. + * @return Resource builder for building test content. + */ + public ResourceBuilder build() { + if (this.resourceBuilder == null) { + this.resourceBuilder = getService(ResourceBuilderFactory.class).forResolver(this.resourceResolver()); + } + return this.resourceBuilder; + } /** * @return Current resource diff --git a/src/main/java/org/apache/sling/testing/mock/sling/context/package-info.java b/src/main/java/org/apache/sling/testing/mock/sling/context/package-info.java index e440a9e..804ad90 100644 --- a/src/main/java/org/apache/sling/testing/mock/sling/context/package-info.java +++ b/src/main/java/org/apache/sling/testing/mock/sling/context/package-info.java @@ -19,5 +19,5 @@ /** * Sling context implementation for unit tests. */ [email protected]("3.2") [email protected]("3.3") package org.apache.sling.testing.mock.sling.context; diff --git a/src/main/java/org/apache/sling/testing/mock/sling/junit/package-info.java b/src/main/java/org/apache/sling/testing/mock/sling/junit/package-info.java index d7acc84..72cb53a 100644 --- a/src/main/java/org/apache/sling/testing/mock/sling/junit/package-info.java +++ b/src/main/java/org/apache/sling/testing/mock/sling/junit/package-info.java @@ -19,5 +19,5 @@ /** * Rule for providing easy access to Sling context in JUnit tests. */ [email protected]("3.2") [email protected]("3.3") package org.apache.sling.testing.mock.sling.junit; diff --git a/src/test/java/org/apache/sling/testing/mock/sling/junit/SlingContextTest.java b/src/test/java/org/apache/sling/testing/mock/sling/junit/SlingContextTest.java index d4127ed..d99ed80 100644 --- a/src/test/java/org/apache/sling/testing/mock/sling/junit/SlingContextTest.java +++ b/src/test/java/org/apache/sling/testing/mock/sling/junit/SlingContextTest.java @@ -27,7 +27,9 @@ import static org.mockito.Mockito.verify; import java.io.IOException; import org.apache.sling.api.resource.PersistenceException; +import org.apache.sling.api.resource.Resource; import org.apache.sling.api.resource.ResourceResolver; +import org.apache.sling.api.resource.ResourceUtil; import org.apache.sling.testing.mock.sling.ResourceResolverType; import org.junit.Before; import org.junit.Rule; @@ -109,4 +111,19 @@ public class SlingContextTest { assertNull(context.resourceResolver().adaptTo(Double.class)); } + @Test + public void testResourceBuilder() { + + context.build().resource("/test1", "prop1", "value1") + .siblingsMode() + .resource("a") + .resource("b"); + + Resource test1 = context.resourceResolver().getResource("/test1"); + assertNotNull(test1); + assertEquals("value1", ResourceUtil.getValueMap(test1).get("prop1", String.class)); + assertNotNull(test1.getChild("a")); + assertNotNull(test1.getChild("b")); + } + } -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
