More CF colour tests

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1691094 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 5ee58d4b48f2e0678417a6258abe4baa48be2248..a803fc83cdcd92d1b0168c688417a9841d9a0911 100644 (file)
--- a/src/testcases/org/apache/poi/ss/usermodel/BaseTestConditionalFormatting.java
+++ b/src/testcases/org/apache/poi/ss/usermodel/BaseTestConditionalFormatting.java
@@ -594,10 +594,15 @@ public abstract class BaseTestConditionalFormatting extends TestCase {
         assertEquals(ComparisonOperator.GT, cr.getComparisonOperation());\r
         assertEquals("0", cr.getFormula1());\r
         assertEquals(null, cr.getFormula2());\r
-        // TODO Should the colours be slightly different like this?\r
+        // When it matches:\r
+        //   Sets the font colour to dark green\r
+        //   Sets the background colour to lighter green\r
+        // TODO Should the colours be slightly different between formats?\r
         if (cr instanceof HSSFConditionalFormattingRule) {\r
+            assertColour("0:8080:0", cr.getFontFormatting().getFontColor());\r
             assertColour("CCCC:FFFF:CCCC", cr.getPatternFormatting().getFillBackgroundColorColor());\r
         } else {\r
+            assertColour("006100", cr.getFontFormatting().getFontColor());\r
             assertColour("C6EFCE", cr.getPatternFormatting().getFillBackgroundColorColor());\r
         }\r
         \r
@@ -613,9 +618,17 @@ public abstract class BaseTestConditionalFormatting extends TestCase {
         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
+        // When it matches:\r
+        //   Sets the font colour to dark red\r
+        //   Sets the background colour to lighter red\r
+        // TODO Should the colours be slightly different between formats?\r
+        if (cr instanceof HSSFConditionalFormattingRule) {\r
+            assertColour("8080:0:8080", cr.getFontFormatting().getFontColor());\r
+            assertColour("FFFF:9999:CCCC", cr.getPatternFormatting().getFillBackgroundColorColor());\r
+        } else {\r
+            assertColour("9C0006", cr.getFontFormatting().getFontColor());\r
+            assertColour("FFC7CE", cr.getPatternFormatting().getFillBackgroundColorColor());\r
+        }\r
 \r
         \r
         // Data Bars - Column E\r