embulk-parser-poi_excel 0.1.1 → 0.1.2

data/src/test/java/org/embulk/parser/poi_excel/TestPoiExcelParserPlugin_columnNumber.java

@@ -1,13 +1,13 @@
 package org.embulk.parser.poi_excel;
 
 import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
 import static org.junit.Assert.assertThat;
 
 import java.net.URL;
 import java.text.ParseException;
 import java.util.List;
 
-import org.apache.poi.ss.usermodel.FormulaError;
 import org.embulk.parser.EmbulkPluginTester;
 import org.embulk.parser.EmbulkTestOutputPlugin.OutputRecord;
 import org.embulk.parser.EmbulkTestParserConfig;
@@ -23,7 +23,6 @@ public class TestPoiExcelParserPlugin_columnNumber {
 			EmbulkTestParserConfig parser = tester.newParserConfig(PoiExcelParserPlugin.TYPE);
 			parser.set("sheet", "test1");
 			parser.set("skip_header_lines", 1);
-			parser.set("cell_error_null", false);
 			parser.addColumn("text", "string").set("column_number", "D");
 
 			URL inFile = getClass().getResource("test1.xls");
@@ -36,7 +35,7 @@ public class TestPoiExcelParserPlugin_columnNumber {
 			assertThat(result.get(3).getAsString("text"), is("abc"));
 			assertThat(result.get(4).getAsString("text"), is("abc"));
 			assertThat(result.get(5).getAsString("text"), is("true"));
-			assertThat(result.get(6).getAsString("text"), is("#DIV/0!"));
+			assertThat(result.get(6).getAsString("text"), is(nullValue()));
 		}
 	}
 
@@ -48,7 +47,6 @@ public class TestPoiExcelParserPlugin_columnNumber {
 			EmbulkTestParserConfig parser = tester.newParserConfig(PoiExcelParserPlugin.TYPE);
 			parser.set("sheet", "test1");
 			parser.set("skip_header_lines", 1);
-			parser.set("cell_error_null", false);
 			parser.addColumn("long", "long").set("column_number", 2);
 			parser.addColumn("double", "double");
 
@@ -62,7 +60,7 @@ public class TestPoiExcelParserPlugin_columnNumber {
 			check_int(result, 3, 123L, 123.4d);
 			check_int(result, 4, 123L, 123.4d);
 			check_int(result, 5, 1L, 1d);
-			check_int(result, 6, (long) FormulaError.DIV0.getCode(), (double) FormulaError.DIV0.getCode());
+			check_int(result, 6, null, null);
 		}
 	}
 

data/src/test/java/org/embulk/parser/poi_excel/TestPoiExcelParserPlugin_constant.java

@@ -0,0 +1,54 @@
+package org.embulk.parser.poi_excel;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assert.assertThat;
+
+import java.net.URL;
+import java.text.ParseException;
+import java.util.List;
+
+import org.embulk.parser.EmbulkPluginTester;
+import org.embulk.parser.EmbulkTestOutputPlugin.OutputRecord;
+import org.embulk.parser.EmbulkTestParserConfig;
+import org.junit.Test;
+
+public class TestPoiExcelParserPlugin_constant {
+
+	@Test
+	public void testConstant() throws Exception {
+		try (EmbulkPluginTester tester = new EmbulkPluginTester()) {
+			tester.addParserPlugin(PoiExcelParserPlugin.TYPE, PoiExcelParserPlugin.class);
+
+			EmbulkTestParserConfig parser = tester.newParserConfig(PoiExcelParserPlugin.TYPE);
+			parser.set("sheet", "style");
+			parser.addColumn("const-s", "string").set("value", "constant.zzz");
+			parser.addColumn("const-n", "long").set("value", "constant.-1");
+			parser.addColumn("space", "string").set("value", "constant. ");
+			parser.addColumn("empty", "string").set("value", "constant.");
+			parser.addColumn("null", "string").set("value", "constant");
+			parser.addColumn("cell", "string");
+
+			URL inFile = getClass().getResource("test1.xls");
+			List<OutputRecord> result = tester.runParser(inFile, parser);
+
+			assertThat(result.size(), is(5));
+			check(result, 0, "red");
+			check(result, 1, "green");
+			check(result, 2, "blue");
+			check(result, 3, "white");
+			check(result, 4, "black");
+		}
+	}
+
+	private void check(List<OutputRecord> result, int index, String s) throws ParseException {
+		OutputRecord r = result.get(index);
+		// System.out.println(r);
+		assertThat(r.getAsString("const-s"), is("zzz"));
+		assertThat(r.getAsLong("const-n"), is(-1L));
+		assertThat(r.getAsString("space"), is(" "));
+		assertThat(r.getAsString("empty"), is(""));
+		assertThat(r.getAsString("null"), is(nullValue()));
+		assertThat(r.getAsString("cell"), is(s));
+	}
+}

data/src/test/java/org/embulk/parser/poi_excel/TestPoiExcelParserPlugin_convertError.java

@@ -0,0 +1,113 @@
+package org.embulk.parser.poi_excel;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.fail;
+
+import java.net.URL;
+import java.text.SimpleDateFormat;
+import java.util.List;
+
+import org.embulk.parser.EmbulkPluginTester;
+import org.embulk.parser.EmbulkTestOutputPlugin.OutputRecord;
+import org.embulk.parser.EmbulkTestParserConfig;
+import org.embulk.spi.time.Timestamp;
+import org.junit.Test;
+
+public class TestPoiExcelParserPlugin_convertError {
+
+	@Test
+	public void testConvertError_default() throws Exception {
+		try (EmbulkPluginTester tester = new EmbulkPluginTester()) {
+			tester.addParserPlugin(PoiExcelParserPlugin.TYPE, PoiExcelParserPlugin.class);
+
+			EmbulkTestParserConfig parser = tester.newParserConfig(PoiExcelParserPlugin.TYPE);
+			parser.set("sheet", "style");
+			parser.addColumn("t", "timestamp").set("column_number", "A");
+
+			URL inFile = getClass().getResource("test1.xls");
+			try {
+				tester.runParser(inFile, parser);
+			} catch (Exception e) {
+				Throwable c1 = e.getCause();
+				assertThat(c1.getMessage().contains("error at Column"), is(true));
+				Throwable c2 = c1.getCause();
+				assertThat(c2.getMessage().contains("convert error"), is(true));
+				return; // success
+			}
+			fail("must throw Exception");
+		}
+	}
+
+	@Test
+	public void testConvertError_exception() throws Exception {
+		try (EmbulkPluginTester tester = new EmbulkPluginTester()) {
+			tester.addParserPlugin(PoiExcelParserPlugin.TYPE, PoiExcelParserPlugin.class);
+
+			EmbulkTestParserConfig parser = tester.newParserConfig(PoiExcelParserPlugin.TYPE);
+			parser.set("sheet", "style");
+			parser.set("on_convert_error", "exception");
+			parser.addColumn("t", "timestamp").set("column_number", "A");
+
+			URL inFile = getClass().getResource("test1.xls");
+			try {
+				tester.runParser(inFile, parser);
+			} catch (Exception e) {
+				Throwable c1 = e.getCause();
+				assertThat(c1.getMessage().contains("error at Column"), is(true));
+				Throwable c2 = c1.getCause();
+				assertThat(c2.getMessage().contains("convert error"), is(true));
+				return; // success
+			}
+			fail("must throw Exception");
+		}
+	}
+
+	@Test
+	public void testConvertError_null() throws Exception {
+		try (EmbulkPluginTester tester = new EmbulkPluginTester()) {
+			tester.addParserPlugin(PoiExcelParserPlugin.TYPE, PoiExcelParserPlugin.class);
+
+			EmbulkTestParserConfig parser = tester.newParserConfig(PoiExcelParserPlugin.TYPE);
+			parser.set("sheet", "comment");
+			parser.set("on_convert_error", "constant");
+			parser.addColumn("t", "timestamp").set("column_number", "A");
+
+			URL inFile = getClass().getResource("test1.xls");
+			List<OutputRecord> result = tester.runParser(inFile, parser);
+
+			assertThat(result.size(), is(2));
+			assertThat(result.get(0).getAsTimestamp("t"), is(nullValue()));
+			assertThat(result.get(1).getAsTimestamp("t"), is(nullValue()));
+		}
+	}
+
+	@Test
+	public void testConvertError_constant() throws Exception {
+		try (EmbulkPluginTester tester = new EmbulkPluginTester()) {
+			tester.addParserPlugin(PoiExcelParserPlugin.TYPE, PoiExcelParserPlugin.class);
+
+			EmbulkTestParserConfig parser = tester.newParserConfig(PoiExcelParserPlugin.TYPE);
+			parser.set("sheet", "comment");
+			parser.set("on_convert_error", "constant.0");
+			parser.addColumn("b", "boolean").set("column_number", "A");
+			parser.addColumn("l", "long").set("column_number", "A");
+			parser.addColumn("d", "double").set("column_number", "A");
+			parser.addColumn("t", "timestamp").set("column_number", "A").set("format", "%Y/%m/%d")
+					.set("on_convert_error", "constant.2000/1/1");
+
+			URL inFile = getClass().getResource("test1.xls");
+			List<OutputRecord> result = tester.runParser(inFile, parser);
+
+			assertThat(result.size(), is(2));
+			for (OutputRecord r : result) {
+				assertThat(r.getAsBoolean("b"), is(false));
+				assertThat(r.getAsLong("l"), is(0L));
+				assertThat(r.getAsDouble("d"), is(0d));
+				assertThat(r.getAsTimestamp("t"), is(Timestamp.ofEpochMilli(new SimpleDateFormat("yyyy/MM/dd z").parse(
+						"2000/01/01 UTC").getTime())));
+			}
+		}
+	}
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-parser-poi_excel
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - hishidama
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-10-18 00:00:00.000000000 Z
+date: 2015-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -57,6 +57,9 @@ files:
 - lib/embulk/parser/poi_excel.rb
 - src/main/java/org/embulk/parser/poi_excel/PoiExcelColumnValueType.java
 - src/main/java/org/embulk/parser/poi_excel/PoiExcelParserPlugin.java
+- src/main/java/org/embulk/parser/poi_excel/bean/PoiExcelColumnBean.java
+- src/main/java/org/embulk/parser/poi_excel/bean/PoiExcelColumnIndex.java
+- src/main/java/org/embulk/parser/poi_excel/bean/PoiExcelSheetBean.java
 - src/main/java/org/embulk/parser/poi_excel/visitor/AbstractPoiExcelCellAttributeVisitor.java
 - src/main/java/org/embulk/parser/poi_excel/visitor/PoiExcelCellCommentVisitor.java
 - src/main/java/org/embulk/parser/poi_excel/visitor/PoiExcelCellFontVisitor.java
@@ -64,7 +67,6 @@ files:
 - src/main/java/org/embulk/parser/poi_excel/visitor/PoiExcelCellValueVisitor.java
 - src/main/java/org/embulk/parser/poi_excel/visitor/PoiExcelClientAnchorVisitor.java
 - src/main/java/org/embulk/parser/poi_excel/visitor/PoiExcelColorVisitor.java
-- src/main/java/org/embulk/parser/poi_excel/visitor/PoiExcelColumnIndex.java
 - src/main/java/org/embulk/parser/poi_excel/visitor/PoiExcelColumnVisitor.java
 - src/main/java/org/embulk/parser/poi_excel/visitor/PoiExcelVisitorFactory.java
 - src/main/java/org/embulk/parser/poi_excel/visitor/PoiExcelVisitorValue.java
@@ -80,12 +82,15 @@ files:
 - src/test/java/org/embulk/parser/EmbulkTestParserConfig.java
 - src/test/java/org/embulk/parser/poi_excel/TestPoiExcelParserPlugin.java
 - src/test/java/org/embulk/parser/poi_excel/TestPoiExcelParserPlugin_cellComment.java
+- src/test/java/org/embulk/parser/poi_excel/TestPoiExcelParserPlugin_cellError.java
 - src/test/java/org/embulk/parser/poi_excel/TestPoiExcelParserPlugin_cellFont.java
 - src/test/java/org/embulk/parser/poi_excel/TestPoiExcelParserPlugin_cellStyle.java
 - src/test/java/org/embulk/parser/poi_excel/TestPoiExcelParserPlugin_columnNumber.java
+- src/test/java/org/embulk/parser/poi_excel/TestPoiExcelParserPlugin_constant.java
+- src/test/java/org/embulk/parser/poi_excel/TestPoiExcelParserPlugin_convertError.java
 - src/test/resources/org/embulk/parser/poi_excel/test1.xls
 - classpath/commons-codec-1.9.jar
-- classpath/embulk-parser-poi_excel-0.1.1.jar
+- classpath/embulk-parser-poi_excel-0.1.2.jar
 - classpath/embulk-standards-0.7.5.jar
 - classpath/poi-3.13.jar
 - classpath/poi-ooxml-3.13.jar