moparisthebest/poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

annotate purpose of each PROPER() function test case, add a few more test cases, identify some problems with ß handling

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1752786 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Javen O'Neal 2016-07-15 07:25:16 +00:00
parent 0c3aade7b1
commit 6ea74f170d
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/java/org/apache/poi/ss/formula/functions/TextFunction.java
View File

@ -112,18 +112,18 @@ public abstract class TextFunction implements Function {
* Implementation of the PROPER function: * Implementation of the PROPER function:
* Normalizes all words (separated by non-word characters) by * Normalizes all words (separated by non-word characters) by
* making the first letter upper and the rest lower case. * making the first letter upper and the rest lower case.
*
* This is nearly equivalent to toTitleCase if the Java language had it
*/ */
public static final Function PROPER = new SingleArgTextFunc() { public static final Function PROPER = new SingleArgTextFunc() {
protected ValueEval evaluate(String text) { protected ValueEval evaluate(String text) {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
boolean shouldMakeUppercase = true; boolean shouldMakeUppercase = true;
final int length = text.length(); for(final char ch : text.toCharArray()) {
for(int i = 0; i < length; ++i) {
final char ch = text.charAt(i);
// Note: we are using String.toUpperCase() here on purpose as it handles certain things // Note: we are using String.toUpperCase() here on purpose as it handles certain things
// better than Character.toUpperCase(), e.g. German "scharfes s" is translated // better than Character.toUpperCase(), e.g. German "scharfes s" is translated
// to "SS" (i.e. two characters), if upercased properly! // to "SS" (i.e. two characters), if uppercased properly!
if (shouldMakeUppercase) { if (shouldMakeUppercase) {
sb.append(String.valueOf(ch).toUpperCase(Locale.ROOT)); sb.append(String.valueOf(ch).toUpperCase(Locale.ROOT));
} }

25
src/ooxml/testcases/org/apache/poi/ss/formula/functions/TestProper.java
View File

@ -54,14 +54,25 @@ public final class TestProper extends TestCase {
cell11 = sheet.createRow(0).createCell(0); cell11 = sheet.createRow(0).createCell(0);
cell11.setCellType(CellType.FORMULA); cell11.setCellType(CellType.FORMULA);
confirm("PROPER(\"hi there\")", "Hi There"); confirm("PROPER(\"hi there\")", "Hi There"); //simple case
confirm("PROPER(\"what's up\")", "What'S Up"); confirm("PROPER(\"what's up\")", "What'S Up"); //apostrophes are treated as word breaks
confirm("PROPER(\"I DON'T TH!NK SO!\")", "I Don'T Th!Nk So!"); confirm("PROPER(\"I DON'T TH!NK SO!\")", "I Don'T Th!Nk So!"); //capitalization is ignored, special punctuation is treated as a word break
confirm("PROPER(\"dr\u00dcb\u00f6'\u00e4 \u00e9lo\u015f|\u00eb\u00e8 \")", "Dr\u00fcb\u00f6'\u00c4 \u00c9lo\u015f|\u00cb\u00e8 "); confirm("PROPER(\"dr\u00dcb\u00f6'\u00e4 \u00e9lo\u015f|\u00eb\u00e8 \")", "Dr\u00fcb\u00f6'\u00c4 \u00c9lo\u015f|\u00cb\u00e8 ");
confirm("PROPER(\"hi123 the123re\")", "Hi123 The123Re"); confirm("PROPER(\"hi123 the123re\")", "Hi123 The123Re"); //numbers are treated as word breaks
confirm("PROPER(\"-\")", "-"); confirm("PROPER(\"-\")", "-"); //nothing happens with ascii punctuation that is not upper or lower case
confirm("PROPER(\"!\u00a7$\")", "!\u00a7$"); confirm("PROPER(\"!\u00a7$\")", "!\u00a7$"); //nothing happens with unicode punctuation (section sign) that is not upper or lower case
confirm("PROPER(\"/&%\")", "/&%"); confirm("PROPER(\"/&%\")", "/&%"); //nothing happens with ascii punctuation that is not upper or lower case
confirm("PROPER(\"Apache POI\")", "Apache Poi"); //acronyms are not special
confirm("PROPER(\" hello world\")", " Hello World"); //leading whitespace is ignored
final String scharfes = "\u00df$"; //German lowercase eszett, scharfes s, sharp s
// CURRENTLY FAILS: result: "Stra"+scharfes+"E"
// confirm("PROPER(\"stra"+scharfes+"e\")", "Stra"+scharfes+"e");
// CURRENTLY FAILS: result: "SSUnd"+scharfes
// LibreOffice 5.0.3.2 behavior: "Sund"+scharfes
// Excel 2013 behavior: ???
//confirm("PROPER(\""+scharfes+"und"+scharfes+"\")", "SSund"+scharfes);
// also test longer string // also test longer string
StringBuilder builder = new StringBuilder("A"); StringBuilder builder = new StringBuilder("A");