embulk-parser-poi_excel 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4fc1f7535c2d5dd180ad60a729c0daccab15144c
-  data.tar.gz: 2c09c8ffa12e314ff1af31dd0c2bab4c02d00057
+  metadata.gz: be106894c6b2167dd2f275cf8696003cc82195c3
+  data.tar.gz: c6f3718249f56278a0a29dd50521216765838c51
 SHA512:
-  metadata.gz: 0236a3b74bee6392af244631640fd8fe317fa42728a690eecfe4ef11b149fa5c5f9237a334af0d757008aabfff7040c9787fef363b9a84a67c799eff5148e328
-  data.tar.gz: df386175cd7cbc2be51d70682f21d62581f527c040dfeaeac86def0ddff0b62297d58fcd3920cbd5ae4be636e49ae7ecd3f08de15e28c2930d7b4313140af6bb
+  metadata.gz: 6c88d6b4604a07b40681a44290bdf75c7f8c10e6e857da5ed254fe7828fc796e54f84e0f37de1e5c9f0089c934dd91283783b95849180b620cf1180a70d8a419
+  data.tar.gz: 772b8d21d4e1587acd97886a79b284a1db42d8a12ac30660a0d2eba9db61292839ceeef39f65d8756e0ee4aea58c7a3c9e3785fcda31c51f01708b116497c6d7

data/README.md

@@ -8,6 +8,29 @@ This plugin uses Apache POI.
 * **Plugin type**: parser
 * **Guess supported**: no
 
+
+## Example
+
+```yaml
+in:
+  type: any file input plugin type
+  parser:
+    type: poi_excel
+    sheets: ["DQ10-orb"]
+    skip_header_lines: 1	# first row is header.
+    columns:
+    - {name: row, type: long, value: row_number}
+    - {name: get_date, type: timestamp, value: cell_value, column_number: A}
+    - {name: orb_type, type: string}
+    - {name: orb_name, type: string}
+    - {name: orb_shape, type: long}
+    - {name: drop_monster_name, type: string}
+```
+
+if omit **value**, specified `cell_value`.  
+if omit **column_number** when **valus** is `cell_value`, specified next column.  
+
+
 ## Configuration
 
 * **sheets**: sheet name. (list of string, required)
@@ -141,34 +164,11 @@ Options of indivisual sheet.
           bar: {value: constant.0}
 ```
 
-*sheet_options* is map of sheet name.  
-Map values are *skip_header_lines*, *colums*.
-
-*columns* is map of column name.  
-Map values are same *columns* in *parser*.
-
-
-## Example
-
-```yaml
-in:
-  type: any file input plugin type
-  parser:
-    type: poi_excel
-    sheets: ["DQ10-orb"]
-    skip_header_lines: 1	# first row is header.
-    columns:
-    - {name: row, type: long, value: row_number}
-    - {name: get_date, type: timestamp, value: cell_value, column_number: A}
-    - {name: orb_type, type: string}
-    - {name: orb_name, type: string}
-    - {name: orb_shape, type: long}
-    - {name: drop_monster_name, type: string}
-```
+**sheet_options** is map of sheet name.  
+Map values are **skip_header_lines**, **colums**.
 
-if omit `value`, specified `cell_value`.  
-if omit `column_number` when valus is `cell_value`, specified next column.  
-if omit `column_number` when valus is `cell_style`, specified same column.
+**columns** is map of column name.  
+Map values are same **columns** in **parser** (excluding `name`, `type`).
 
 
 ## Install

data/build.gradle

@@ -1,77 +1,80 @@
-plugins {
-    id "com.jfrog.bintray" version "1.1"
-    id "com.github.jruby-gradle.base" version "0.1.5"
-    id "java"
-    id "eclipse"
-}
-import com.github.jrubygradle.JRubyExec
-repositories {
-    mavenCentral()
-    jcenter()
-}
-configurations {
-    provided
-}
-
-version = "0.1.3"
-
-dependencies {
-    compile  "org.embulk:embulk-core:0.7.5"
-    provided "org.embulk:embulk-core:0.7.5"
-    compile  "org.embulk:embulk-standards:0.7.5"
-    // compile "YOUR_JAR_DEPENDENCY_GROUP:YOUR_JAR_DEPENDENCY_MODULE:YOUR_JAR_DEPENDENCY_VERSION"
-    compile group: 'org.apache.poi', name : 'poi', version: '3.13'
-    compile group: 'org.apache.poi', name : 'poi-ooxml', version: '3.13'
-    testCompile "junit:junit:4.+"
-}
-
-task classpath(type: Copy, dependsOn: ["jar"]) {
-    doFirst { file("classpath").deleteDir() }
-    from (configurations.runtime - configurations.provided + files(jar.archivePath))
-    into "classpath"
-}
-clean { delete "classpath" }
-
-task gem(type: JRubyExec, dependsOn: ["gemspec", "classpath"]) {
-    jrubyArgs "-rrubygems/gem_runner", "-eGem::GemRunner.new.run(ARGV)", "build"
-    script "${project.name}.gemspec"
-    doLast { ant.move(file: "${project.name}-${project.version}.gem", todir: "pkg") }
-}
-
-task gemPush(type: JRubyExec, dependsOn: ["gem"]) {
-    jrubyArgs "-rrubygems/gem_runner", "-eGem::GemRunner.new.run(ARGV)", "push"
-    script "pkg/${project.name}-${project.version}.gem"
-}
-
-task "package"(dependsOn: ["gemspec", "classpath"]) << {
-    println "> Build succeeded."
-    println "> You can run embulk with '-L ${file(".").absolutePath}' argument."
-}
-
-task gemspec {
-    ext.gemspecFile = file("${project.name}.gemspec")
-    inputs.file "build.gradle"
-    outputs.file gemspecFile
-    doLast { gemspecFile.write($/
-Gem::Specification.new do |spec|
-  spec.name          = "${project.name}"
-  spec.version       = "${project.version}"
-  spec.authors       = ["hishidama"]
-  spec.summary       = %[Apache POI Excel parser plugin for Embulk]
-  spec.description   = %[Parses Excel files(xls, xlsx) read by other file input plugins.]
-  spec.email         = ["hishi.dama@asahi.email.ne.jp"]
-  spec.licenses      = ["MIT"]
-  spec.homepage      = "https://github.com/hishidama/embulk-parser-poi_excel"
-
-  spec.files         = `git ls-files`.split("\n") + Dir["classpath/*.jar"]
-  spec.test_files    = spec.files.grep(%r"^(test|spec)/")
-  spec.require_paths = ["lib"]
-
-  #spec.add_dependency 'YOUR_GEM_DEPENDENCY', ['~> YOUR_GEM_DEPENDENCY_VERSION']
-  spec.add_development_dependency 'bundler', ['~> 1.0']
-  spec.add_development_dependency 'rake', ['>= 10.0']
-end
-/$)
-    }
-}
-clean { delete "${project.name}.gemspec" }
+plugins {
+    id "com.jfrog.bintray" version "1.1"
+    id "com.github.jruby-gradle.base" version "0.1.5"
+    id "java"
+    id "eclipse"
+}
+import com.github.jrubygradle.JRubyExec
+repositories {
+    mavenCentral()
+    jcenter()
+}
+configurations {
+    provided
+}
+
+version = "0.1.4"
+
+sourceCompatibility = 1.7
+targetCompatibility = 1.7
+
+dependencies {
+    compile  "org.embulk:embulk-core:0.7.5"
+    provided "org.embulk:embulk-core:0.7.5"
+    compile  "org.embulk:embulk-standards:0.7.5"
+    // compile "YOUR_JAR_DEPENDENCY_GROUP:YOUR_JAR_DEPENDENCY_MODULE:YOUR_JAR_DEPENDENCY_VERSION"
+    compile group: 'org.apache.poi', name : 'poi', version: '3.13'
+    compile group: 'org.apache.poi', name : 'poi-ooxml', version: '3.13'
+    testCompile "junit:junit:4.+"
+}
+
+task classpath(type: Copy, dependsOn: ["jar"]) {
+    doFirst { file("classpath").deleteDir() }
+    from (configurations.runtime - configurations.provided + files(jar.archivePath))
+    into "classpath"
+}
+clean { delete "classpath" }
+
+task gem(type: JRubyExec, dependsOn: ["gemspec", "classpath"]) {
+    jrubyArgs "-rrubygems/gem_runner", "-eGem::GemRunner.new.run(ARGV)", "build"
+    script "${project.name}.gemspec"
+    doLast { ant.move(file: "${project.name}-${project.version}.gem", todir: "pkg") }
+}
+
+task gemPush(type: JRubyExec, dependsOn: ["gem"]) {
+    jrubyArgs "-rrubygems/gem_runner", "-eGem::GemRunner.new.run(ARGV)", "push"
+    script "pkg/${project.name}-${project.version}.gem"
+}
+
+task "package"(dependsOn: ["gemspec", "classpath"]) << {
+    println "> Build succeeded."
+    println "> You can run embulk with '-L ${file(".").absolutePath}' argument."
+}
+
+task gemspec {
+    ext.gemspecFile = file("${project.name}.gemspec")
+    inputs.file "build.gradle"
+    outputs.file gemspecFile
+    doLast { gemspecFile.write($/
+Gem::Specification.new do |spec|
+  spec.name          = "${project.name}"
+  spec.version       = "${project.version}"
+  spec.authors       = ["hishidama"]
+  spec.summary       = %[Apache POI Excel parser plugin for Embulk]
+  spec.description   = %[Parses Excel files(xls, xlsx) read by other file input plugins.]
+  spec.email         = ["hishi.dama@asahi.email.ne.jp"]
+  spec.licenses      = ["MIT"]
+  spec.homepage      = "https://github.com/hishidama/embulk-parser-poi_excel"
+
+  spec.files         = `git ls-files`.split("\n") + Dir["classpath/*.jar"]
+  spec.test_files    = spec.files.grep(%r"^(test|spec)/")
+  spec.require_paths = ["lib"]
+
+  #spec.add_dependency 'YOUR_GEM_DEPENDENCY', ['~> YOUR_GEM_DEPENDENCY_VERSION']
+  spec.add_development_dependency 'bundler', ['~> 1.0']
+  spec.add_development_dependency 'rake', ['>= 10.0']
+end
+/$)
+    }
+}
+clean { delete "${project.name}.gemspec" }

data/src/main/java/org/embulk/parser/poi_excel/visitor/AbstractPoiExcelCellAttributeVisitor.java

@@ -124,6 +124,9 @@ public abstract class AbstractPoiExcelCellAttributeVisitor<A> {
 
 		if (value instanceof Color) {
 			int rgb = PoiExcelColorVisitor.getRGB((Color) value);
+			if (rgb < 0) {
+				return null;
+			}
 			if (column.getType() instanceof StringType) {
 				value = String.format("%06x", rgb);
 			} else {

data/src/main/java/org/embulk/parser/poi_excel/visitor/PoiExcelCellCommentVisitor.java

@@ -74,7 +74,7 @@ public class PoiExcelCellCommentVisitor extends AbstractPoiExcelCellAttributeVis
 				return getClientAnchorValue(column, cell, comment, null);
 			}
 		});
-		for (String key : PoiExcelClientAnchorVisitor.getKeys()) {
+		for (final String key : PoiExcelClientAnchorVisitor.getKeys()) {
 			map.put("client_anchor." + key, new AttributeSupplier<Comment>() {
 				@Override
 				public Object get(Column column, Cell cell, Comment comment) {

data/src/main/java/org/embulk/parser/poi_excel/visitor/PoiExcelColorVisitor.java

@@ -69,6 +69,9 @@ public class PoiExcelColorVisitor {
 		} else if (color instanceof XSSFColor) {
 			XSSFColor xssf = (XSSFColor) color;
 			byte[] b = xssf.getRGB();
+			if (b == null) {
+				return -1;
+			}
 			rgb[0] = b[0] & 0xff;
 			rgb[1] = b[1] & 0xff;
 			rgb[2] = b[2] & 0xff;

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

@@ -15,12 +15,19 @@ 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;
+import org.junit.experimental.theories.DataPoints;
+import org.junit.experimental.theories.Theories;
+import org.junit.experimental.theories.Theory;
+import org.junit.runner.RunWith;
 
+@RunWith(Theories.class)
 public class TestPoiExcelParserPlugin {
 
-	@Test
-	public void test1() throws ParseException {
+	@DataPoints
+	public static String[] FILES = { "test1.xls", "test2.xlsx" };
+
+	@Theory
+	public void test1(String excelFile) throws ParseException {
 		try (EmbulkPluginTester tester = new EmbulkPluginTester()) {
 			tester.addParserPlugin(PoiExcelParserPlugin.TYPE, PoiExcelParserPlugin.class);
 
@@ -34,7 +41,7 @@ public class TestPoiExcelParserPlugin {
 			parser.addColumn("string", "string");
 			parser.addColumn("timestamp", "timestamp").set("format", "%Y/%m/%d");
 
-			URL inFile = getClass().getResource("test1.xls");
+			URL inFile = getClass().getResource(excelFile);
 			List<OutputRecord> result = tester.runParser(inFile, parser);
 
 			assertThat(result.size(), is(7));
@@ -67,8 +74,8 @@ public class TestPoiExcelParserPlugin {
 		assertThat(r.getAsTimestamp("timestamp"), is(timestamp));
 	}
 
-	@Test
-	public void testRowNumber() throws ParseException {
+	@Theory
+	public void testRowNumber(String excelFile) throws ParseException {
 		try (EmbulkPluginTester tester = new EmbulkPluginTester()) {
 			tester.addParserPlugin(PoiExcelParserPlugin.TYPE, PoiExcelParserPlugin.class);
 
@@ -82,7 +89,7 @@ public class TestPoiExcelParserPlugin {
 			parser.addColumn("col-n", "long").set("value", "column_number");
 			parser.addColumn("col-s", "string").set("value", "column_number");
 
-			URL inFile = getClass().getResource("test1.xls");
+			URL inFile = getClass().getResource(excelFile);
 			List<OutputRecord> result = tester.runParser(inFile, parser);
 
 			assertThat(result.size(), is(7));
@@ -107,8 +114,8 @@ public class TestPoiExcelParserPlugin {
 		assertThat(r.getAsString("col-s"), is("A"));
 	}
 
-	@Test
-	public void testForumlaReplace() throws ParseException {
+	@Theory
+	public void testForumlaReplace(String excelFile) throws ParseException {
 		try (EmbulkPluginTester tester = new EmbulkPluginTester()) {
 			tester.addParserPlugin(PoiExcelParserPlugin.TYPE, PoiExcelParserPlugin.class);
 
@@ -125,7 +132,7 @@ public class TestPoiExcelParserPlugin {
 
 			parser.addColumn("text", "string");
 
-			URL inFile = getClass().getResource("test1.xls");
+			URL inFile = getClass().getResource(excelFile);
 			List<OutputRecord> result = tester.runParser(inFile, parser);
 
 			assertThat(result.size(), is(2));
@@ -134,8 +141,8 @@ public class TestPoiExcelParserPlugin {
 		}
 	}
 
-	@Test
-	public void testSearchMergedCell_true() throws ParseException {
+	@Theory
+	public void testSearchMergedCell_true(String excelFile) throws ParseException {
 		try (EmbulkPluginTester tester = new EmbulkPluginTester()) {
 			tester.addParserPlugin(PoiExcelParserPlugin.TYPE, PoiExcelParserPlugin.class);
 
@@ -144,7 +151,7 @@ public class TestPoiExcelParserPlugin {
 			parser.addColumn("a", "string");
 			parser.addColumn("b", "string");
 
-			URL inFile = getClass().getResource("test1.xls");
+			URL inFile = getClass().getResource(excelFile);
 			List<OutputRecord> result = tester.runParser(inFile, parser);
 
 			assertThat(result.size(), is(4));
@@ -155,8 +162,8 @@ public class TestPoiExcelParserPlugin {
 		}
 	}
 
-	@Test
-	public void testSearchMergedCell_false() throws ParseException {
+	@Theory
+	public void testSearchMergedCell_false(String excelFile) throws ParseException {
 		try (EmbulkPluginTester tester = new EmbulkPluginTester()) {
 			tester.addParserPlugin(PoiExcelParserPlugin.TYPE, PoiExcelParserPlugin.class);
 
@@ -166,7 +173,7 @@ public class TestPoiExcelParserPlugin {
 			parser.addColumn("a", "string");
 			parser.addColumn("b", "string");
 
-			URL inFile = getClass().getResource("test1.xls");
+			URL inFile = getClass().getResource(excelFile);
 			List<OutputRecord> result = tester.runParser(inFile, parser);
 
 			assertThat(result.size(), is(4));
@@ -184,8 +191,8 @@ public class TestPoiExcelParserPlugin {
 		assertThat(r.getAsString("b"), is(b));
 	}
 
-	@Test
-	public void test_sheets() throws ParseException {
+	@Theory
+	public void test_sheets(String excelFile) throws ParseException {
 		try (EmbulkPluginTester tester = new EmbulkPluginTester()) {
 			tester.addParserPlugin(PoiExcelParserPlugin.TYPE, PoiExcelParserPlugin.class);
 
@@ -193,7 +200,7 @@ public class TestPoiExcelParserPlugin {
 			parser.set("sheets", Arrays.asList("formula_replace", "merged_cell"));
 			parser.addColumn("a", "string");
 
-			URL inFile = getClass().getResource("test1.xls");
+			URL inFile = getClass().getResource(excelFile);
 			List<OutputRecord> result = tester.runParser(inFile, parser);
 
 			assertThat(result.size(), is(2 + 4));

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

@@ -13,12 +13,19 @@ import java.util.List;
 import org.embulk.parser.EmbulkPluginTester;
 import org.embulk.parser.EmbulkTestOutputPlugin.OutputRecord;
 import org.embulk.parser.EmbulkTestParserConfig;
-import org.junit.Test;
+import org.junit.experimental.theories.DataPoints;
+import org.junit.experimental.theories.Theories;
+import org.junit.experimental.theories.Theory;
+import org.junit.runner.RunWith;
 
+@RunWith(Theories.class)
 public class TestPoiExcelParserPlugin_cellComment {
 
-	@Test
-	public void testComment_key() throws ParseException {
+	@DataPoints
+	public static String[] FILES = { "test1.xls", "test2.xlsx" };
+
+	@Theory
+	public void testComment_key(String excelFile) throws ParseException {
 		try (EmbulkPluginTester tester = new EmbulkPluginTester()) {
 			tester.addParserPlugin(PoiExcelParserPlugin.TYPE, PoiExcelParserPlugin.class);
 
@@ -27,7 +34,7 @@ public class TestPoiExcelParserPlugin_cellComment {
 			parser.addColumn("author", "string").set("value", "cell_comment.author");
 			parser.addColumn("comment", "string").set("value", "cell_comment.string");
 
-			URL inFile = getClass().getResource("test1.xls");
+			URL inFile = getClass().getResource(excelFile);
 			List<OutputRecord> result = tester.runParser(inFile, parser);
 
 			assertThat(result.size(), is(2));
@@ -43,8 +50,8 @@ public class TestPoiExcelParserPlugin_cellComment {
 		assertThat(record.getAsString("author"), is(author));
 	}
 
-	@Test
-	public void testComment_all() throws ParseException {
+	@Theory
+	public void testComment_all(String excelFile) throws ParseException {
 		try (EmbulkPluginTester tester = new EmbulkPluginTester()) {
 			tester.addParserPlugin(PoiExcelParserPlugin.TYPE, PoiExcelParserPlugin.class);
 
@@ -52,7 +59,7 @@ public class TestPoiExcelParserPlugin_cellComment {
 			parser.set("sheet", "comment");
 			parser.addColumn("comment", "string").set("value", "cell_comment");
 
-			URL inFile = getClass().getResource("test1.xls");
+			URL inFile = getClass().getResource(excelFile);
 			List<OutputRecord> result = tester.runParser(inFile, parser);
 
 			assertThat(result.size(), is(2));
@@ -78,8 +85,8 @@ public class TestPoiExcelParserPlugin_cellComment {
 		}
 	}
 
-	@Test
-	public void testComment_keys() throws ParseException {
+	@Theory
+	public void testComment_keys(String excelFile) throws ParseException {
 		try (EmbulkPluginTester tester = new EmbulkPluginTester()) {
 			tester.addParserPlugin(PoiExcelParserPlugin.TYPE, PoiExcelParserPlugin.class);
 
@@ -88,7 +95,7 @@ public class TestPoiExcelParserPlugin_cellComment {
 			parser.addColumn("comment", "string").set("value", "cell_comment")
 					.set("attribute_name", Arrays.asList("author", "string"));
 
-			URL inFile = getClass().getResource("test1.xls");
+			URL inFile = getClass().getResource(excelFile);
 			List<OutputRecord> result = tester.runParser(inFile, parser);
 
 			assertThat(result.size(), is(2));

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

@@ -14,12 +14,19 @@ 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;
+import org.junit.experimental.theories.DataPoints;
+import org.junit.experimental.theories.Theories;
+import org.junit.experimental.theories.Theory;
+import org.junit.runner.RunWith;
 
+@RunWith(Theories.class)
 public class TestPoiExcelParserPlugin_cellError {
 
-	@Test
-	public void testCellError_default() throws Exception {
+	@DataPoints
+	public static String[] FILES = { "test1.xls", "test2.xlsx" };
+
+	@Theory
+	public void testCellError_default(String excelFile) throws Exception {
 		try (EmbulkPluginTester tester = new EmbulkPluginTester()) {
 			tester.addParserPlugin(PoiExcelParserPlugin.TYPE, PoiExcelParserPlugin.class);
 
@@ -32,7 +39,7 @@ public class TestPoiExcelParserPlugin_cellError {
 			parser.addColumn("s", "string").set("column_number", "A");
 			parser.addColumn("t", "timestamp").set("column_number", "A");
 
-			URL inFile = getClass().getResource("test1.xls");
+			URL inFile = getClass().getResource(excelFile);
 			List<OutputRecord> result = tester.runParser(inFile, parser);
 
 			assertThat(result.size(), is(1));
@@ -45,8 +52,8 @@ public class TestPoiExcelParserPlugin_cellError {
 		}
 	}
 
-	@Test
-	public void testCellError_code() throws Exception {
+	@Theory
+	public void testCellError_code(String excelFile) throws Exception {
 		try (EmbulkPluginTester tester = new EmbulkPluginTester()) {
 			tester.addParserPlugin(PoiExcelParserPlugin.TYPE, PoiExcelParserPlugin.class);
 
@@ -59,7 +66,7 @@ public class TestPoiExcelParserPlugin_cellError {
 			parser.addColumn("d", "double").set("column_number", "A");
 			parser.addColumn("s", "string").set("column_number", "A");
 
-			URL inFile = getClass().getResource("test1.xls");
+			URL inFile = getClass().getResource(excelFile);
 			List<OutputRecord> result = tester.runParser(inFile, parser);
 
 			OutputRecord r = result.get(0);
@@ -70,8 +77,8 @@ public class TestPoiExcelParserPlugin_cellError {
 		}
 	}
 
-	@Test
-	public void testCellError_null() throws Exception {
+	@Theory
+	public void testCellError_null(String excelFile) throws Exception {
 		try (EmbulkPluginTester tester = new EmbulkPluginTester()) {
 			tester.addParserPlugin(PoiExcelParserPlugin.TYPE, PoiExcelParserPlugin.class);
 
@@ -85,7 +92,7 @@ public class TestPoiExcelParserPlugin_cellError {
 			parser.addColumn("s", "string").set("column_number", "A");
 			parser.addColumn("t", "timestamp").set("column_number", "A");
 
-			URL inFile = getClass().getResource("test1.xls");
+			URL inFile = getClass().getResource(excelFile);
 			List<OutputRecord> result = tester.runParser(inFile, parser);
 
 			assertThat(result.size(), is(1));
@@ -98,8 +105,8 @@ public class TestPoiExcelParserPlugin_cellError {
 		}
 	}
 
-	@Test
-	public void testCellError_empty() throws Exception {
+	@Theory
+	public void testCellError_empty(String excelFile) throws Exception {
 		try (EmbulkPluginTester tester = new EmbulkPluginTester()) {
 			tester.addParserPlugin(PoiExcelParserPlugin.TYPE, PoiExcelParserPlugin.class);
 
@@ -112,7 +119,7 @@ public class TestPoiExcelParserPlugin_cellError {
 			parser.addColumn("s3", "string").set("column_number", "A").set("on_cell_error", "constant.");
 			parser.addColumn("s4", "string").set("column_number", "A").set("on_cell_error", "constant. ");
 
-			URL inFile = getClass().getResource("test1.xls");
+			URL inFile = getClass().getResource(excelFile);
 			List<OutputRecord> result = tester.runParser(inFile, parser);
 
 			assertThat(result.size(), is(1));
@@ -124,8 +131,8 @@ public class TestPoiExcelParserPlugin_cellError {
 		}
 	}
 
-	@Test
-	public void testCellError_constant() throws Exception {
+	@Theory
+	public void testCellError_constant(String excelFile) throws Exception {
 		try (EmbulkPluginTester tester = new EmbulkPluginTester()) {
 			tester.addParserPlugin(PoiExcelParserPlugin.TYPE, PoiExcelParserPlugin.class);
 
@@ -140,7 +147,7 @@ public class TestPoiExcelParserPlugin_cellError {
 			parser.addColumn("t", "timestamp").set("column_number", "A").set("format", "%Y/%m/%d")
 					.set("on_cell_error", "constant.2000/1/1");
 
-			URL inFile = getClass().getResource("test1.xls");
+			URL inFile = getClass().getResource(excelFile);
 			List<OutputRecord> result = tester.runParser(inFile, parser);
 
 			OutputRecord r = result.get(0);
@@ -153,8 +160,8 @@ public class TestPoiExcelParserPlugin_cellError {
 		}
 	}
 
-	@Test
-	public void testCellError_exception() throws Exception {
+	@Theory
+	public void testCellError_exception(String excelFile) throws Exception {
 		try (EmbulkPluginTester tester = new EmbulkPluginTester()) {
 			tester.addParserPlugin(PoiExcelParserPlugin.TYPE, PoiExcelParserPlugin.class);
 
@@ -168,7 +175,7 @@ public class TestPoiExcelParserPlugin_cellError {
 			parser.addColumn("s", "string").set("column_number", "A");
 			parser.addColumn("t", "timestamp").set("column_number", "A");
 
-			URL inFile = getClass().getResource("test1.xls");
+			URL inFile = getClass().getResource(excelFile);
 			try {
 				tester.runParser(inFile, parser);
 			} catch (Exception e) {

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

@@ -13,12 +13,19 @@ import java.util.List;
 import org.embulk.parser.EmbulkPluginTester;
 import org.embulk.parser.EmbulkTestOutputPlugin.OutputRecord;
 import org.embulk.parser.EmbulkTestParserConfig;
-import org.junit.Test;
+import org.junit.experimental.theories.DataPoints;
+import org.junit.experimental.theories.Theories;
+import org.junit.experimental.theories.Theory;
+import org.junit.runner.RunWith;
 
+@RunWith(Theories.class)
 public class TestPoiExcelParserPlugin_cellFont {
 
-	@Test
-	public void testFont_key() throws ParseException {
+	@DataPoints
+	public static String[] FILES = { "test1.xls", "test2.xlsx" };
+
+	@Theory
+	public void testFont_key(String excelFile) throws ParseException {
 		try (EmbulkPluginTester tester = new EmbulkPluginTester()) {
 			tester.addParserPlugin(PoiExcelParserPlugin.TYPE, PoiExcelParserPlugin.class);
 
@@ -28,7 +35,7 @@ public class TestPoiExcelParserPlugin_cellFont {
 			parser.addColumn("font-color", "long").set("column_number", "C").set("value", "cell_font.color");
 			parser.addColumn("font-bold", "boolean").set("value", "cell_font.bold");
 
-			URL inFile = getClass().getResource("test1.xls");
+			URL inFile = getClass().getResource(excelFile);
 			List<OutputRecord> result = tester.runParser(inFile, parser);
 
 			assertThat(result.size(), is(5));
@@ -48,8 +55,8 @@ public class TestPoiExcelParserPlugin_cellFont {
 		assertThat(record.getAsBoolean("font-bold"), is(fontBold));
 	}
 
-	@Test
-	public void testFont_all() throws ParseException {
+	@Theory
+	public void testFont_all(String excelFile) throws ParseException {
 		try (EmbulkPluginTester tester = new EmbulkPluginTester()) {
 			tester.addParserPlugin(PoiExcelParserPlugin.TYPE, PoiExcelParserPlugin.class);
 
@@ -58,7 +65,7 @@ public class TestPoiExcelParserPlugin_cellFont {
 			parser.addColumn("color-text", "string");
 			parser.addColumn("color-font", "string").set("column_number", "C").set("value", "cell_font");
 
-			URL inFile = getClass().getResource("test1.xls");
+			URL inFile = getClass().getResource(excelFile);
 			List<OutputRecord> result = tester.runParser(inFile, parser);
 
 			assertThat(result.size(), is(5));
@@ -100,8 +107,8 @@ public class TestPoiExcelParserPlugin_cellFont {
 		}
 	}
 
-	@Test
-	public void testFont_keys() throws ParseException {
+	@Theory
+	public void testFont_keys(String excelFile) throws ParseException {
 		try (EmbulkPluginTester tester = new EmbulkPluginTester()) {
 			tester.addParserPlugin(PoiExcelParserPlugin.TYPE, PoiExcelParserPlugin.class);
 
@@ -111,7 +118,7 @@ public class TestPoiExcelParserPlugin_cellFont {
 			parser.addColumn("color-font", "string").set("column_number", "C").set("value", "cell_font")
 					.set("attribute_name", Arrays.asList("color", "bold"));
 
-			URL inFile = getClass().getResource("test1.xls");
+			URL inFile = getClass().getResource(excelFile);
 			List<OutputRecord> result = tester.runParser(inFile, parser);
 
 			assertThat(result.size(), is(5));

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

@@ -1,7 +1,8 @@
 package org.embulk.parser.poi_excel;
 
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.fail;
 
 import java.net.URL;
 import java.text.ParseException;
@@ -12,12 +13,19 @@ import org.apache.poi.ss.usermodel.CellStyle;
 import org.embulk.parser.EmbulkPluginTester;
 import org.embulk.parser.EmbulkTestOutputPlugin.OutputRecord;
 import org.embulk.parser.EmbulkTestParserConfig;
-import org.junit.Test;
+import org.junit.experimental.theories.DataPoints;
+import org.junit.experimental.theories.Theories;
+import org.junit.experimental.theories.Theory;
+import org.junit.runner.RunWith;
 
+@RunWith(Theories.class)
 public class TestPoiExcelParserPlugin_cellStyle {
 
-	@Test
-	public void testStyle_key() throws ParseException {
+	@DataPoints
+	public static String[] FILES = { "test1.xls", "test2.xlsx" };
+
+	@Theory
+	public void testStyle_key(String excelFile) throws ParseException {
 		try (EmbulkPluginTester tester = new EmbulkPluginTester()) {
 			tester.addParserPlugin(PoiExcelParserPlugin.TYPE, PoiExcelParserPlugin.class);
 
@@ -32,7 +40,7 @@ public class TestPoiExcelParserPlugin_cellStyle {
 			parser.addColumn("border-right", "long").set("value", "cell_style.border_right");
 			parser.addColumn("border-all", "long").set("value", "cell_style.border");
 
-			URL inFile = getClass().getResource("test1.xls");
+			URL inFile = getClass().getResource(excelFile);
 			List<OutputRecord> result = tester.runParser(inFile, parser);
 
 			assertThat(result.size(), is(5));
@@ -58,8 +66,8 @@ public class TestPoiExcelParserPlugin_cellStyle {
 		assertThat(record.getAsLong("border-all"), is(top << 24 | bottom << 16 | left << 8 | right));
 	}
 
-	@Test
-	public void testStyle_all() throws ParseException {
+	@Theory
+	public void testStyle_all(String excelFile) throws ParseException {
 		try (EmbulkPluginTester tester = new EmbulkPluginTester()) {
 			tester.addParserPlugin(PoiExcelParserPlugin.TYPE, PoiExcelParserPlugin.class);
 
@@ -69,7 +77,7 @@ public class TestPoiExcelParserPlugin_cellStyle {
 			parser.addColumn("color-style", "string").set("column_number", "A").set("value", "cell_style");
 			parser.addColumn("border-style", "string").set("column_number", "B").set("value", "cell_style");
 
-			URL inFile = getClass().getResource("test1.xls");
+			URL inFile = getClass().getResource(excelFile);
 			List<OutputRecord> result = tester.runParser(inFile, parser);
 
 			assertThat(result.size(), is(5));
@@ -105,8 +113,8 @@ public class TestPoiExcelParserPlugin_cellStyle {
 		}
 	}
 
-	@Test
-	public void testStyle_keys() throws ParseException {
+	@Theory
+	public void testStyle_keys(String excelFile) throws ParseException {
 		try (EmbulkPluginTester tester = new EmbulkPluginTester()) {
 			tester.addParserPlugin(PoiExcelParserPlugin.TYPE, PoiExcelParserPlugin.class);
 
@@ -118,7 +126,7 @@ public class TestPoiExcelParserPlugin_cellStyle {
 			parser.addColumn("border-style", "string").set("column_number", "B").set("value", "cell_style")
 					.set("attribute_name", Arrays.asList("border_top", "border_bottom", "border_left", "border_right"));
 
-			URL inFile = getClass().getResource("test1.xls");
+			URL inFile = getClass().getResource(excelFile);
 			List<OutputRecord> result = tester.runParser(inFile, parser);
 
 			assertThat(result.size(), is(5));

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

@@ -11,12 +11,19 @@ import java.util.List;
 import org.embulk.parser.EmbulkPluginTester;
 import org.embulk.parser.EmbulkTestOutputPlugin.OutputRecord;
 import org.embulk.parser.EmbulkTestParserConfig;
-import org.junit.Test;
+import org.junit.experimental.theories.DataPoints;
+import org.junit.experimental.theories.Theories;
+import org.junit.experimental.theories.Theory;
+import org.junit.runner.RunWith;
 
+@RunWith(Theories.class)
 public class TestPoiExcelParserPlugin_columnNumber {
 
-	@Test
-	public void testColumnNumber_string() throws Exception {
+	@DataPoints
+	public static String[] FILES = { "test1.xls", "test2.xlsx" };
+
+	@Theory
+	public void testColumnNumber_string(String excelFile) throws Exception {
 		try (EmbulkPluginTester tester = new EmbulkPluginTester()) {
 			tester.addParserPlugin(PoiExcelParserPlugin.TYPE, PoiExcelParserPlugin.class);
 
@@ -25,7 +32,7 @@ public class TestPoiExcelParserPlugin_columnNumber {
 			parser.set("skip_header_lines", 1);
 			parser.addColumn("text", "string").set("column_number", "D");
 
-			URL inFile = getClass().getResource("test1.xls");
+			URL inFile = getClass().getResource(excelFile);
 			List<OutputRecord> result = tester.runParser(inFile, parser);
 
 			assertThat(result.size(), is(7));
@@ -39,8 +46,8 @@ public class TestPoiExcelParserPlugin_columnNumber {
 		}
 	}
 
-	@Test
-	public void testColumnNumber_int() throws Exception {
+	@Theory
+	public void testColumnNumber_int(String excelFile) throws Exception {
 		try (EmbulkPluginTester tester = new EmbulkPluginTester()) {
 			tester.addParserPlugin(PoiExcelParserPlugin.TYPE, PoiExcelParserPlugin.class);
 
@@ -50,7 +57,7 @@ public class TestPoiExcelParserPlugin_columnNumber {
 			parser.addColumn("long", "long").set("column_number", 2);
 			parser.addColumn("double", "double");
 
-			URL inFile = getClass().getResource("test1.xls");
+			URL inFile = getClass().getResource(excelFile);
 			List<OutputRecord> result = tester.runParser(inFile, parser);
 
 			assertThat(result.size(), is(7));
@@ -71,8 +78,8 @@ public class TestPoiExcelParserPlugin_columnNumber {
 		assertThat(r.getAsDouble("double"), is(d));
 	}
 
-	@Test
-	public void testColumnNumber_move() throws Exception {
+	@Theory
+	public void testColumnNumber_move(String excelFile) throws Exception {
 		try (EmbulkPluginTester tester = new EmbulkPluginTester()) {
 			tester.addParserPlugin(PoiExcelParserPlugin.TYPE, PoiExcelParserPlugin.class);
 
@@ -85,7 +92,7 @@ public class TestPoiExcelParserPlugin_columnNumber {
 			parser.addColumn("double2", "double").set("column_number", "=");
 			parser.addColumn("long3", "long").set("column_number", "-");
 
-			URL inFile = getClass().getResource("test1.xls");
+			URL inFile = getClass().getResource(excelFile);
 			List<OutputRecord> result = tester.runParser(inFile, parser);
 
 			assertThat(result.size(), is(7));
@@ -109,8 +116,8 @@ public class TestPoiExcelParserPlugin_columnNumber {
 		assertThat(r.getAsDouble("double2"), is(d));
 	}
 
-	@Test
-	public void testColumnNumber_move2() throws Exception {
+	@Theory
+	public void testColumnNumber_move2(String excelFile) throws Exception {
 		try (EmbulkPluginTester tester = new EmbulkPluginTester()) {
 			tester.addParserPlugin(PoiExcelParserPlugin.TYPE, PoiExcelParserPlugin.class);
 
@@ -123,7 +130,7 @@ public class TestPoiExcelParserPlugin_columnNumber {
 			parser.addColumn("string2", "string").set("column_number", "=string1");
 			parser.addColumn("long3", "long").set("column_number", "-2");
 
-			URL inFile = getClass().getResource("test1.xls");
+			URL inFile = getClass().getResource(excelFile);
 			List<OutputRecord> result = tester.runParser(inFile, parser);
 
 			assertThat(result.size(), is(7));
@@ -147,8 +154,8 @@ public class TestPoiExcelParserPlugin_columnNumber {
 		assertThat(r.getAsString("string2"), is(s));
 	}
 
-	@Test
-	public void testColumnNumber_moveName() throws Exception {
+	@Theory
+	public void testColumnNumber_moveName(String excelFile) throws Exception {
 		try (EmbulkPluginTester tester = new EmbulkPluginTester()) {
 			tester.addParserPlugin(PoiExcelParserPlugin.TYPE, PoiExcelParserPlugin.class);
 
@@ -160,7 +167,7 @@ public class TestPoiExcelParserPlugin_columnNumber {
 			parser.addColumn("long2", "long").set("column_number", "=long1");
 			parser.addColumn("boolean1", "boolean").set("column_number", "-long1");
 
-			URL inFile = getClass().getResource("test1.xls");
+			URL inFile = getClass().getResource(excelFile);
 			List<OutputRecord> result = tester.runParser(inFile, parser);
 
 			assertThat(result.size(), is(7));

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

@@ -11,12 +11,19 @@ import java.util.List;
 import org.embulk.parser.EmbulkPluginTester;
 import org.embulk.parser.EmbulkTestOutputPlugin.OutputRecord;
 import org.embulk.parser.EmbulkTestParserConfig;
-import org.junit.Test;
+import org.junit.experimental.theories.DataPoints;
+import org.junit.experimental.theories.Theories;
+import org.junit.experimental.theories.Theory;
+import org.junit.runner.RunWith;
 
+@RunWith(Theories.class)
 public class TestPoiExcelParserPlugin_constant {
 
-	@Test
-	public void testConstant() throws Exception {
+	@DataPoints
+	public static String[] FILES = { "test1.xls", "test2.xlsx" };
+
+	@Theory
+	public void testConstant(String excelFile) throws Exception {
 		try (EmbulkPluginTester tester = new EmbulkPluginTester()) {
 			tester.addParserPlugin(PoiExcelParserPlugin.TYPE, PoiExcelParserPlugin.class);
 
@@ -29,7 +36,7 @@ public class TestPoiExcelParserPlugin_constant {
 			parser.addColumn("null", "string").set("value", "constant");
 			parser.addColumn("cell", "string");
 
-			URL inFile = getClass().getResource("test1.xls");
+			URL inFile = getClass().getResource(excelFile);
 			List<OutputRecord> result = tester.runParser(inFile, parser);
 
 			assertThat(result.size(), is(5));

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

@@ -13,12 +13,19 @@ 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;
+import org.junit.experimental.theories.DataPoints;
+import org.junit.experimental.theories.Theories;
+import org.junit.experimental.theories.Theory;
+import org.junit.runner.RunWith;
 
+@RunWith(Theories.class)
 public class TestPoiExcelParserPlugin_convertError {
 
-	@Test
-	public void testConvertError_default() throws Exception {
+	@DataPoints
+	public static String[] FILES = { "test1.xls", "test2.xlsx" };
+
+	@Theory
+	public void testConvertError_default(String excelFile) throws Exception {
 		try (EmbulkPluginTester tester = new EmbulkPluginTester()) {
 			tester.addParserPlugin(PoiExcelParserPlugin.TYPE, PoiExcelParserPlugin.class);
 
@@ -26,7 +33,7 @@ public class TestPoiExcelParserPlugin_convertError {
 			parser.set("sheet", "style");
 			parser.addColumn("t", "timestamp").set("column_number", "A");
 
-			URL inFile = getClass().getResource("test1.xls");
+			URL inFile = getClass().getResource(excelFile);
 			try {
 				tester.runParser(inFile, parser);
 			} catch (Exception e) {
@@ -40,8 +47,8 @@ public class TestPoiExcelParserPlugin_convertError {
 		}
 	}
 
-	@Test
-	public void testConvertError_exception() throws Exception {
+	@Theory
+	public void testConvertError_exception(String excelFile) throws Exception {
 		try (EmbulkPluginTester tester = new EmbulkPluginTester()) {
 			tester.addParserPlugin(PoiExcelParserPlugin.TYPE, PoiExcelParserPlugin.class);
 
@@ -50,7 +57,7 @@ public class TestPoiExcelParserPlugin_convertError {
 			parser.set("on_convert_error", "exception");
 			parser.addColumn("t", "timestamp").set("column_number", "A");
 
-			URL inFile = getClass().getResource("test1.xls");
+			URL inFile = getClass().getResource(excelFile);
 			try {
 				tester.runParser(inFile, parser);
 			} catch (Exception e) {
@@ -64,8 +71,8 @@ public class TestPoiExcelParserPlugin_convertError {
 		}
 	}
 
-	@Test
-	public void testConvertError_null() throws Exception {
+	@Theory
+	public void testConvertError_null(String excelFile) throws Exception {
 		try (EmbulkPluginTester tester = new EmbulkPluginTester()) {
 			tester.addParserPlugin(PoiExcelParserPlugin.TYPE, PoiExcelParserPlugin.class);
 
@@ -74,7 +81,7 @@ public class TestPoiExcelParserPlugin_convertError {
 			parser.set("on_convert_error", "constant");
 			parser.addColumn("t", "timestamp").set("column_number", "A");
 
-			URL inFile = getClass().getResource("test1.xls");
+			URL inFile = getClass().getResource(excelFile);
 			List<OutputRecord> result = tester.runParser(inFile, parser);
 
 			assertThat(result.size(), is(2));
@@ -83,8 +90,8 @@ public class TestPoiExcelParserPlugin_convertError {
 		}
 	}
 
-	@Test
-	public void testConvertError_constant() throws Exception {
+	@Theory
+	public void testConvertError_constant(String excelFile) throws Exception {
 		try (EmbulkPluginTester tester = new EmbulkPluginTester()) {
 			tester.addParserPlugin(PoiExcelParserPlugin.TYPE, PoiExcelParserPlugin.class);
 
@@ -97,7 +104,7 @@ public class TestPoiExcelParserPlugin_convertError {
 			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");
+			URL inFile = getClass().getResource(excelFile);
 			List<OutputRecord> result = tester.runParser(inFile, parser);
 
 			assertThat(result.size(), is(2));

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

@@ -13,12 +13,19 @@ import java.util.Map;
 import org.embulk.parser.EmbulkPluginTester;
 import org.embulk.parser.EmbulkTestOutputPlugin.OutputRecord;
 import org.embulk.parser.EmbulkTestParserConfig;
-import org.junit.Test;
+import org.junit.experimental.theories.DataPoints;
+import org.junit.experimental.theories.Theories;
+import org.junit.experimental.theories.Theory;
+import org.junit.runner.RunWith;
 
+@RunWith(Theories.class)
 public class TestPoiExcelParserPlugin_sheets {
 
-	@Test
-	public void testSheets() throws ParseException {
+	@DataPoints
+	public static String[] FILES = { "test1.xls", "test2.xlsx" };
+
+	@Theory
+	public void testSheets(String excelFile) throws ParseException {
 		try (EmbulkPluginTester tester = new EmbulkPluginTester()) {
 			tester.addParserPlugin(PoiExcelParserPlugin.TYPE, PoiExcelParserPlugin.class);
 
@@ -55,7 +62,7 @@ public class TestPoiExcelParserPlugin_sheets {
 			}
 			parser.set("sheet_options", sheetOptions);
 
-			URL inFile = getClass().getResource("test1.xls");
+			URL inFile = getClass().getResource(excelFile);
 			List<OutputRecord> result = tester.runParser(inFile, parser);
 
 			assertThat(result.size(), is(8));

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-parser-poi_excel
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - hishidama
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-10-24 00:00:00.000000000 Z
+date: 2015-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -90,8 +90,9 @@ files:
 - src/test/java/org/embulk/parser/poi_excel/TestPoiExcelParserPlugin_convertError.java
 - src/test/java/org/embulk/parser/poi_excel/TestPoiExcelParserPlugin_sheets.java
 - src/test/resources/org/embulk/parser/poi_excel/test1.xls
+- src/test/resources/org/embulk/parser/poi_excel/test2.xlsx
 - classpath/commons-codec-1.9.jar
-- classpath/embulk-parser-poi_excel-0.1.3.jar
+- classpath/embulk-parser-poi_excel-0.1.4.jar
 - classpath/embulk-standards-0.7.5.jar
 - classpath/poi-3.13.jar
 - classpath/poi-ooxml-3.13.jar