Author: rombert
Date: Thu Sep 26 21:46:37 2013
New Revision: 1526714
URL: http://svn.apache.org/r1526714
Log:
SLING-3129 - Node names which are changed when encoding in platform
format are not imported
Added a test to validate that there is no double-encoding in the
ContentXmlHandler.
Added:
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/encoded-child-content.xml
(with props)
Modified:
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/serialization/ContentXmlHandlerTest.java
Modified:
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/serialization/ContentXmlHandlerTest.java
URL:
http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/serialization/ContentXmlHandlerTest.java?rev=1526714&r1=1526713&r2=1526714&view=diff
==============================================================================
---
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/serialization/ContentXmlHandlerTest.java
(original)
+++
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/serialization/ContentXmlHandlerTest.java
Thu Sep 26 21:46:37 2013
@@ -134,6 +134,14 @@ public class ContentXmlHandlerTest {
}
@Test
+ public void encodedChildContentXml() throws ParserConfigurationException,
SAXException, IOException {
+
+ ResourceProxy root = parseContentXmlFile("encoded-child-content.xml",
"/ROOT");
+
+ assertThat("/ROOT contains /_jcr_content", root.getChildren(),
hasItem(path("/ROOT/_jcr_content")));
+ }
+
+ @Test
public void parseContentXmlWithEscapedNames() throws
ParserConfigurationException, SAXException, IOException {
ResourceProxy root =
parseContentXmlFile("full-coverage-escaped-names.xml", "/");
Added:
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/encoded-child-content.xml
URL:
http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/encoded-child-content.xml?rev=1526714&view=auto
==============================================================================
---
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/encoded-child-content.xml
(added)
+++
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/encoded-child-content.xml
Thu Sep 26 21:46:37 2013
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0";
xmlns:jcr="http://www.jcp.org/jcr/1.0"; xmlns:nt="http://www.jcp.org/jcr/nt/1.0";
+ jcr:primaryType="nt:unstructured"
+ sling:resourceType="sling:redirect"
+ sling:target="/index.html">
+ <_jcr_content/>
+</jcr:root>
\ No newline at end of file
Propchange:
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/encoded-child-content.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/encoded-child-content.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
