Enable CF2007 test for XLSX too

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1690805 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/poi/ss/usermodel/ConditionType.java b/src/java/org/apache/poi/ss/usermodel/ConditionType.java
index 4f8de4f675038787048ed7005fd16a27887fe67b..8bd61410e046be900d28545cf1c5c58f54eeb35c 100644 (file)
--- a/src/java/org/apache/poi/ss/usermodel/ConditionType.java
+++ b/src/java/org/apache/poi/ss/usermodel/ConditionType.java
@@ -73,6 +73,10 @@ public class ConditionType {
     public final byte id;\r
     public final String type;\r
 \r
+    public String toString() {\r
+        return id + " - " + type;\r
+    }\r
+    \r
     \r
     public static ConditionType forId(byte id) {\r
         return forId((int)id);\r

diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFConditionalFormatting.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFConditionalFormatting.java
index 127c03783d7a7298daa62b35bb7ec8c72a2f4247..53eb41b122d5bd15b63e7a4866ba3b9ada887ccc 100644 (file)
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFConditionalFormatting.java
+++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFConditionalFormatting.java
@@ -98,4 +98,8 @@ public class XSSFConditionalFormatting implements ConditionalFormatting {
      public int getNumberOfRules(){\r
          return _cf.sizeOfCfRuleArray();\r
      }\r
+     \r
+     public String toString() {\r
+         return _cf.toString();\r
+     }\r
 }\r

diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFConditionalFormatting.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFConditionalFormatting.java
index e2fe9fff4ffc56076bf0cbd779d2053abbdfd52e..c6823c972191249fe8c136998796d3ab18ceaaab 100644 (file)
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFConditionalFormatting.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFConditionalFormatting.java
@@ -33,8 +33,7 @@ public class TestXSSFConditionalFormatting extends BaseTestConditionalFormatting
         testRead("WithConditionalFormatting.xlsx");\r
     }\r
     \r
-    public void IGNORED_testReadOffice2007() {\r
-        // TODO Bring the XSSF support up to the same level\r
+    public void testReadOffice2007() {\r
         testReadOffice2007("NewStyleConditionalFormattings.xlsx");\r
     }\r
 }\r

diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestConditionalFormatting.java b/src/testcases/org/apache/poi/ss/usermodel/BaseTestConditionalFormatting.java
index cb7f19aa8fd46a0b2e77e302e3e40333a5ef9e33..902a0131224fb12914062da66cad4a72881d9a13 100644 (file)
--- a/src/testcases/org/apache/poi/ss/usermodel/BaseTestConditionalFormatting.java
+++ b/src/testcases/org/apache/poi/ss/usermodel/BaseTestConditionalFormatting.java
@@ -552,7 +552,14 @@ public abstract class BaseTestConditionalFormatting extends TestCase {
                 if (str.contains("[CF12]")) fCF12++;\r
                 if (str.contains("[CFEX]")) fCFEX++;\r
             } else {\r
-                fail("TODO!"); \r
+                ConditionType type = cf.getRule(cf.getNumberOfRules()-1).getConditionTypeType();\r
+                if (type == ConditionType.CELL_VALUE_IS ||\r
+                    type == ConditionType.FORMULA) {\r
+                    fCF++;\r
+                } else {\r
+                    // TODO Detect Ext ones\r
+                    fCF12++;\r
+                }\r
             }\r
         }\r
         assertEquals(numCF, fCF);\r