broken test
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1903781 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/poi-ooxml/src/test/java/org/apache/poi/ss/tests/formula/functions/TestProper.java b/poi-ooxml/src/test/java/org/apache/poi/ss/tests/formula/functions/TestProperXSSF.java
similarity index 95%
rename from poi-ooxml/src/test/java/org/apache/poi/ss/tests/formula/functions/TestProper.java
rename to poi-ooxml/src/test/java/org/apache/poi/ss/tests/formula/functions/TestProperXSSF.java
index c1a80cb..64a1d80 100644
--- a/poi-ooxml/src/test/java/org/apache/poi/ss/tests/formula/functions/TestProper.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/ss/tests/formula/functions/TestProperXSSF.java
@@ -20,8 +20,6 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.formula.eval.StringEval;
import org.apache.poi.ss.formula.eval.ValueEval;
import org.apache.poi.ss.formula.functions.TextFunction;
@@ -35,19 +33,11 @@
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.junit.jupiter.api.Test;
-public final class TestProper {
+public final class TestProperXSSF {
private Cell cell11;
private FormulaEvaluator evaluator;
@Test
- void testValidHSSF() {
- HSSFWorkbook wb = new HSSFWorkbook();
- evaluator = new HSSFFormulaEvaluator(wb);
-
- confirm(wb);
- }
-
- @Test
void testValidXSSF() {
XSSFWorkbook wb = new XSSFWorkbook();
evaluator = new XSSFFormulaEvaluator(wb);
diff --git a/poi/src/main/java/org/apache/poi/ss/formula/ptg/StringPtg.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/StringPtg.java
index bb58685..1439cd8 100644
--- a/poi/src/main/java/org/apache/poi/ss/formula/ptg/StringPtg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/StringPtg.java
@@ -48,7 +48,7 @@
if (_is16bitUnicode) {
field_3_string = StringUtil.readUnicodeLE(in, nChars);
} else {
- field_3_string = StringUtil.readCompressedUnicode(in, nChars);
+ field_3_string = StringUtil.readCompressedLatinA(in, nChars);
}
}
diff --git a/poi/src/main/java/org/apache/poi/util/StringUtil.java b/poi/src/main/java/org/apache/poi/util/StringUtil.java
index 69e45c7..8cb1d51 100644
--- a/poi/src/main/java/org/apache/poi/util/StringUtil.java
+++ b/poi/src/main/java/org/apache/poi/util/StringUtil.java
@@ -138,6 +138,11 @@
return new String(string, offset, len_to_use, UTF8);
}
+ /**
+ * @param in stream,
+ * @param nChars number pf chars
+ * @return UTF-8 encoded result
+ */
public static String readCompressedUnicode(LittleEndianInput in, int nChars) {
byte[] buf = IOUtils.safelyAllocate(nChars, MAX_RECORD_LENGTH);
in.readFully(buf);
@@ -145,6 +150,17 @@
}
/**
+ * @param in stream,
+ * @param nChars number pf chars
+ * @return LATIN-A (ISO-8859-1) encoded result
+ */
+ public static String readCompressedLatinA(LittleEndianInput in, int nChars) {
+ byte[] buf = IOUtils.safelyAllocate(nChars, MAX_RECORD_LENGTH);
+ in.readFully(buf);
+ return new String(buf, ISO_8859_1);
+ }
+
+ /**
* InputStream {@code in} is expected to contain:
* <ol>
* <li>ushort nChars</li>
diff --git a/poi-ooxml/src/test/java/org/apache/poi/ss/tests/formula/functions/TestProper.java b/poi/src/test/java/org/apache/poi/ss/formula/TestProperHSSF.java
similarity index 89%
copy from poi-ooxml/src/test/java/org/apache/poi/ss/tests/formula/functions/TestProper.java
copy to poi/src/test/java/org/apache/poi/ss/formula/TestProperHSSF.java
index c1a80cb..12fabe6 100644
--- a/poi-ooxml/src/test/java/org/apache/poi/ss/tests/formula/functions/TestProper.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/TestProperHSSF.java
@@ -15,27 +15,20 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.ss.tests.formula.functions;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+package org.apache.poi.ss.formula;
import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.formula.eval.StringEval;
import org.apache.poi.ss.formula.eval.ValueEval;
import org.apache.poi.ss.formula.functions.TextFunction;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.CellValue;
-import org.apache.poi.ss.usermodel.FormulaEvaluator;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.xssf.usermodel.XSSFFormulaEvaluator;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.apache.poi.ss.usermodel.*;
import org.junit.jupiter.api.Test;
-public final class TestProper {
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public final class TestProperHSSF {
private Cell cell11;
private FormulaEvaluator evaluator;
@@ -47,14 +40,6 @@
confirm(wb);
}
- @Test
- void testValidXSSF() {
- XSSFWorkbook wb = new XSSFWorkbook();
- evaluator = new XSSFFormulaEvaluator(wb);
-
- confirm(wb);
- }
-
private void confirm(Workbook wb) {
Sheet sheet = wb.createSheet("new sheet");
cell11 = sheet.createRow(0).createCell(0);
@@ -69,6 +54,10 @@
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
+ //https://support.microsoft.com/en-us/office/proper-function-52a5a283-e8b2-49be-8506-b2887b889f94
+ confirm("PROPER(\"this is a TITLE\")", "This Is A Title");
+ confirm("PROPER(\"2-way street\")", "2-Way Street");
+ confirm("PROPER(\"76BudGet\")", "76Budget");
final String scharfes = "\u00df"; //German lowercase eszett, scharfes s, sharp s
confirm("PROPER(\"stra"+scharfes+"e\")", "Stra"+scharfes+"e");
