Simplify CF icon rule asserts

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1691764 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 fd7e5399419f088f4bf12da6e255f89d9d5968a6..b8eeb2053da305a9dc07e0300c5a00a838aad75b 100644 (file)
--- a/src/testcases/org/apache/poi/ss/usermodel/BaseTestConditionalFormatting.java
+++ b/src/testcases/org/apache/poi/ss/usermodel/BaseTestConditionalFormatting.java
@@ -668,118 +668,32 @@ public abstract class BaseTestConditionalFormatting extends TestCase {
         // TODO Support Color Scales, then check the rest of this rule\r
 \r
         \r
-        // TODO Simplify asserts\r
-        \r
         // Icons : Default - Column H, percentage thresholds\r
         cf = sheetCF.getConditionalFormattingAt(5);\r
         assertEquals(1, cf.getFormattingRanges().length);\r
         assertEquals("H2:H17", cf.getFormattingRanges()[0].formatAsString());\r
-        \r
-        assertEquals(1, cf.getNumberOfRules());\r
-        cr = cf.getRule(0);\r
-        assertEquals(ConditionType.ICON_SET, cr.getConditionTypeType());\r
-        assertEquals(ComparisonOperator.NO_COMPARISON, cr.getComparisonOperation());\r
-        assertEquals(null, cr.getFormula1());\r
-        assertEquals(null, cr.getFormula2());\r
-        \r
-        icon = cr.getMultiStateFormatting();\r
-        assertNotNull(icon);\r
-        assertEquals(IconSet.GYR_3_TRAFFIC_LIGHTS, icon.getIconSet());\r
-        assertEquals(false, icon.isIconOnly());\r
-        assertEquals(false, icon.isReversed());\r
-        \r
-        assertNotNull(icon.getThresholds());\r
-        assertEquals(3, icon.getThresholds().length);\r
-        th = icon.getThresholds()[0];\r
-        assertEquals(RangeType.PERCENT, th.getRangeType());\r
-        assertEquals(0.0d, th.getValue());\r
-        assertEquals(null, th.getFormula());\r
-        th = icon.getThresholds()[1];\r
-        assertEquals(RangeType.PERCENT, th.getRangeType());\r
-        assertEquals(33.0d, th.getValue());\r
-        assertEquals(null, th.getFormula());\r
-        th = icon.getThresholds()[2];\r
-        assertEquals(RangeType.PERCENT, th.getRangeType());\r
-        assertEquals(67.0d, th.getValue());\r
-        assertEquals(null, th.getFormula());\r
+        assertIconSetPercentages(cf, IconSet.GYR_3_TRAFFIC_LIGHTS, 0d, 33d, 67d);\r
         \r
         \r
         // Icons : 3 signs - Column I\r
         cf = sheetCF.getConditionalFormattingAt(6);\r
         assertEquals(1, cf.getFormattingRanges().length);\r
         assertEquals("I2:I17", cf.getFormattingRanges()[0].formatAsString());\r
-        \r
-        assertEquals(1, cf.getNumberOfRules());\r
-        cr = cf.getRule(0);\r
-        assertEquals(ConditionType.ICON_SET, cr.getConditionTypeType());\r
-        assertEquals(ComparisonOperator.NO_COMPARISON, cr.getComparisonOperation());\r
-        assertEquals(null, cr.getFormula1());\r
-        assertEquals(null, cr.getFormula2());\r
-        \r
-        icon = cr.getMultiStateFormatting();\r
-        assertNotNull(icon);\r
-        assertEquals(IconSet.GYR_3_SHAPES, icon.getIconSet());\r
-        assertEquals(false, icon.isIconOnly());\r
-        assertEquals(false, icon.isReversed());\r
-        \r
-        assertNotNull(icon.getThresholds());\r
-        assertEquals(3, icon.getThresholds().length);\r
-        th = icon.getThresholds()[0];\r
-        assertEquals(RangeType.PERCENT, th.getRangeType());\r
-        assertEquals(0.0d, th.getValue());\r
-        assertEquals(null, th.getFormula());\r
-        th = icon.getThresholds()[1];\r
-        assertEquals(RangeType.PERCENT, th.getRangeType());\r
-        assertEquals(33.0d, th.getValue());\r
-        assertEquals(null, th.getFormula());\r
-        th = icon.getThresholds()[2];\r
-        assertEquals(RangeType.PERCENT, th.getRangeType());\r
-        assertEquals(67.0d, th.getValue());\r
-        assertEquals(null, th.getFormula());\r
+        assertIconSetPercentages(cf, IconSet.GYR_3_SHAPES, 0d, 33d, 67d);\r
         \r
         \r
         // Icons : 3 traffic lights 2 - Column J\r
         cf = sheetCF.getConditionalFormattingAt(7);\r
         assertEquals(1, cf.getFormattingRanges().length);\r
         assertEquals("J2:J17", cf.getFormattingRanges()[0].formatAsString());\r
-        \r
-        assertEquals(1, cf.getNumberOfRules());\r
-        cr = cf.getRule(0);\r
-        assertEquals(ConditionType.ICON_SET, cr.getConditionTypeType());\r
-        assertEquals(ComparisonOperator.NO_COMPARISON, cr.getComparisonOperation());\r
-        assertEquals(null, cr.getFormula1());\r
-        assertEquals(null, cr.getFormula2());\r
-        \r
-        icon = cr.getMultiStateFormatting();\r
-        assertNotNull(icon);\r
-        assertEquals(IconSet.GYR_3_TRAFFIC_LIGHTS_BOX, icon.getIconSet());\r
-        assertEquals(false, icon.isIconOnly());\r
-        assertEquals(false, icon.isReversed());\r
-        \r
-        assertNotNull(icon.getThresholds());\r
-        assertEquals(3, icon.getThresholds().length);\r
-        th = icon.getThresholds()[0];\r
-        assertEquals(RangeType.PERCENT, th.getRangeType());\r
-        assertEquals(0.0d, th.getValue());\r
-        assertEquals(null, th.getFormula());\r
-        th = icon.getThresholds()[1];\r
-        assertEquals(RangeType.PERCENT, th.getRangeType());\r
-        assertEquals(33.0d, th.getValue());\r
-        assertEquals(null, th.getFormula());\r
-        th = icon.getThresholds()[2];\r
-        assertEquals(RangeType.PERCENT, th.getRangeType());\r
-        assertEquals(67.0d, th.getValue());\r
-        assertEquals(null, th.getFormula());\r
+        assertIconSetPercentages(cf, IconSet.GYR_3_TRAFFIC_LIGHTS_BOX, 0d, 33d, 67d);\r
         \r
         \r
         // Icons : 4 traffic lights - Column K\r
         cf = sheetCF.getConditionalFormattingAt(8);\r
         assertEquals(1, cf.getFormattingRanges().length);\r
         assertEquals("K2:K17", cf.getFormattingRanges()[0].formatAsString());\r
-        \r
-        assertEquals(1, cf.getNumberOfRules());\r
-        cr = cf.getRule(0);\r
-        assertIconSetPercentages(cr, IconSet.GYRB_4_TRAFFIC_LIGHTS, 0d, 25d, 50d, 75d);\r
+        assertIconSetPercentages(cf, IconSet.GYRB_4_TRAFFIC_LIGHTS, 0d, 25d, 50d, 75d);\r
 \r
         \r
         // Icons : 3 symbols - Column L\r
@@ -794,7 +708,10 @@ public abstract class BaseTestConditionalFormatting extends TestCase {
         // Mixed icons - Column U\r
 \r
     }\r
-    private void assertIconSetPercentages(ConditionalFormattingRule cr, IconSet iconset, Double...vals) {\r
+    private void assertIconSetPercentages(ConditionalFormatting cf, IconSet iconset, Double...vals) {\r
+        assertEquals(1, cf.getNumberOfRules());\r
+        ConditionalFormattingRule cr = cf.getRule(0);\r
+        \r
         assertEquals(ConditionType.ICON_SET, cr.getConditionTypeType());\r
         assertEquals(ComparisonOperator.NO_COMPARISON, cr.getComparisonOperation());\r
         assertEquals(null, cr.getFormula1());\r