Author: centic
Date: Thu Jan 26 19:58:52 2017
New Revision: 1780454
URL: http://svn.apache.org/viewvc?rev=1780454&view=rev
Log:
Move test to base-test-class to run it for (S)XSSF as well
Also had to increase the numbers a bit as it fails locally for me otherwise
Modified:
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java
poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheet.java
Modified:
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java?rev=1780454&r1=1780453&r2=1780454&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java
(original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java
Thu Jan 26 19:58:52 2017
@@ -59,14 +59,7 @@ import org.apache.poi.hssf.record.aggreg
import org.apache.poi.hssf.usermodel.RecordInspector.RecordCollector;
import org.apache.poi.ss.formula.ptg.Area3DPtg;
import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.usermodel.AutoFilter;
-import org.apache.poi.ss.usermodel.BaseTestSheet;
-import org.apache.poi.ss.usermodel.DataValidation;
-import org.apache.poi.ss.usermodel.DataValidationConstraint;
-import org.apache.poi.ss.usermodel.DataValidationHelper;
-import org.apache.poi.ss.usermodel.DateUtil;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.ss.usermodel.*;
import org.apache.poi.ss.util.CellRangeAddress;
import org.apache.poi.ss.util.CellRangeAddressList;
import org.junit.Test;
@@ -691,42 +684,6 @@ public final class TestHSSFSheet extends
wb2.close();
wb1.close();
}
-
- @Test
- public void autoSizeDate() throws IOException {
- HSSFWorkbook wb = new HSSFWorkbook();
- HSSFSheet s = wb.createSheet("Sheet1");
- HSSFRow r = s.createRow(0);
- r.createCell(0).setCellValue(1);
- r.createCell(1).setCellValue(123456);
-
- // Will be sized fairly small
- s.autoSizeColumn((short)0);
- s.autoSizeColumn((short)1);
-
- // Size ranges due to different fonts on different machines
- assertBetween("Single number column width", s.getColumnWidth(0), 350,
550);
- assertBetween("6 digit number column width", s.getColumnWidth(1), 1500,
2000);
-
- // Set a date format
- HSSFCellStyle cs = wb.createCellStyle();
- HSSFDataFormat f = wb.createDataFormat();
- cs.setDataFormat(f.getFormat("yyyy-mm-dd MMMM hh:mm:ss"));
- r.getCell(0).setCellStyle(cs);
- r.getCell(1).setCellStyle(cs);
-
- assertTrue(DateUtil.isCellDateFormatted(r.getCell(0)));
- assertTrue(DateUtil.isCellDateFormatted(r.getCell(1)));
-
- // Should get much bigger now
- s.autoSizeColumn((short)0);
- s.autoSizeColumn((short)1);
-
- assertBetween("Date column width", s.getColumnWidth(0), 4750, 7000);
- assertBetween("Date column width", s.getColumnWidth(1), 4750, 7000);
-
- wb.close();
- }
/**
* Setting ForceFormulaRecalculation on sheets
@@ -998,7 +955,7 @@ public final class TestHSSFSheet extends
assertEquals(8*20, cs.getFont(wbComplex).getFontHeight());
assertEquals(10, cs.getFont(wbComplex).getColor());
assertFalse(cs.getFont(wbComplex).getItalic());
- assertEquals(HSSFFont.BOLDWEIGHT_BOLD,
cs.getFont(wbComplex).getBoldweight());
+ assertTrue(cs.getFont(wbComplex).getBold());
wbComplex.close();
wbSimple.close();
Modified: poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheet.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheet.java?rev=1780454&r1=1780453&r2=1780454&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheet.java
(original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheet.java Thu
Jan 26 19:58:52 2017
@@ -17,27 +17,8 @@
package org.apache.poi.ss.usermodel;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeTrue;
-
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
import org.apache.poi.common.usermodel.HyperlinkType;
+import org.apache.poi.hssf.usermodel.*;
import org.apache.poi.ss.ITestDataProvider;
import org.apache.poi.ss.SpreadsheetVersion;
import org.apache.poi.ss.util.CellAddress;
@@ -47,6 +28,14 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
+import java.io.IOException;
+import java.util.*;
+import java.util.Map.Entry;
+
+import static org.apache.poi.POITestCase.assertBetween;
+import static org.junit.Assert.*;
+import static org.junit.Assume.assumeTrue;
+
/**
* Common superclass for testing {@link
org.apache.poi.xssf.usermodel.XSSFCell} and
* {@link org.apache.poi.hssf.usermodel.HSSFCell}
@@ -295,28 +284,36 @@ public abstract class BaseTestSheet {
sheet.addMergedRegion(duplicateRegion);
fail("Should not be able to add a merged region (" +
duplicateRegion.formatAsString() + ") " +
"if sheet already contains the same merged region (" +
baseRegion.formatAsString() + ")");
- } catch (final IllegalStateException e) { }
+ } catch (final IllegalStateException e) {
+ // expected here
+ }
try {
final CellRangeAddress partiallyOverlappingRegion = new
CellRangeAddress(1, 2, 1, 2); //B2:C3
sheet.addMergedRegion(partiallyOverlappingRegion);
fail("Should not be able to add a merged region (" +
partiallyOverlappingRegion.formatAsString() + ") " +
"if it partially overlaps with an existing merged region (" +
baseRegion.formatAsString() + ")");
- } catch (final IllegalStateException e) { }
+ } catch (final IllegalStateException e) {
+ // expected here
+ }
try {
final CellRangeAddress subsetRegion = new CellRangeAddress(0, 1,
0, 0); //A1:A2
sheet.addMergedRegion(subsetRegion);
fail("Should not be able to add a merged region (" +
subsetRegion.formatAsString() + ") " +
"if it is a formal subset of an existing merged region (" +
baseRegion.formatAsString() + ")");
- } catch (final IllegalStateException e) { } //expected
+ } catch (final IllegalStateException e) {
+ // expected here
+ }
try {
final CellRangeAddress supersetRegion = new CellRangeAddress(0, 2,
0, 2); //A1:C3
sheet.addMergedRegion(supersetRegion);
fail("Should not be able to add a merged region (" +
supersetRegion.formatAsString() + ") " +
"if it is a formal superset of an existing merged region (" +
baseRegion.formatAsString() + ")");
- } catch (final IllegalStateException e) { }
+ } catch (final IllegalStateException e) {
+ // expected here
+ }
final CellRangeAddress disjointRegion = new CellRangeAddress(10, 11,
10, 11);
sheet.addMergedRegion(disjointRegion);
@@ -449,9 +446,9 @@ public abstract class BaseTestSheet {
wb.close();
}
- private static void assertCollectionEquals(Collection<? extends Object>
expected, Collection<? extends Object> actual) {
- Set<Object> e = new HashSet<Object>(expected);
- Set<Object> a = new HashSet<Object>(actual);
+ private static <T> void assertCollectionEquals(Collection<T> expected,
Collection<T> actual) {
+ Set<T> e = new HashSet<T>(expected);
+ Set<T> a = new HashSet<T>(actual);
assertEquals(e, a);
}
@@ -1113,7 +1110,6 @@ public abstract class BaseTestSheet {
/**
* XSSFSheet autoSizeColumn() on empty RichTextString fails
- * @throws IOException
*/
@Test
public void bug48325() throws IOException {
@@ -1347,4 +1343,44 @@ public abstract class BaseTestSheet {
wb1.close();
wb2.close();
}
+
+
+ @Test
+ public void autoSizeDate() throws IOException {
+ Workbook wb = _testDataProvider.createWorkbook();
+ Sheet s = wb.createSheet("Sheet1");
+ Row r = s.createRow(0);
+ r.createCell(0).setCellValue(1);
+ r.createCell(1).setCellValue(123456);
+
+ // for the streaming-variant we need to enable autosize-tracking to
make it work
+ trackColumnsForAutoSizingIfSXSSF(s);
+
+ // Will be sized fairly small
+ s.autoSizeColumn((short)0);
+ s.autoSizeColumn((short)1);
+
+ // Size ranges due to different fonts on different machines
+ assertBetween("Single number column width", s.getColumnWidth(0), 350,
570);
+ assertBetween("6 digit number column width", s.getColumnWidth(1),
1500, 2100);
+
+ // Set a date format
+ CellStyle cs = wb.createCellStyle();
+ DataFormat f = wb.createDataFormat();
+ cs.setDataFormat(f.getFormat("yyyy-mm-dd MMMM hh:mm:ss"));
+ r.getCell(0).setCellStyle(cs);
+ r.getCell(1).setCellStyle(cs);
+
+ assertTrue(DateUtil.isCellDateFormatted(r.getCell(0)));
+ assertTrue(DateUtil.isCellDateFormatted(r.getCell(1)));
+
+ // Should get much bigger now
+ s.autoSizeColumn((short)0);
+ s.autoSizeColumn((short)1);
+
+ assertBetween("Date column width", s.getColumnWidth(0), 4750, 7200);
+ assertBetween("Date column width", s.getColumnWidth(1), 4750, 7200);
+
+ wb.close();
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
