You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ce...@apache.org on 2019/03/31 19:29:52 UTC
svn commit: r1856691 - in /poi/trunk/src/testcases/org/apache/poi/ss:
format/TestCellFormat.java usermodel/TestDataFormatter.java
Author: centic
Date: Sun Mar 31 19:29:52 2019
New Revision: 1856691
URL: http://svn.apache.org/viewvc?rev=1856691&view=rev
Log:
Fix some IDE warnings and enable commented test
Modified:
poi/trunk/src/testcases/org/apache/poi/ss/format/TestCellFormat.java
poi/trunk/src/testcases/org/apache/poi/ss/usermodel/TestDataFormatter.java
Modified: poi/trunk/src/testcases/org/apache/poi/ss/format/TestCellFormat.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/format/TestCellFormat.java?rev=1856691&r1=1856690&r2=1856691&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/format/TestCellFormat.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/format/TestCellFormat.java Sun Mar 31 19:29:52 2019
@@ -849,11 +849,9 @@ public class TestCellFormat {
*/
@Test
public void testApplyObjectDate() throws ParseException {
-
CellFormat cf1 = CellFormat.getInstance("m/d/yyyy");
Date date1 = new SimpleDateFormat("M/d/y", Locale.ROOT).parse("01/11/2012");
- //assertEquals("1/11/2012", cf1.apply(date1).text);
-
+ assertEquals("1/11/2012", cf1.apply(date1).text);
}
@Test
@@ -911,21 +909,18 @@ public class TestCellFormat {
public void testSimpleFractionFormat() throws IOException {
CellFormat cf1 = CellFormat.getInstance("# ?/?");
// Create a workbook, row and cell to test with
- Workbook wb = new HSSFWorkbook();
- try {
+ try (Workbook wb = new HSSFWorkbook()) {
Sheet sheet = wb.createSheet();
Row row = sheet.createRow(0);
Cell cell = row.createCell(0);
cell.setCellValue(123456.6);
//System.out.println(cf1.apply(cell).text);
assertEquals("123456 3/5", cf1.apply(cell).text);
- } finally {
- wb.close();
}
}
@Test
- public void testAccountingFormats() throws IOException {
+ public void testAccountingFormats() {
char pound = '\u00A3';
char euro = '\u20AC';
@@ -1011,4 +1006,4 @@ public class TestCellFormat {
assertNotNull(instance);
assertEquals("01/01/1970", instance.apply(new Date(12345)).text);
}
-}
\ No newline at end of file
+}
Modified: poi/trunk/src/testcases/org/apache/poi/ss/usermodel/TestDataFormatter.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/usermodel/TestDataFormatter.java?rev=1856691&r1=1856690&r2=1856691&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/usermodel/TestDataFormatter.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/usermodel/TestDataFormatter.java Sun Mar 31 19:29:52 2019
@@ -584,8 +584,7 @@ public class TestDataFormatter {
DataFormatter dfUS = new DataFormatter(Locale.US, true);
// Create a spreadsheet with some formula errors in it
- Workbook wb = new HSSFWorkbook();
- try {
+ try (Workbook wb = new HSSFWorkbook()) {
Sheet s = wb.createSheet();
Row r = s.createRow(0);
Cell c = r.createCell(0, CellType.ERROR);
@@ -595,8 +594,6 @@ public class TestDataFormatter {
c.setCellErrorValue(FormulaError.REF.getCode());
assertEquals(FormulaError.REF.getString(), dfUS.formatCellValue(c));
- } finally {
- wb.close();
}
}
@@ -605,8 +602,7 @@ public class TestDataFormatter {
DataFormatter formatter = new DataFormatter();
// Create a spreadsheet with some TRUE/FALSE boolean values in it
- Workbook wb = new HSSFWorkbook();
- try {
+ try (Workbook wb = new HSSFWorkbook()) {
Sheet s = wb.createSheet();
Row r = s.createRow(0);
Cell c = r.createCell(0);
@@ -616,8 +612,6 @@ public class TestDataFormatter {
c.setCellValue(false);
assertEquals("FALSE", formatter.formatCellValue(c));
- } finally {
- wb.close();
}
}
@@ -785,8 +779,7 @@ public class TestDataFormatter {
}
private static void assertFormatsTo(String expected, double input) throws IOException {
- Workbook wb = new HSSFWorkbook();
- try {
+ try (Workbook wb = new HSSFWorkbook()) {
Sheet s1 = wb.createSheet();
Row row = s1.createRow(0);
Cell rawValue = row.createCell(0);
@@ -797,9 +790,6 @@ public class TestDataFormatter {
String actual = new DataFormatter().formatCellValue(rawValue);
assertEquals(expected, actual);
}
- finally {
- wb.close();
- }
}
@Test
@@ -835,7 +825,7 @@ public class TestDataFormatter {
}
@Test
- public void testFormatWithTrailingDotsOtherLocale() throws Exception {
+ public void testFormatWithTrailingDotsOtherLocale() {
DataFormatter dfIT = new DataFormatter(Locale.ITALY);
assertEquals("1.000.000", dfIT.formatRawCellContents(1000000, -1, "#,##0"));
assertEquals("1.000", dfIT.formatRawCellContents(1000000, -1, "#,##0,"));
@@ -892,7 +882,7 @@ public class TestDataFormatter {
*/
@Test
public void testSimpleNumericFormatsInGermanyLocale() {
- List<Locale> locales = Arrays.asList(new Locale[] {Locale.GERMANY, Locale.US, Locale.ROOT} );
+ Locale[] locales = new Locale[] {Locale.GERMANY, Locale.US, Locale.ROOT};
for (Locale locale : locales) {
//show that LocaleUtil has no effect on these tests
LocaleUtil.setUserLocale(locale);
@@ -1015,4 +1005,4 @@ public class TestDataFormatter {
return true;
}
-}
\ No newline at end of file
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org