You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ni...@apache.org on 2015/07/13 21:56:09 UTC
svn commit: r1690805 - in /poi/trunk/src: java/org/apache/poi/ss/usermodel/
ooxml/java/org/apache/poi/xssf/usermodel/
ooxml/testcases/org/apache/poi/xssf/usermodel/
testcases/org/apache/poi/ss/usermodel/
Author: nick
Date: Mon Jul 13 19:56:09 2015
New Revision: 1690805
URL: http://svn.apache.org/r1690805
Log:
Enable CF2007 test for XLSX too
Modified:
poi/trunk/src/java/org/apache/poi/ss/usermodel/ConditionType.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFConditionalFormatting.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFConditionalFormatting.java
poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestConditionalFormatting.java
Modified: poi/trunk/src/java/org/apache/poi/ss/usermodel/ConditionType.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/usermodel/ConditionType.java?rev=1690805&r1=1690804&r2=1690805&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/usermodel/ConditionType.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/usermodel/ConditionType.java Mon Jul 13 19:56:09 2015
@@ -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);
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFConditionalFormatting.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFConditionalFormatting.java?rev=1690805&r1=1690804&r2=1690805&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFConditionalFormatting.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFConditionalFormatting.java Mon Jul 13 19:56:09 2015
@@ -98,4 +98,8 @@ public class XSSFConditionalFormatting i
public int getNumberOfRules(){
return _cf.sizeOfCfRuleArray();
}
+
+ public String toString() {
+ return _cf.toString();
+ }
}
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFConditionalFormatting.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFConditionalFormatting.java?rev=1690805&r1=1690804&r2=1690805&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFConditionalFormatting.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFConditionalFormatting.java Mon Jul 13 19:56:09 2015
@@ -33,8 +33,7 @@ public class TestXSSFConditionalFormatti
testRead("WithConditionalFormatting.xlsx");
}
- public void IGNORED_testReadOffice2007() {
- // TODO Bring the XSSF support up to the same level
+ public void testReadOffice2007() {
testReadOffice2007("NewStyleConditionalFormattings.xlsx");
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestConditionalFormatting.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestConditionalFormatting.java?rev=1690805&r1=1690804&r2=1690805&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestConditionalFormatting.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestConditionalFormatting.java Mon Jul 13 19:56:09 2015
@@ -552,7 +552,14 @@ public abstract class BaseTestConditiona
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);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org