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

Enable CF2007 test for XLSX too

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1690805 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Nick Burch 2015-07-13 19:56:09 +00:00
parent 9217c91425
commit fbf95cdb54
4 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/java/org/apache/poi/ss/usermodel/ConditionType.java
View File

@ -73,6 +73,10 @@ public class ConditionType {
public final byte id;
public final String type;
public String toString() {
return id + " - " + type;
}
public static ConditionType forId(byte id) {
return forId((int)id);

4
src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFConditionalFormatting.java
View File

@ -98,4 +98,8 @@ public class XSSFConditionalFormatting implements ConditionalFormatting {
public int getNumberOfRules(){
return _cf.sizeOfCfRuleArray();
}
public String toString() {
return _cf.toString();
}
}

3
src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFConditionalFormatting.java
View File

@ -33,8 +33,7 @@ public class TestXSSFConditionalFormatting extends BaseTestConditionalFormatting
testRead("WithConditionalFormatting.xlsx");
}
public void IGNORED_testReadOffice2007() {
// TODO Bring the XSSF support up to the same level
public void testReadOffice2007() {
testReadOffice2007("NewStyleConditionalFormattings.xlsx");
}
}

9
src/testcases/org/apache/poi/ss/usermodel/BaseTestConditionalFormatting.java
View File

@ -552,7 +552,14 @@ public abstract class BaseTestConditionalFormatting extends TestCase {
if (str.contains("[CF12]")) fCF12++;
if (str.contains("[CFEX]")) fCFEX++;
} else {
fail("TODO!");
ConditionType type = cf.getRule(cf.getNumberOfRules()-1).getConditionTypeType();
if (type == ConditionType.CELL_VALUE_IS ||
type == ConditionType.FORMULA) {
fCF++;
} else {
// TODO Detect Ext ones
fCF12++;
}
}
}
assertEquals(numCF, fCF);