Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Encode unicode char after surrogate pair deconstruction #2

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions src/blocks/ajax/conf/placeholder.txt
@@ -0,0 +1 @@
conf dir required for successful build..
Expand Up @@ -98,7 +98,7 @@ public char[] encode(char c) {
}
int codePoint = Character.toCodePoint(highSurrogate.charValue(), c);
highSurrogate = null;
return new char[] {(char) codePoint};
return encode((char) codePoint);
} else if (Character.isHighSurrogate(c)) {
highSurrogate = Character.valueOf(c);
return new char[0];
Expand Down
@@ -0,0 +1,33 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.cocoon.components.serializers.encoding;

import junit.framework.TestCase;

import java.util.Arrays;

public class XMLEncoderTest extends TestCase {

private XMLEncoder encoder = new XMLEncoder();

public void testEncodingSurrogatePairs() {
char[] expectedValue = encoder.encode((char) 127808);

assertTrue(encoder.encode('\uD83C').length == 0);
assertTrue(Arrays.equals(expectedValue, encoder.encode('\uDF40')));
}
}
1 change: 1 addition & 0 deletions tools/targets/compile-build.xml
Expand Up @@ -103,6 +103,7 @@
<path id="test.classpath">
<path refid="classpath"/>
<pathelement location="${build.dest}" />
<pathelement location="${build.blocks}/serializers/dest" />
<!-- FIXME Resolver tests depend on deprecated stuff -->
<pathelement location="${build.deprecated}" />
<pathelement location="${build.test}" />
Expand Down