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.3.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
commit 34954faa6c2f2368d63e00c7e367a28c17374bc2 Author: Stefan Seifert <[email protected]> AuthorDate: Thu Mar 19 12:14:35 2015 +0000 SLING-4522 Sling Mocks: ContentLoader fails for UTF8 encoded json files on Windows Systems git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock@1667720 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/sling/testing/mock/sling/loader/ContentLoader.java | 3 ++- .../testing/mock/sling/loader/AbstractContentLoaderJsonTest.java | 8 ++++++++ src/test/resources/json-import-samples/content.json | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/apache/sling/testing/mock/sling/loader/ContentLoader.java b/src/main/java/org/apache/sling/testing/mock/sling/loader/ContentLoader.java index 7fc1111..8473527 100644 --- a/src/main/java/org/apache/sling/testing/mock/sling/loader/ContentLoader.java +++ b/src/main/java/org/apache/sling/testing/mock/sling/loader/ContentLoader.java @@ -31,6 +31,7 @@ import java.util.Map; import java.util.Set; import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.CharEncoding; import org.apache.commons.lang3.StringUtils; import org.apache.jackrabbit.JcrConstants; import org.apache.sling.api.resource.ModifiableValueMap; @@ -326,7 +327,7 @@ public final class ContentLoader { private String convertToJsonString(InputStream inputStream) { try { - return IOUtils.toString(inputStream); + return IOUtils.toString(inputStream, CharEncoding.UTF_8); } catch (IOException ex) { throw new RuntimeException(ex); } finally { diff --git a/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderJsonTest.java b/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderJsonTest.java index 778e968..702294a 100644 --- a/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderJsonTest.java +++ b/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderJsonTest.java @@ -179,4 +179,12 @@ public abstract class AbstractContentLoaderJsonTest { assertEquals(24, calendar.get(Calendar.SECOND)); } + @Test + public void testUTF8Chars() { + Resource resource = this.resourceResolver.getResource("/content/sample/en/jcr:content"); + ValueMap props = ResourceUtil.getValueMap(resource); + + assertEquals("äöü߀", props.get("utf8Property")); + } + } diff --git a/src/test/resources/json-import-samples/content.json b/src/test/resources/json-import-samples/content.json index b11dbf9..e2696f0 100644 --- a/src/test/resources/json-import-samples/content.json +++ b/src/test/resources/json-import-samples/content.json @@ -14,6 +14,7 @@ "sling:resourceType": "sample/components/homepage", "app:designPath": "/etc/designs/sample", "app:lastModifiedBy": "admin", + "utf8Property": "äöü߀", "par": { "jcr:primaryType": "nt:unstructured", "sling:resourceType": "foundation/components/parsys", -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
