svn commit: r1765264 - in /cocoon/subprojects/cocoon-serializers-charsets/trunk/src: main/java/org/apache/cocoon/components/serializers/encoding/XMLEncoder.java test/java/org/apache/cocoon/components/serializers/encoding/XMLEncoderTest.java

Author: ilgrosso
Date: Mon Oct 17 12:53:35 2016
New Revision: 1765264

URL: http://svn.apache.org/viewvc?rev=1765264&view=rev
Log:
[COCOON-2352] Applying further changes to better deal with HTML encoding

Modified:
    cocoon/subprojects/cocoon-serializers-charsets/trunk/src/main/java/org/apache/cocoon/components/serializers/encoding/XMLEncoder.java
    cocoon/subprojects/cocoon-serializers-charsets/trunk/src/test/java/org/apache/cocoon/components/serializers/encoding/XMLEncoderTest.java

Modified: cocoon/subprojects/cocoon-serializers-charsets/trunk/src/main/java/org/apache/cocoon/components/serializers/encoding/XMLEncoder.java
URL: http://svn.apache.org/viewvc/cocoon/subprojects/cocoon-serializers-charsets/trunk/src/main/java/org/apache/cocoon/components/serializers/encoding/XMLEncoder.java?rev=1765264&r1=1765263&r2=1765264&view=diff
==============================================================================
--- cocoon/subprojects/cocoon-serializers-charsets/trunk/src/main/java/org/apache/cocoon/components/serializers/encoding/XMLEncoder.java (original)
+++ cocoon/subprojects/cocoon-serializers-charsets/trunk/src/main/java/org/apache/cocoon/components/serializers/encoding/XMLEncoder.java Mon Oct 17 12:53:35 2016
@@ -97,7 +97,7 @@ public class XMLEncoder extends Compiled
             }
             int codePoint = Character.toCodePoint(highSurrogate, c);
             highSurrogate = null;
-            return new char[] { (char) codePoint };
+            return encode((char) codePoint);
         } else if (Character.isHighSurrogate(c)) {
             highSurrogate = c;
             return new char[0];

Modified: cocoon/subprojects/cocoon-serializers-charsets/trunk/src/test/java/org/apache/cocoon/components/serializers/encoding/XMLEncoderTest.java
URL: http://svn.apache.org/viewvc/cocoon/subprojects/cocoon-serializers-charsets/trunk/src/test/java/org/apache/cocoon/components/serializers/encoding/XMLEncoderTest.java?rev=1765264&r1=1765263&r2=1765264&view=diff
==============================================================================
--- cocoon/subprojects/cocoon-serializers-charsets/trunk/src/test/java/org/apache/cocoon/components/serializers/encoding/XMLEncoderTest.java (original)
+++ cocoon/subprojects/cocoon-serializers-charsets/trunk/src/test/java/org/apache/cocoon/components/serializers/encoding/XMLEncoderTest.java Mon Oct 17 12:53:35 2016
@@ -30,8 +30,9 @@ public class XMLEncoderTest {
      */
     @Test
     public void encodingSurrogatePairs() {
-        assertTrue(encoder.encode('\uD83C').length == 0);
+        char[] expectedValue = encoder.encode((char) 127808);
 
-        assertTrue(Arrays.equals(new char[] { (char) 127808 }, encoder.encode('\uDF40')));
+        assertTrue(encoder.encode('\uD83C').length == 0);
+        assertTrue(Arrays.equals(expectedValue, encoder.encode('\uDF40')));
     }
 }