You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 10:21:07 UTC
[sling-org-apache-sling-testing-resourceresolver-mock] 02/26:
SLING-4265 - Tolerate a null class argument passed to
MockValueMap.get(String, Class)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.testing.resourceresolver-mock-1.1.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-resourceresolver-mock.git
commit 25a94472ca8ccfdd51fec78ce43bb718218518b3
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Wed Dec 24 21:19:56 2014 +0000
SLING-4265 - Tolerate a null class argument passed to
MockValueMap.get(String, Class<T>)
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/resourceresolver-mock@1647846 13f79535-47bb-0310-9956-ffa450edef68
---
.../org/apache/sling/testing/resourceresolver/MockValueMap.java | 3 +++
.../testing/resourceresolver/SlingCrudResourceResolverTest.java | 8 ++++++++
2 files changed, 11 insertions(+)
diff --git a/src/main/java/org/apache/sling/testing/resourceresolver/MockValueMap.java b/src/main/java/org/apache/sling/testing/resourceresolver/MockValueMap.java
index d5aa666..11c1ba0 100644
--- a/src/main/java/org/apache/sling/testing/resourceresolver/MockValueMap.java
+++ b/src/main/java/org/apache/sling/testing/resourceresolver/MockValueMap.java
@@ -95,6 +95,9 @@ public class MockValueMap extends ValueMapDecorator {
return null;
}
}
+ else if ( type == null ) {
+ return (T) super.get(name);
+ }
return super.get(name, type);
}
diff --git a/src/test/java/org/apache/sling/testing/resourceresolver/SlingCrudResourceResolverTest.java b/src/test/java/org/apache/sling/testing/resourceresolver/SlingCrudResourceResolverTest.java
index e1dbf29..534de79 100644
--- a/src/test/java/org/apache/sling/testing/resourceresolver/SlingCrudResourceResolverTest.java
+++ b/src/test/java/org/apache/sling/testing/resourceresolver/SlingCrudResourceResolverTest.java
@@ -214,4 +214,12 @@ public class SlingCrudResourceResolverTest {
assertNull(resource);
}
+ @Test
+ public void testGetConvertedToNullType() {
+ Resource resource1 = resourceResolver.getResource(testRoot.getPath() + "/node1");
+ Object propValue = ResourceUtil.getValueMap(resource1).get("stringProp", null);
+
+ assertEquals(STRING_VALUE, propValue);
+ }
+
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.