This is an automated email from the ASF dual-hosted git repository. sgoeschl pushed a commit to branch FREEMARKER-172 in repository https://gitbox.apache.org/repos/asf/freemarker-generator.git
commit 36b876d27ecbd4c0f7291d9044e64f61a9dd2be5 Author: Siegfried Goeschl <[email protected]> AuthorDate: Wed Feb 3 20:09:03 2021 +0100 FREEMARKER-172 [freemarker-generator] Start with refactoring --- .../generator/tools/dataframe/DataFrameToolTest.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/freemarker-generator-tools/src/test/java/org/apache/freemarker/generator/tools/dataframe/DataFrameToolTest.java b/freemarker-generator-tools/src/test/java/org/apache/freemarker/generator/tools/dataframe/DataFrameToolTest.java index 0e1d395..0623efc 100644 --- a/freemarker-generator-tools/src/test/java/org/apache/freemarker/generator/tools/dataframe/DataFrameToolTest.java +++ b/freemarker-generator-tools/src/test/java/org/apache/freemarker/generator/tools/dataframe/DataFrameToolTest.java @@ -19,7 +19,8 @@ package org.apache.freemarker.generator.tools.dataframe; import de.unknownreality.dataframe.DataFrame; import org.apache.commons.csv.CSVFormat; import org.apache.commons.csv.CSVParser; -import org.apache.freemarker.generator.base.datasource.DataSourceFactory; +import org.apache.freemarker.generator.base.datasource.DataSourceLoader; +import org.apache.freemarker.generator.base.datasource.DataSourceLoaderFactory; import org.apache.freemarker.generator.tools.commonscsv.CommonsCSVTool; import org.apache.freemarker.generator.tools.excel.ExcelTool; import org.apache.freemarker.generator.tools.gson.GsonTool; @@ -113,7 +114,7 @@ public class DataFrameToolTest { @Test public void shouldParseExcelSheet() { final ExcelTool excelTool = excelTool(); - final Workbook workbook = excelTool.parse(DataSourceFactory.create("./src/test/data/excel/test.xls")); + final Workbook workbook = excelTool.parse(dataSourceLoader().load("./src/test/data/excel/test.xls")); final List<List<Object>> sheet = excelTool.toTable(workbook.getSheetAt(0)); final DataFrame dataFrame = dataFrameTool().fromRows(sheet, true); @@ -150,4 +151,9 @@ public class DataFrameToolTest { private CSVParser csvParser(String csv, CSVFormat csvFormat) { return commonsCSVTool().parse(csv, csvFormat); } + + private static DataSourceLoader dataSourceLoader() { + return DataSourceLoaderFactory.create(); + } + }
