From: Josh Micich <josh@apache.org>
Date: Thu, 3 Apr 2008 21:17:26 +0000 (+0000)
Subject: Follow up fix after r644473 (bug 44739) TestHSSFConditionalFormatting had a bug and... 
X-Git-Tag: REL_3_0_3_BETA1~43
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b938b6c97f47f085757b330d1bce90293c863afb;p=poi.git

Follow up fix after r644473 (bug 44739) TestHSSFConditionalFormatting had a bug and wasn't yet included in the test suite hierarchy

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

diff --git a/src/java/org/apache/poi/hssf/record/cf/CellRange.java b/src/java/org/apache/poi/hssf/record/cf/CellRange.java
index f8839d99c1..f45b79b003 100644
--- a/src/java/org/apache/poi/hssf/record/cf/CellRange.java
+++ b/src/java/org/apache/poi/hssf/record/cf/CellRange.java
@@ -78,8 +78,8 @@ public final class CellRange
 		return _firstColumn == 0 && _lastColumn == LAST_COLUMN_INDEX;
 	}
 	
-	public CellRange(Region r) {
-		this(r.getRowFrom(), r.getRowTo(), r.getColumnFrom(), r.getColumnTo());
+	private static CellRange createFromRegion(Region r) {
+		return new CellRange(r.getRowFrom(), r.getRowTo(), r.getColumnFrom(), r.getColumnTo());
 	}
 
 	private static boolean isValid(int firstRow, int lastRow, int firstColumn, int lastColumn)
@@ -358,7 +358,7 @@ public final class CellRange
 		CellRange[] result = new CellRange[regions.length];
 		for( int i=0; i<regions.length; i++)
 		{
-			result[i] = new CellRange(regions[i]);
+			result[i] = createFromRegion(regions[i]);
 		}
 		return result;
 	}
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/AllUserModelTests.java b/src/testcases/org/apache/poi/hssf/usermodel/AllUserModelTests.java
index cbc555da36..6d6b053a63 100755
--- a/src/testcases/org/apache/poi/hssf/usermodel/AllUserModelTests.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/AllUserModelTests.java
@@ -40,6 +40,7 @@ public class AllUserModelTests {
 		result.addTestSuite(TestFormulas.class);
 		result.addTestSuite(TestHSSFCell.class);
 		result.addTestSuite(TestHSSFClientAnchor.class);
+		result.addTestSuite(TestHSSFConditionalFormatting.class);
 		result.addTestSuite(TestHSSFComment.class);
 		result.addTestSuite(TestHSSFDateUtil.class);
 		result.addTestSuite(TestHSSFHeaderFooter.class);
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFConditionalFormatting.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFConditionalFormatting.java
new file mode 100644
index 0000000000..5dcc61aa41
--- /dev/null
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFConditionalFormatting.java
@@ -0,0 +1,90 @@
+/* ====================================================================
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
+
+package org.apache.poi.hssf.usermodel;
+
+import junit.framework.TestCase;
+
+import org.apache.poi.hssf.record.CFRuleRecord.ComparisonOperator;
+import org.apache.poi.hssf.util.HSSFColor;
+import org.apache.poi.hssf.util.Region;
+/**
+ * 
+ * @author Dmitriy Kumshayev
+ */
+public final class TestHSSFConditionalFormatting extends TestCase
+{
+	public void testLastAndFirstColumns() 
+	{
+		HSSFWorkbook workbook = new HSSFWorkbook();
+		HSSFSheet sheet = workbook.createSheet();
+		String formula = "7";
+
+		HSSFFontFormatting fontFmt = new HSSFFontFormatting();
+		fontFmt.setFontStyle(true, false);
+
+		HSSFBorderFormatting bordFmt = new HSSFBorderFormatting();
+		bordFmt.setBorderBottom(HSSFBorderFormatting.BORDER_THIN);
+		bordFmt.setBorderTop(HSSFBorderFormatting.BORDER_THICK);
+		bordFmt.setBorderLeft(HSSFBorderFormatting.BORDER_DASHED);
+		bordFmt.setBorderRight(HSSFBorderFormatting.BORDER_DOTTED);
+
+		HSSFPatternFormatting patternFmt = new HSSFPatternFormatting();
+		patternFmt.setFillBackgroundColor(HSSFColor.RED.index);
+
+		HSSFConditionalFormattingRule [] cfRules =
+		{
+			sheet.createConditionalFormattingRule(formula, fontFmt, bordFmt, patternFmt),
+			sheet.createConditionalFormattingRule(ComparisonOperator.BETWEEN, "1", "2", fontFmt, bordFmt, patternFmt)
+		};
+
+		short col = 1;
+		Region [] regions =
+		{
+			new Region(0,col,65535,col)
+		};
+
+		sheet.addConditionalFormatting(regions, cfRules);
+		sheet.addConditionalFormatting(regions, cfRules);
+
+		// Verification
+		assertEquals(2, sheet.getNumConditionalFormattings());
+		sheet.removeConditionalFormatting(1);
+		assertEquals(1, sheet.getNumConditionalFormattings());
+		HSSFConditionalFormatting cf = sheet.getConditionalFormattingAt(0);
+		assertNotNull(cf);
+
+		regions = cf.getFormattingRegions();
+		assertNotNull(regions);
+		assertEquals(1, regions.length);
+		Region r = regions[0];
+		assertEquals(1, r.getColumnFrom());
+		assertEquals(1, r.getColumnTo());
+		assertEquals(0, r.getRowFrom());
+		assertEquals(65535, r.getRowTo());
+
+		assertEquals(2, cf.getNumberOfRules());
+
+		HSSFConditionalFormattingRule rule1 = cf.getRule(0);
+		assertEquals("7",rule1.getFormula1()); 
+		assertNull(rule1.getFormula2());
+
+		HSSFConditionalFormattingRule rule2 = cf.getRule(1);
+		assertEquals("2",rule2.getFormula2()); 
+		assertEquals("1",rule2.getFormula1()); 
+	}
+}
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFConfditionalFormatting.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFConfditionalFormatting.java
deleted file mode 100644
index 6186d227ef..0000000000
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFConfditionalFormatting.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.hssf.usermodel;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.hssf.record.CFRuleRecord.ComparisonOperator;
-import org.apache.poi.hssf.util.HSSFColor;
-import org.apache.poi.hssf.util.Region;
-/**
- * 
- * @author Dmitriy Kumshayev
- */
-public final class TestHSSFConfditionalFormatting extends TestCase
-{
-	public void testLastAndFirstColumns() 
-	{
-		HSSFWorkbook workbook = new HSSFWorkbook();
-		HSSFSheet sheet = workbook.createSheet();
-		String formula = "7";
-
-		HSSFFontFormatting fontFmt = new HSSFFontFormatting();
-		fontFmt.setFontStyle(true, false);
-
-		HSSFBorderFormatting bordFmt = new HSSFBorderFormatting();
-		bordFmt.setBorderBottom(HSSFBorderFormatting.BORDER_THIN);
-		bordFmt.setBorderTop(HSSFBorderFormatting.BORDER_THICK);
-		bordFmt.setBorderLeft(HSSFBorderFormatting.BORDER_DASHED);
-		bordFmt.setBorderRight(HSSFBorderFormatting.BORDER_DOTTED);
-
-		HSSFPatternFormatting patternFmt = new HSSFPatternFormatting();
-		patternFmt.setFillBackgroundColor(HSSFColor.RED.index);
-
-		HSSFConditionalFormattingRule [] cfRules =
-		{
-			sheet.createConditionalFormattingRule(formula, fontFmt, bordFmt, patternFmt),
-			sheet.createConditionalFormattingRule(ComparisonOperator.BETWEEN, "1", "2", fontFmt, bordFmt, patternFmt)
-		};
-
-		short col = 1;
-		Region [] regions =
-		{
-			new Region(0,col,-1,col)
-		};
-
-		sheet.addConditionalFormatting(regions, cfRules);
-		sheet.addConditionalFormatting(regions, cfRules);
-
-		// Verification
-		assertEquals(2, sheet.getNumConditionalFormattings());
-		sheet.removeConditionalFormatting(1);
-		assertEquals(1, sheet.getNumConditionalFormattings());
-		HSSFConditionalFormatting cf = sheet.getConditionalFormattingAt(0);
-		assertNotNull(cf);
-
-		regions = cf.getFormattingRegions();
-		assertNotNull(regions);
-		assertEquals(1, regions.length);
-		Region r = regions[0];
-		assertEquals(1, r.getColumnFrom());
-		assertEquals(1, r.getColumnTo());
-		assertEquals(0, r.getRowFrom());
-		assertEquals(-1, r.getRowTo());
-
-		assertEquals(2, cf.getNumberOfRules());
-
-		HSSFConditionalFormattingRule rule1 = cf.getRule(0);
-		assertEquals("7",rule1.getFormula1()); 
-		assertNull(rule1.getFormula2());
-
-		HSSFConditionalFormattingRule rule2 = cf.getRule(1);
-		assertEquals("2",rule2.getFormula2()); 
-		assertEquals("1",rule2.getFormula1()); 
-	}
-}