This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.resourcemerger-1.0.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourcemerger.git
commit 97c8967f7e1d8ee8d3bbac7b3b9d300d768be30c Author: Carsten Ziegeler <cziege...@apache.org> AuthorDate: Thu Jan 30 10:19:58 2014 +0000 SLING-2986 : Add test for resource type handling git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/resourcemerger@1562764 13f79535-47bb-0310-9956-ffa450edef68 --- .../resourcemerger/impl/MergedResourceProviderTest.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/test/java/org/apache/sling/resourcemerger/impl/MergedResourceProviderTest.java b/src/test/java/org/apache/sling/resourcemerger/impl/MergedResourceProviderTest.java index e4e4185..6fe71a7 100644 --- a/src/test/java/org/apache/sling/resourcemerger/impl/MergedResourceProviderTest.java +++ b/src/test/java/org/apache/sling/resourcemerger/impl/MergedResourceProviderTest.java @@ -58,8 +58,8 @@ public class MergedResourceProviderTest { this.resolver.create(appsA, "1", new map().p("a", "1").p("b", "2")); this.resolver.create(libsA, "1", new map().p("a", "5").p("c", "2")); - this.resolver.create(appsA, "2", null); - this.resolver.create(libsA, "2", null); + this.resolver.create(appsA, "2", new map().p(ResourceResolver.PROPERTY_RESOURCE_TYPE, "apps")); + this.resolver.create(libsA, "2", new map().p(ResourceResolver.PROPERTY_RESOURCE_TYPE, "libs")); this.resolver.create(appsA, "X", null); this.resolver.create(libsA, "Y", null); @@ -94,6 +94,17 @@ public class MergedResourceProviderTest { assertEquals("2", vm.get("c")); } + @Test public void testResourceType() { + // a/2 defines the property and it's overlayed + final Resource rsrcA2 = this.provider.getResource(this.resolver, "/merged/a/2"); + assertEquals("apps", rsrcA2.getResourceType()); + + // a/12 doesn't define the property and it's overlayed + final Resource rsrcA1 = this.provider.getResource(this.resolver, "/merged/a/1"); + assertEquals("a/1", rsrcA1.getResourceType()); + + } + protected static final class map extends HashMap<String, Object> { private static final long serialVersionUID = 1L; -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.