Check more of the complex CF cases from the test files

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

diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestConditionalFormatting.java b/src/testcases/org/apache/poi/ss/usermodel/BaseTestConditionalFormatting.java
index ff5d58903614a82ad2bcd9d7a3b4f73918a64c4c..6dde39730f1c2fbb4ab8cb2bc2dbe0c09de2670a 100644 (file)
--- a/src/testcases/org/apache/poi/ss/usermodel/BaseTestConditionalFormatting.java
+++ b/src/testcases/org/apache/poi/ss/usermodel/BaseTestConditionalFormatting.java
@@ -22,6 +22,7 @@ package org.apache.poi.ss.usermodel;
 import junit.framework.TestCase;\r
 \r
 import org.apache.poi.hssf.usermodel.HSSFConditionalFormatting;\r
+import org.apache.poi.hssf.usermodel.HSSFConditionalFormattingRule;\r
 import org.apache.poi.ss.ITestDataProvider;\r
 import org.apache.poi.ss.util.CellRangeAddress;\r
 \r
@@ -579,6 +580,7 @@ public abstract class BaseTestConditionalFormatting extends TestCase {
         \r
         // Check the rules / values in detail\r
         \r
+        \r
         // Highlight Positive values - Column C\r
         cf = sheetCF.getConditionalFormattingAt(0);\r
         assertEquals(1, cf.getFormattingRanges().length);\r
@@ -587,10 +589,57 @@ public abstract class BaseTestConditionalFormatting extends TestCase {
         assertEquals(1, cf.getNumberOfRules());\r
         cr = cf.getRule(0);\r
         assertEquals(ConditionType.CELL_VALUE_IS, cr.getConditionTypeType());\r
-        // TODO Check the rest of this\r
+        assertEquals(ComparisonOperator.GT, cr.getComparisonOperation());\r
+        assertEquals("0", cr.getFormula1());\r
+        assertEquals(null, cr.getFormula2());\r
+//        assertColourGreen(cr);\r
+        // TODO Colour checking\r
+        \r
         \r
         // Highlight 10-30 - Column D\r
-        // TODO\r
+        cf = sheetCF.getConditionalFormattingAt(1);\r
+        assertEquals(1, cf.getFormattingRanges().length);\r
+        assertEquals("D2:D17", cf.getFormattingRanges()[0].formatAsString());\r
+        \r
+        assertEquals(1, cf.getNumberOfRules());\r
+        cr = cf.getRule(0);\r
+        assertEquals(ConditionType.CELL_VALUE_IS, cr.getConditionTypeType());\r
+        assertEquals(ComparisonOperator.BETWEEN, cr.getComparisonOperation());\r
+        assertEquals("10", cr.getFormula1());\r
+        assertEquals("30", cr.getFormula2());\r
+//        assertColourGreen(cr);\r
+//        assertColourRed(cr);\r
+        // TODO Colour checking\r
+\r
+        \r
+        // Data Bars - Column E\r
+        cf = sheetCF.getConditionalFormattingAt(2);\r
+        assertEquals(1, cf.getFormattingRanges().length);\r
+        assertEquals("E2:E17", cf.getFormattingRanges()[0].formatAsString());\r
+        \r
+        assertEquals(1, cf.getNumberOfRules());\r
+        cr = cf.getRule(0);\r
+        assertEquals(ConditionType.DATA_BAR, cr.getConditionTypeType());\r
+        // TODO Support then check the rest\r
+        \r
+        \r
+        // Colours R->G - Column F\r
+        // Colours BWR - Column G\r
+        // Icons : Default - Column H\r
+        // Icons : 3 signs - Column I\r
+        // Icons : 3 traffic lights 2 - Column J\r
+        // Icons : 4 traffic lights - Column K\r
+        // Icons : 3 symbols - Column L\r
+        // Icons : 3 flags - Column M\r
+        // Icons : 3 symbols 2 - Column N\r
+        // Icons : 3 arrows - Column O     \r
+        // Icons : 5 arrows grey - Column P    \r
+        // Icons : 3 stars (ext) - Column Q\r
+        // Icons : 4 ratings - Column R\r
+        // Icons : 5 ratings - Column S\r
+        // Custom Icon+Format - Column T\r
+        // Mixed icons - Column U\r
+\r
     }\r
 \r
     public void testCreateFontFormatting() {\r