Skip to content

Commit 952e998

Browse files
committed
update test cases for default styles
Signed-off-by: Hakan Ozler <[email protected]>
1 parent 1d00c68 commit 952e998

File tree

5 files changed

+8
-23
lines changed

5 files changed

+8
-23
lines changed

src/main/java/com/poiji/option/PoijiOptions.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ public static class PoijiOptionsBuilder {
310310
private Casting casting = new DefaultCasting();
311311
private Formatting formatting = new DefaultFormatting();
312312
private PoijiLogCellFormat cellFormat;
313-
private PoijiNumberFormat numberFormat = StylesFormat.loadDefaultStyles();
313+
private PoijiNumberFormat numberFormat = StylesFormatHelper.loadDefaultStyles();
314314
private int headerStart = 0;
315315
private int headerCount = 1;
316316
private int skip = 1;

src/main/java/com/poiji/option/StylesFormat.java renamed to src/main/java/com/poiji/option/StylesFormatHelper.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
import com.poiji.bind.mapping.PoijiNumberFormat;
44

5-
class StylesFormat {
5+
class StylesFormatHelper {
66

7-
private StylesFormat() {
7+
private StylesFormatHelper() {
88
}
99

10-
public static PoijiNumberFormat loadDefaultStyles() {
10+
static PoijiNumberFormat loadDefaultStyles() {
1111
PoijiNumberFormat numberFormat = new PoijiNumberFormat();
1212
numberFormat.putNumberFormat((short) 47, "mm/dd/yyyy hh.mm aa");
1313
numberFormat.putNumberFormat((short) 14, "dd/mm/yyyy");

src/test/java/com/poiji/deserialize/CalculationExcelTest.java

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,11 @@
88
import org.junit.runners.Parameterized;
99

1010
import java.io.File;
11-
import java.time.LocalDate;
12-
import java.time.format.DateTimeFormatter;
13-
import java.time.format.DateTimeFormatterBuilder;
14-
import java.time.temporal.ChronoField;
1511
import java.util.Arrays;
1612
import java.util.List;
1713

14+
import static org.hamcrest.MatcherAssert.assertThat;
1815
import static org.hamcrest.core.Is.is;
19-
import static org.junit.Assert.assertThat;
2016

2117
/**
2218
* Created by hakan on 02/08/2018
@@ -40,11 +36,7 @@ public static Iterable<Object[]> queries() {
4036
@Test
4137
public void shouldMapCalculations() {
4238

43-
final DateTimeFormatter formatter = new DateTimeFormatterBuilder()
44-
.appendPattern("M/d/")
45-
.appendValueReduced(ChronoField.YEAR_OF_ERA, 2, 2, LocalDate.now().minusYears(80)).toFormatter();
46-
47-
PoijiOptions options = PoijiOptions.PoijiOptionsBuilder.settings().sheetIndex(1).dateFormatter(formatter).build();
39+
PoijiOptions options = PoijiOptions.PoijiOptionsBuilder.settings().sheetIndex(1).build();
4840

4941
List<Calculation> calculations = Poiji.fromExcel(new File(path), Calculation.class, options);
5042

src/test/java/com/poiji/deserialize/LogFormatTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ public void shouldReturnInternalCellFormats() throws IOException {
4949
PoijiLogCellFormat log = new PoijiLogCellFormat();
5050
PoijiOptions options = PoijiOptions.PoijiOptionsBuilder.settings()
5151
.poijiLogCellFormat(log)
52+
.poijiNumberFormat(null)
5253
.build();
5354
List<DateExcelColumn> dates = Poiji.fromExcel(stream, poijiExcelType, DateExcelColumn.class, options);
5455

src/test/java/com/poiji/deserialize/ReadExcelBySheetNameTest.java

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@
88
import org.junit.runners.Parameterized;
99

1010
import java.io.File;
11-
import java.time.LocalDate;
12-
import java.time.format.DateTimeFormatter;
13-
import java.time.format.DateTimeFormatterBuilder;
14-
import java.time.temporal.ChronoField;
1511
import java.util.Arrays;
1612
import java.util.List;
1713

@@ -37,11 +33,7 @@ public static Iterable<Object[]> queries() {
3733
@Test
3834
public void shouldReadExcelBySheetName() {
3935

40-
final DateTimeFormatter formatter = new DateTimeFormatterBuilder()
41-
.appendPattern("M/d/")
42-
.appendValueReduced(ChronoField.YEAR_OF_ERA, 2, 2, LocalDate.now().minusYears(80)).toFormatter();
43-
44-
PoijiOptions options = PoijiOptions.PoijiOptionsBuilder.settings().sheetName("SI calculations").dateFormatter(formatter).build();
36+
PoijiOptions options = PoijiOptions.PoijiOptionsBuilder.settings().sheetName("SI calculations").build();
4537

4638
List<Calculation> calculations = Poiji.fromExcel(new File(path), Calculation.class, options);
4739

0 commit comments

Comments
 (0)